Skip to content

Commit 1c35b07

Browse files
odinugePeter Zijlstra
authored andcommitted
sched/fair: Ensure _sum and _avg values stay consistent
The _sum and _avg values are in general sync together with the PELT divider. They are however not always completely in perfect sync, resulting in situations where _sum gets to zero while _avg stays positive. Such situations are undesirable. This comes from the fact that PELT will increase period_contrib, also increasing the PELT divider, without updating _sum and _avg values to stay in perfect sync where (_sum == _avg * divider). However, such PELT change will never lower _sum, making it impossible to end up in a situation where _sum is zero and _avg is not. Therefore, we need to ensure that when subtracting load outside PELT, that when _sum is zero, _avg is also set to zero. This occurs when (_sum < _avg * divider), and the subtracted (_avg * divider) is bigger or equal to the current _sum, while the subtracted _avg is smaller than the current _avg. Reported-by: Sachin Sant <sachinp@linux.vnet.ibm.com> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> Signed-off-by: Odin Ugedal <odin@uged.al> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com> Link: https://lore.kernel.org/r/20210624111815.57937-1-odin@uged.al
1 parent adf3c31 commit 1c35b07

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

kernel/sched/fair.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,15 +3657,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
36573657

36583658
r = removed_load;
36593659
sub_positive(&sa->load_avg, r);
3660-
sub_positive(&sa->load_sum, r * divider);
3660+
sa->load_sum = sa->load_avg * divider;
36613661

36623662
r = removed_util;
36633663
sub_positive(&sa->util_avg, r);
3664-
sub_positive(&sa->util_sum, r * divider);
3664+
sa->util_sum = sa->util_avg * divider;
36653665

36663666
r = removed_runnable;
36673667
sub_positive(&sa->runnable_avg, r);
3668-
sub_positive(&sa->runnable_sum, r * divider);
3668+
sa->runnable_sum = sa->runnable_avg * divider;
36693669

36703670
/*
36713671
* removed_runnable is the unweighted version of removed_load so we

0 commit comments

Comments
 (0)