From 8630facf34057a107e55b0e0138f7c5841908119 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 16 Nov 2021 12:25:03 +0800 Subject: [PATCH] Revert "sched/fair: Ensure _sum and _avg values stay consistent" This reverts commit 20285dc2711c96a7fc1a72707823c580702edde6, which causes serious performance downgrade because the calculated cpu frequency will be much lower than before due to change of cpu util. Bug: 205915994 Test: build pass Change-Id: I68dced7a58547a3324fcfeebea6c02bb30c4182d Signed-off-by: Rick Yiu --- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8b45d14616ee..f9c570d86282 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3682,15 +3682,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq) r = removed_load; sub_positive(&sa->load_avg, r); - sa->load_sum = sa->load_avg * divider; + sub_positive(&sa->load_sum, r * divider); r = removed_util; sub_positive(&sa->util_avg, r); - sa->util_sum = sa->util_avg * divider; + sub_positive(&sa->util_sum, r * divider); r = removed_runnable; sub_positive(&sa->runnable_avg, r); - sa->runnable_sum = sa->runnable_avg * divider; + sub_positive(&sa->runnable_sum, r * divider); /* * removed_runnable is the unweighted version of removed_load so we