Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965801Ab3E2LDk (ORCPT ); Wed, 29 May 2013 07:03:40 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:3557 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965732Ab3E2LDi (ORCPT ); Wed, 29 May 2013 07:03:38 -0400 From: Glauber Costa To: Peter Zijlstra Cc: Paul Turner , , Tejun Heo , , Frederic Weisbecker , , Glauber Costa Subject: [PATCH v7 07/11] sched: account guest time per-cgroup as well. Date: Wed, 29 May 2013 15:03:18 +0400 Message-Id: <1369825402-31046-8-git-send-email-glommer@openvz.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1369825402-31046-1-git-send-email-glommer@openvz.org> References: <1369825402-31046-1-git-send-email-glommer@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1790 Lines: 48 We already track multiple tick statistics per-cgroup, using the task_group_account_field facility. This patch accounts guest_time in that manner as well. Signed-off-by: Glauber Costa CC: Peter Zijlstra CC: Paul Turner --- kernel/sched/cputime.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 74a44ef..e653e52 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -183,8 +183,6 @@ void account_user_time(struct task_struct *p, cputime_t cputime, static void account_guest_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled) { - u64 *cpustat = kcpustat_this_cpu->cpustat; - /* Add guest time to process. */ p->utime += cputime; p->utimescaled += cputime_scaled; @@ -193,11 +191,11 @@ static void account_guest_time(struct task_struct *p, cputime_t cputime, /* Add guest time to cpustat. */ if (TASK_NICE(p) > 0) { - cpustat[CPUTIME_NICE] += (__force u64) cputime; - cpustat[CPUTIME_GUEST_NICE] += (__force u64) cputime; + task_group_account_field(p, CPUTIME_NICE, (__force u64) cputime); + task_group_account_field(p, CPUTIME_GUEST, (__force u64) cputime); } else { - cpustat[CPUTIME_USER] += (__force u64) cputime; - cpustat[CPUTIME_GUEST] += (__force u64) cputime; + task_group_account_field(p, CPUTIME_USER, (__force u64) cputime); + task_group_account_field(p, CPUTIME_GUEST, (__force u64) cputime); } } -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/