summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorKayra Cizmeci <kayracizmeci@gmail.com>2026-10-15 11:29:18 +0300
committerPeter Zijlstra <peterz@infradead.org>2026-10-16 09:49:04 +0200
commit0a94d0ea8d8b464ff597ae2f534dd60b64b4da0f (patch)
treeca8e59d83454cb0c71815a3196c19c449a1e8fa8 /kernel
parentfcceb7da94659695d6cba97190e18e87d9cce82c (diff)
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 <christian.loehle@arm.com> Signed-off-by: Kayra Cizmeci <kayracizmeci@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/lkml/fd3f9d83-cb5b-496b-b7c1-b40f31cf795e@arm.com/ Link: https://patch.msgid.link/20261015082919.4344-1-kayracizmeci@gmail.com
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/fair.c18
1 files 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);