From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH v7 04/11] sched: adjust exec_clock to use it as cpu usage metric Date: Wed, 29 May 2013 15:03:15 +0400 Message-ID: <1369825402-31046-5-git-send-email-glommer@openvz.org> References: <1369825402-31046-1-git-send-email-glommer@openvz.org> Return-path: In-Reply-To: <1369825402-31046-1-git-send-email-glommer@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Peter Zijlstra Cc: Paul Turner , linux-kernel@vger.kernel.org, Tejun Heo , cgroups@vger.kernel.org, Frederic Weisbecker , devel@openvz.org, Glauber Costa , Dave Jones , Ben Hutchings , Lennart Poettering , Kay Sievers 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 e9f8dcd..4a21045 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -907,6 +907,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 765c687..b05dd84 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -254,6 +254,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; @@ -356,6 +357,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.4