From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755361Ab3AXPR4 (ORCPT ); Thu, 24 Jan 2013 10:17:56 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:43767 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755222Ab3AXPRx (ORCPT ); Thu, 24 Jan 2013 10:17:53 -0500 From: Lord Glauber Costa of Sealand To: Cc: Andrew Morton , Tejun Heo , ccross@google.com, Peter Zijlstra , Paul Turner , Glauber Costa , Dave Jones , Ben Hutchings , Lennart Poettering , Kay Sievers Subject: [PATCH v6 05/12] sched: adjust exec_clock to use it as cpu usage metric Date: Thu, 24 Jan 2013 19:17:35 +0400 Message-Id: <1359040662-8055-6-git-send-email-glommer@parallels.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359040662-8055-1-git-send-email-glommer@parallels.com> References: <1359040662-8055-1-git-send-email-glommer@parallels.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Glauber Costa exec_clock already provides per-group cpu usage metrics, and can be reused by cpuacct in case cpu and cpuacct are comounted. However, it is only provided by tasks in fair class. Doing the same for rt is easy, and can be done in an already existing hierarchy loop. This is an improvement over the independent hierarchy walk executed by cpuacct. Signed-off-by: Glauber Costa CC: Dave Jones CC: Ben Hutchings CC: Peter Zijlstra CC: Paul Turner CC: Lennart Poettering CC: Kay Sievers CC: Tejun Heo --- kernel/sched/rt.c | 1 + kernel/sched/sched.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index f7e05d87..7f6f6c6 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -945,6 +945,7 @@ static void update_curr_rt(struct rq *rq) for_each_sched_rt_entity(rt_se) { rt_rq = rt_rq_of_se(rt_se); + schedstat_add(rt_rq, exec_clock, delta_exec); if (sched_rt_runtime(rt_rq) != RUNTIME_INF) { raw_spin_lock(&rt_rq->rt_runtime_lock); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 84a339d..01ca8a4 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -210,6 +210,7 @@ struct cfs_rq { unsigned int nr_running, h_nr_running; u64 exec_clock; + u64 prev_exec_clock; u64 min_vruntime; #ifndef CONFIG_64BIT u64 min_vruntime_copy; @@ -312,6 +313,8 @@ struct rt_rq { struct plist_head pushable_tasks; #endif int rt_throttled; + u64 exec_clock; + u64 prev_exec_clock; u64 rt_time; u64 rt_runtime; /* Nests inside the rq lock: */ -- 1.8.1