Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae2e0b2f authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Greg Kroah-Hartman
Browse files

cputime, cpuacct: Include guest time in user time in cpuacct.stat 



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: ef12fefa ("cpuacct: add per-cgroup utime/stime statistics")
Signed-off-by: default avatarAndrey Ryabinin <arbn@yandex-team.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Acked-by: default avatarTejun 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c526d53e

kernel/sched/cputime.c

+2 −2
Original line number Diff line number Diff line
@@ -147,10 +147,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;

	}

}