Skip to content

Commit 40f5aa4

Browse files
kuyo changPeter Zijlstra
authored andcommitted
sched/pelt: Fix attach_entity_load_avg() corner case
The warning in cfs_rq_is_decayed() triggered: SCHED_WARN_ON(cfs_rq->avg.load_avg || cfs_rq->avg.util_avg || cfs_rq->avg.runnable_avg) There exists a corner case in attach_entity_load_avg() which will cause load_sum to be zero while load_avg will not be. Consider se_weight is 88761 as per the sched_prio_to_weight[] table. Further assume the get_pelt_divider() is 47742, this gives: se->avg.load_avg is 1. However, calculating load_sum: se->avg.load_sum = div_u64(se->avg.load_avg * se->avg.load_sum, se_weight(se)); se->avg.load_sum = 1*47742/88761 = 0. Then enqueue_load_avg() adds this to the cfs_rq totals: cfs_rq->avg.load_avg += se->avg.load_avg; cfs_rq->avg.load_sum += se_weight(se) * se->avg.load_sum; Resulting in load_avg being 1 with load_sum is 0, which will trigger the WARN. Fixes: f207934 ("sched/fair: Align PELT windows between cfs_rq and its se") Signed-off-by: kuyo chang <[email protected]> [peterz: massage changelog] Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Vincent Guittot <[email protected]> Tested-by: Dietmar Eggemann <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent b2d229d commit 40f5aa4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

kernel/sched/fair.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3829,11 +3829,11 @@ static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *s
38293829

38303830
se->avg.runnable_sum = se->avg.runnable_avg * divider;
38313831

3832-
se->avg.load_sum = divider;
3833-
if (se_weight(se)) {
3834-
se->avg.load_sum =
3835-
div_u64(se->avg.load_avg * se->avg.load_sum, se_weight(se));
3836-
}
3832+
se->avg.load_sum = se->avg.load_avg * divider;
3833+
if (se_weight(se) < se->avg.load_sum)
3834+
se->avg.load_sum = div_u64(se->avg.load_sum, se_weight(se));
3835+
else
3836+
se->avg.load_sum = 1;
38373837

38383838
enqueue_load_avg(cfs_rq, se);
38393839
cfs_rq->avg.util_avg += se->avg.util_avg;

0 commit comments

Comments
 (0)