Skip to content

Commit 84d2652

Browse files
yu-chen-surfPeter Zijlstra
authored andcommitted
sched/pelt: Use rq_clock_task() for hw_pressure
commit 97450eb ("sched/pelt: Remove shift of thermal clock") removed the decay_shift for hw_pressure. This commit uses the sched_clock_task() in sched_tick() while it replaces the sched_clock_task() with rq_clock_pelt() in __update_blocked_others(). This could bring inconsistence. One possible scenario I can think of is in ___update_load_sum(): u64 delta = now - sa->last_update_time 'now' could be calculated by rq_clock_pelt() from __update_blocked_others(), and last_update_time was calculated by rq_clock_task() previously from sched_tick(). Usually the former chases after the latter, it cause a very large 'delta' and brings unexpected behavior. Fixes: 97450eb ("sched/pelt: Remove shift of thermal clock") Signed-off-by: Chen Yu <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Hongyan Xia <[email protected]> Reviewed-by: Vincent Guittot <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 5d871a6 commit 84d2652

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

kernel/sched/fair.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9719,9 +9719,10 @@ static bool __update_blocked_others(struct rq *rq, bool *done)
97199719

97209720
hw_pressure = arch_scale_hw_pressure(cpu_of(rq));
97219721

9722+
/* hw_pressure doesn't care about invariance */
97229723
decayed = update_rt_rq_load_avg(now, rq, curr_class == &rt_sched_class) |
97239724
update_dl_rq_load_avg(now, rq, curr_class == &dl_sched_class) |
9724-
update_hw_load_avg(now, rq, hw_pressure) |
9725+
update_hw_load_avg(rq_clock_task(rq), rq, hw_pressure) |
97259726
update_irq_load_avg(rq, 0);
97269727

97279728
if (others_have_blocked(rq))

0 commit comments

Comments
 (0)