| From 9731698ecb9c851f353ce2496292ff9fcea39dff Mon Sep 17 00:00:00 2001 |
| From: Andrey Ryabinin <arbn@yandex-team.com> |
| Date: Mon, 15 Nov 2021 19:46:04 +0300 |
| Subject: cputime, cpuacct: Include guest time in user time in cpuacct.stat |
| |
| From: Andrey Ryabinin <arbn@yandex-team.com> |
| |
| commit 9731698ecb9c851f353ce2496292ff9fcea39dff upstream. |
| |
| cpuacct.stat in no-root cgroups shows user time without guest time |
| included int it. This doesn't match with user time shown in root |
| cpuacct.stat and /proc/<pid>/stat. This also affects cgroup2's cpu.stat |
| in the same way. |
| |
| Make account_guest_time() to add user time to cgroup's cpustat to |
| fix this. |
| |
| Fixes: ef12fefabf94 ("cpuacct: add per-cgroup utime/stime statistics") |
| Signed-off-by: Andrey Ryabinin <arbn@yandex-team.com> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com> |
| Acked-by: Tejun Heo <tj@kernel.org> |
| Cc: <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20211115164607.23784-1-arbn@yandex-team.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| kernel/sched/cputime.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/kernel/sched/cputime.c |
| +++ b/kernel/sched/cputime.c |
| @@ -147,10 +147,10 @@ void account_guest_time(struct task_stru |
| |
| /* Add guest time to cpustat. */ |
| if (task_nice(p) > 0) { |
| - cpustat[CPUTIME_NICE] += cputime; |
| + task_group_account_field(p, CPUTIME_NICE, cputime); |
| cpustat[CPUTIME_GUEST_NICE] += cputime; |
| } else { |
| - cpustat[CPUTIME_USER] += cputime; |
| + task_group_account_field(p, CPUTIME_USER, cputime); |
| cpustat[CPUTIME_GUEST] += cputime; |
| } |
| } |
