Commit 81c49d39 authored by Dan Schatzberg's avatar Dan Schatzberg Committed by Tejun Heo
Browse files

cgroup: Fix rootcg cpu.stat guest double counting 



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: 936f2a70 ("cgroup: add cpu.stat file to root cgroup")
Signed-off-by: default avatarDan Schatzberg <schatzberg.dan@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 822bc9ba

kernel/cgroup/rstat.c

+0 −2
Original line number Diff line number Diff line
@@ -433,8 +433,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];

	}

}