| Message ID | 20210820094005.20596-1-arbn@yandex-team.com |
|---|---|
| State | Accepted |
| Commit | 9731698ecb9c851f353ce2496292ff9fcea39dff |
| Headers | show |
| Series | [v2,1/5] cputime, cpuacct: Include guest time in user time in cpuacct.stat | expand |
On Fri, Aug 20, 2021 at 12:40:01PM +0300, Andrey Ryabinin wrote: > 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> > Cc: <stable@vger.kernel.org> The fact that this has been broken for so long, prolly from the beginning, gives me some pause but the patches looks fine to me. For the series, Acked-by: Tejun Heo <tj@kernel.org> Thanks. -- tejun
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 872e481d5098..042a6dbce8f3 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -148,10 +148,10 @@ void account_guest_time(struct task_struct *p, u64 cputime) /* 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; } }
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> Cc: <stable@vger.kernel.org> --- Changes since v1: - Don't CPUTIME_GUEST* since they aren't used cgroups --- kernel/sched/cputime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)