From 0a94d0ea8d8b464ff597ae2f534dd60b64b4da0f Mon Sep 17 00:00:00 2001 From: Kayra Cizmeci Date: Thu, 15 Oct 2026 11:29:18 +0300 Subject: [PATCH] Revert "sched/fair: Remove dead code on enqueue_task_fair()" This reverts commit 819224e506bc7c2d61ec6a58ec6e876b505abce9. The cfs_rq->curr == se case can actually happen with CFS_BANDWIDTH, so the removed code is needed. Document this. Fixes: 819224e506bc ("sched/fair: Remove dead code on enqueue_task_fair()") Reported-by: Christian Loehle Signed-off-by: Kayra Cizmeci Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/lkml/fd3f9d83-cb5b-496b-b7c1-b40f31cf795e@arm.com/ Link: https://patch.msgid.link/20261015082919.4344-1-kayracizmeci@gmail.com --- kernel/sched/fair.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a90e48d92058..0feec172fd37 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8156,6 +8156,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) struct sched_entity *se = &p->se; struct cfs_rq *cfs_rq = &rq->cfs; unsigned long weight; + bool curr; if (task_is_throttled(p) && enqueue_throttled_task(p)) return; @@ -8184,14 +8185,25 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (p->in_iowait) cpufreq_update_util(rq, SCHED_CPUFREQ_IOWAIT); + curr = (cfs_rq->curr == se); + /* + * This can actually happen with CFS_BANDWIDTH, a task can be throttled + * and dequeued, unthrottled from another CPU and then enqueued again + * before schedule(). + */ + if (curr) + place_entity(cfs_rq, se, flags); if (se->on_rq && se->sched_delayed) requeue_delayed_entity(cfs_rq, se); weight = enqueue_hierarchy(p, flags); - reweight_eevdf(cfs_rq, se, weight, false); - place_entity(cfs_rq, se, flags | ENQUEUE_QUEUED); - __enqueue_entity(cfs_rq, se); + + if (!curr) { + reweight_eevdf(cfs_rq, se, weight, false); + place_entity(cfs_rq, se, flags | ENQUEUE_QUEUED); + __enqueue_entity(cfs_rq, se); + } if (!rq_h_nr_queued && rq->cfs.h_nr_queued) dl_server_start(&rq->fair_server);