diff options
| author | Dan Schatzberg <schatzberg.dan@gmail.com> | 2021-10-28 15:15:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-18 14:04:13 +0100 |
| commit | 9308f9c9c7a562e51abcbd4a32d0d30e2f01c384 (patch) | |
| tree | 6840992dcd970199b91ace539331758f9432a7a2 /kernel | |
| parent | a3fdcd16b138c2f680f4949b0ed646e9d34b1eed (diff) | |
| download | linux-stable-9308f9c9c7a562e51abcbd4a32d0d30e2f01c384.tar.gz linux-stable-9308f9c9c7a562e51abcbd4a32d0d30e2f01c384.tar.bz2 linux-stable-9308f9c9c7a562e51abcbd4a32d0d30e2f01c384.zip | |
cgroup: Fix rootcg cpu.stat guest double counting
[ Upstream commit 81c49d39aea8a10e6d05d3aa1cb65ceb721e19b0 ]
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 <schatzberg.dan@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup/rstat.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index d51175cedfca..89ca9b61aa0d 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -421,8 +421,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]; } } |