Skip to content

Commit 98c88dc

Browse files
vingu-linaroPeter Zijlstra
authored andcommitted
sched/fair: Fix pelt clock sync when entering idle
Samuel and Alex reported regressions of the util_avg of RT rq with commit 17e3e88 ("sched/fair: Fix pelt lost idle time detection"). It happens that fair is updating and syncing the pelt clock with task one when pick_next_task_fair() fails to pick a task but before the prev scheduling class got a chance to update its pelt signals. Move update_idle_rq_clock_pelt() in set_next_task_idle() which is called after prev class has been called. Fixes: 17e3e88 ("sched/fair: Fix pelt lost idle time detection") Closes: https://lore.kernel.org/all/CAG2KctpO6VKS6GN4QWDji0t92_gNBJ7HjjXrE+6H+RwRXt=iLg@mail.gmail.com/ Closes: https://lore.kernel.org/all/8cf19bf0e0054dcfed70e9935029201694f1bb5a.camel@mediatek.com/ Reported-by: Samuel Wu <wusamuel@google.com> Reported-by: Alex Hoh <Alex.Hoh@mediatek.com> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Samuel Wu <wusamuel@google.com> Tested-by: Alex Hoh <Alex.Hoh@mediatek.com> Link: https://patch.msgid.link/20260121163317.505635-1-vincent.guittot@linaro.org
1 parent 24d479d commit 98c88dc

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

kernel/sched/fair.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8995,12 +8995,6 @@ pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf
89958995
goto again;
89968996
}
89978997

8998-
/*
8999-
* rq is about to be idle, check if we need to update the
9000-
* lost_idle_time of clock_pelt
9001-
*/
9002-
update_idle_rq_clock_pelt(rq);
9003-
90048998
return NULL;
90058999
}
90069000

kernel/sched/idle.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,12 @@ static void set_next_task_idle(struct rq *rq, struct task_struct *next, bool fir
468468
scx_update_idle(rq, true, true);
469469
schedstat_inc(rq->sched_goidle);
470470
next->se.exec_start = rq_clock_task(rq);
471+
472+
/*
473+
* rq is about to be idle, check if we need to update the
474+
* lost_idle_time of clock_pelt
475+
*/
476+
update_idle_rq_clock_pelt(rq);
471477
}
472478

473479
struct task_struct *pick_task_idle(struct rq *rq, struct rq_flags *rf)

0 commit comments

Comments
 (0)