From: Glauber Costa <glommer@parallels.com> To: <cgroups@vger.kernel.org> Cc: <linux-kernel@vger.kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Tejun Heo <tj@kernel.org>, Peter Zijlstra <a.p.zijlstra@chello.nl>, Paul Turner <pjt@google.com>, Glauber Costa <glommer@parallels.com>, Dave Jones <davej@redhat.com>, Ben Hutchings <ben@decadent.org.uk>, Lennart Poettering <lennart@poettering.net>, Kay Sievers <kay.sievers@vrfy.org> Subject: [PATCH v5 05/11] sched: adjust exec_clock to use it as cpu usage metric Date: Wed, 9 Jan 2013 15:45:32 +0400 [thread overview] Message-ID: <1357731938-8417-6-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1357731938-8417-1-git-send-email-glommer@parallels.com> 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 <glommer@parallels.com> CC: Dave Jones <davej@redhat.com> CC: Ben Hutchings <ben@decadent.org.uk> CC: Peter Zijlstra <a.p.zijlstra@chello.nl> CC: Paul Turner <pjt@google.com> CC: Lennart Poettering <lennart@poettering.net> CC: Kay Sievers <kay.sievers@vrfy.org> CC: Tejun Heo <tj@kernel.org> --- 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.7.11.7
WARNING: multiple messages have this Message-ID (diff)
From: Glauber Costa <glommer@parallels.com> To: cgroups@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Tejun Heo <tj@kernel.org>, Peter Zijlstra <a.p.zijlstra@chello.nl>, Paul Turner <pjt@google.com>, Glauber Costa <glommer@parallels.com>, Dave Jones <davej@redhat.com>, Ben Hutchings <ben@decadent.org.uk>, Lennart Poettering <lennart@poettering.net>, Kay Sievers <kay.sievers@vrfy.org> Subject: [PATCH v5 05/11] sched: adjust exec_clock to use it as cpu usage metric Date: Wed, 9 Jan 2013 15:45:32 +0400 [thread overview] Message-ID: <1357731938-8417-6-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1357731938-8417-1-git-send-email-glommer@parallels.com> 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 <glommer@parallels.com> CC: Dave Jones <davej@redhat.com> CC: Ben Hutchings <ben@decadent.org.uk> CC: Peter Zijlstra <a.p.zijlstra@chello.nl> CC: Paul Turner <pjt@google.com> CC: Lennart Poettering <lennart@poettering.net> CC: Kay Sievers <kay.sievers@vrfy.org> CC: Tejun Heo <tj@kernel.org> --- 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.7.11.7
next prev parent reply other threads:[~2013-01-09 11:45 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-01-09 11:45 [PATCH v5 00/11] per-cgroup cpu-stat Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 01/11] don't call cpuacct_charge in stop_task.c Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 02/11] cgroup: implement CFTYPE_NO_PREFIX Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 03/11] cgroup, sched: let cpu serve the same files as cpuacct Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-14 8:34 ` Sha Zhengju 2013-01-14 8:34 ` Sha Zhengju 2013-01-14 14:55 ` Glauber Costa 2013-01-14 14:55 ` Glauber Costa 2013-01-15 10:19 ` Sha Zhengju 2013-01-15 10:19 ` Sha Zhengju 2013-01-15 17:52 ` Glauber Costa 2013-01-15 17:52 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 04/11] cgroup, sched: deprecate cpuacct Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` Glauber Costa [this message] 2013-01-09 11:45 ` [PATCH v5 05/11] sched: adjust exec_clock to use it as cpu usage metric Glauber Costa 2013-01-09 11:45 ` [PATCH v5 06/11] cpuacct: don't actually do anything Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 07/11] account guest time per-cgroup as well Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 08/11] sched: Push put_prev_task() into pick_next_task() Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 09/11] record per-cgroup number of context switches Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 10/11] sched: change nr_context_switches calculation Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 11:45 ` [PATCH v5 11/11] sched: introduce cgroup file stat_percpu Glauber Costa 2013-01-09 11:45 ` Glauber Costa 2013-01-09 20:42 ` Andrew Morton 2013-01-09 20:42 ` Andrew Morton 2013-01-09 21:10 ` Glauber Costa 2013-01-09 21:10 ` Glauber Costa 2013-01-09 21:17 ` Andrew Morton 2013-01-09 21:17 ` Andrew Morton 2013-01-09 21:27 ` Glauber Costa 2013-01-09 21:27 ` Glauber Costa 2013-01-23 14:26 ` Glauber Costa 2013-01-23 14:26 ` Glauber Costa 2013-01-23 14:20 ` Glauber Costa 2013-01-23 14:20 ` Glauber Costa 2013-01-09 14:41 ` [PATCH v5 00/11] per-cgroup cpu-stat Tejun Heo 2013-01-09 14:41 ` Tejun Heo 2013-01-16 0:33 ` Colin Cross 2013-01-21 12:14 ` Glauber Costa 2013-01-21 12:14 ` Glauber Costa 2013-01-23 1:02 ` Tejun Heo 2013-01-23 1:02 ` Tejun Heo 2013-01-23 1:53 ` Colin Cross 2013-01-23 1:53 ` Colin Cross 2013-01-23 8:12 ` Glauber Costa 2013-01-23 8:12 ` Glauber Costa 2013-01-23 16:56 ` Tejun Heo 2013-01-23 16:56 ` Tejun Heo 2013-01-23 22:41 ` Colin Cross 2013-01-23 23:06 ` Tejun Heo 2013-01-23 23:06 ` Tejun Heo 2013-01-23 23:53 ` Colin Cross 2013-01-23 23:53 ` Colin Cross
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1357731938-8417-6-git-send-email-glommer@parallels.com \ --to=glommer@parallels.com \ --cc=a.p.zijlstra@chello.nl \ --cc=akpm@linux-foundation.org \ --cc=ben@decadent.org.uk \ --cc=cgroups@vger.kernel.org \ --cc=davej@redhat.com \ --cc=kay.sievers@vrfy.org \ --cc=lennart@poettering.net \ --cc=linux-kernel@vger.kernel.org \ --cc=pjt@google.com \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.