A task with SCHED_IDLE policy doesn't preempt others by definition, and
the semantics are intended to be preserved when extending to cgroups
introduced in commit 304000390f88 ("sched: Cgroup SCHED_IDLE support").
But current implementation allows idle entities to preempt each other
on wakeup, which seems not behave as expected especially after
commit faa42d29419d ("sched/fair: Make SCHED_IDLE entity be preempted in strict hierarchy")
so fix this by explicitly skip wakeup preemption for idle entities.
Fixes: 304000390f88 ("sched: Cgroup SCHED_IDLE support")
Signed-off-by: Abel Wu <wuyun.abel@bytedance.com>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Josh Don <joshdon@google.com>
Reviewed-by: Madadi Vineeth Reddy <vineethr@linux.ibm.com>
Tested-by: K Prateek Nayak <kprateek.nayak@amd.com>
---
kernel/sched/fair.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ae0350088ac1..19ae870cbeda 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -8797,8 +8797,7 @@ static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int
pse_is_idle = se_is_idle(pse);
/*
- * Preempt an idle entity in favor of a non-idle entity (and don't preempt
- * in the inverse case).
+ * Preempt an idle entity in favor of a non-idle entity.
*/
if (cse_is_idle && !pse_is_idle) {
/*
@@ -8809,7 +8808,10 @@ static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int
goto preempt;
}
- if (cse_is_idle != pse_is_idle)
+ /*
+ * IDLE entities do not preempt others.
+ */
+ if (unlikely(pse_is_idle))
return;
/*
--
2.37.3