| Message ID | 20210217120004.7984-2-arbn@yandex-team.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/4] cputime,cpuacct: Include guest time in user time in cpuacct.stat | expand |
Andrey Ryabinin <arbn@yandex-team.com> writes: > Global CPUTIME_USER counter already includes CPUTIME_GUEST > Also CPUTIME_NICE already includes CPUTIME_GUEST_NICE. > > Remove additions of CPUTIME_GUEST[_NICE] to total ->sum_exec_runtime > to not account them twice. Yes, that's just wrong. usage_usec looks ok now. Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com> Tested-by: Daniel Jordan <daniel.m.jordan@oracle.com>
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]; } }
Global CPUTIME_USER counter already includes CPUTIME_GUEST Also CPUTIME_NICE already includes CPUTIME_GUEST_NICE. Remove additions of CPUTIME_GUEST[_NICE] to total ->sum_exec_runtime to not account them twice. Fixes: 936f2a70f207 ("cgroup: add cpu.stat file to root cgroup") Signed-off-by: Andrey Ryabinin <arbn@yandex-team.com> Cc: <stable@vger.kernel.org> --- kernel/cgroup/rstat.c | 2 -- 1 file changed, 2 deletions(-)