From: Dan Schatzberg Date: Thu, 28 Oct 2021 22:15:27 +0000 (-0700) Subject: cgroup: Fix rootcg cpu.stat guest double counting X-Git-Tag: v6.1-rc5~2755^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81c49d39aea8a10e6d05d3aa1cb65ceb721e19b0;p=platform%2Fkernel%2Flinux-starfive.git cgroup: Fix rootcg cpu.stat guest double counting In account_guest_time in kernel/sched/cputime.c guest time is attributed to both CPUTIME_NICE and CPUTIME_USER in addition to CPUTIME_GUEST_NICE and CPUTIME_GUEST respectively. Therefore, adding both to calculate usage results in double counting any guest time at the rootcg. Fixes: 936f2a70f207 ("cgroup: add cpu.stat file to root cgroup") Signed-off-by: Dan Schatzberg Signed-off-by: Tejun Heo --- diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index b264ab5..1486768 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -433,8 +433,6 @@ static void root_cgroup_cputime(struct task_cputime *cputime) cputime->sum_exec_runtime += user; cputime->sum_exec_runtime += sys; cputime->sum_exec_runtime += cpustat[CPUTIME_STEAL]; - cputime->sum_exec_runtime += cpustat[CPUTIME_GUEST]; - cputime->sum_exec_runtime += cpustat[CPUTIME_GUEST_NICE]; } }