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> Subject: [PATCH v5 10/11] sched: change nr_context_switches calculation. Date: Wed, 9 Jan 2013 15:45:37 +0400 [thread overview] Message-ID: <1357731938-8417-11-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1357731938-8417-1-git-send-email-glommer@parallels.com> This patch changes the calculation of nr_context_switches. The variable "nr_switches" is now used to account for the number of transition to the idle task, or stop task. It is removed from the schedule() path. The total calculation can be made using the fact that the transitions to fair and rt classes are recorded in the root_task_group. One can easily derive the total figure by adding those quantities together. Signed-off-by: Glauber Costa <glommer@parallels.com> CC: Peter Zijlstra <a.p.zijlstra@chello.nl> CC: Paul Turner <pjt@google.com> --- kernel/sched/core.c | 17 +++++++++++++++-- kernel/sched/idle_task.c | 3 +++ kernel/sched/stop_task.c | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index c36df03..6bb56f0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2001,13 +2001,27 @@ unsigned long nr_uninterruptible(void) return sum; } +#ifdef CONFIG_FAIR_GROUP_SCHED +#define cfs_nr_switches(tg, cpu) (tg)->cfs_rq[cpu]->nr_switches +#else +#define cfs_nr_switches(tg, cpu) cpu_rq(cpu)->cfs.nr_switches +#endif +#ifdef CONFIG_RT_GROUP_SCHED +#define rt_nr_switches(tg, cpu) (tg)->rt_rq[cpu]->rt_nr_switches +#else +#define rt_nr_switches(tg, cpu) cpu_rq(cpu)->rt.rt_nr_switches +#endif + unsigned long long nr_context_switches(void) { int i; unsigned long long sum = 0; - for_each_possible_cpu(i) + for_each_possible_cpu(i) { + sum += cfs_nr_switches(&root_task_group, i); + sum += rt_nr_switches(&root_task_group, i); sum += cpu_rq(i)->nr_switches; + } return sum; } @@ -2929,7 +2943,6 @@ need_resched: rq->skip_clock_update = 0; if (likely(prev != next)) { - rq->nr_switches++; rq->curr = next; ++*switch_count; diff --git a/kernel/sched/idle_task.c b/kernel/sched/idle_task.c index 07e6027..652d98c 100644 --- a/kernel/sched/idle_task.c +++ b/kernel/sched/idle_task.c @@ -28,6 +28,9 @@ pick_next_task_idle(struct rq *rq, struct task_struct *prev) if (prev) prev->sched_class->put_prev_task(rq, prev); + if (prev != rq->idle) + rq->nr_switches++; + schedstat_inc(rq, sched_goidle); return rq->idle; } diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c index 5f10918..d1e9b82 100644 --- a/kernel/sched/stop_task.c +++ b/kernel/sched/stop_task.c @@ -32,6 +32,8 @@ pick_next_task_stop(struct rq *rq, struct task_struct *prev) stop->se.exec_start = rq->clock_task; if (prev) prev->sched_class->put_prev_task(rq, prev); + if (prev != rq->stop) + rq->nr_switches++; return stop; } -- 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> Subject: [PATCH v5 10/11] sched: change nr_context_switches calculation. Date: Wed, 9 Jan 2013 15:45:37 +0400 [thread overview] Message-ID: <1357731938-8417-11-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1357731938-8417-1-git-send-email-glommer@parallels.com> This patch changes the calculation of nr_context_switches. The variable "nr_switches" is now used to account for the number of transition to the idle task, or stop task. It is removed from the schedule() path. The total calculation can be made using the fact that the transitions to fair and rt classes are recorded in the root_task_group. One can easily derive the total figure by adding those quantities together. Signed-off-by: Glauber Costa <glommer@parallels.com> CC: Peter Zijlstra <a.p.zijlstra@chello.nl> CC: Paul Turner <pjt@google.com> --- kernel/sched/core.c | 17 +++++++++++++++-- kernel/sched/idle_task.c | 3 +++ kernel/sched/stop_task.c | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index c36df03..6bb56f0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2001,13 +2001,27 @@ unsigned long nr_uninterruptible(void) return sum; } +#ifdef CONFIG_FAIR_GROUP_SCHED +#define cfs_nr_switches(tg, cpu) (tg)->cfs_rq[cpu]->nr_switches +#else +#define cfs_nr_switches(tg, cpu) cpu_rq(cpu)->cfs.nr_switches +#endif +#ifdef CONFIG_RT_GROUP_SCHED +#define rt_nr_switches(tg, cpu) (tg)->rt_rq[cpu]->rt_nr_switches +#else +#define rt_nr_switches(tg, cpu) cpu_rq(cpu)->rt.rt_nr_switches +#endif + unsigned long long nr_context_switches(void) { int i; unsigned long long sum = 0; - for_each_possible_cpu(i) + for_each_possible_cpu(i) { + sum += cfs_nr_switches(&root_task_group, i); + sum += rt_nr_switches(&root_task_group, i); sum += cpu_rq(i)->nr_switches; + } return sum; } @@ -2929,7 +2943,6 @@ need_resched: rq->skip_clock_update = 0; if (likely(prev != next)) { - rq->nr_switches++; rq->curr = next; ++*switch_count; diff --git a/kernel/sched/idle_task.c b/kernel/sched/idle_task.c index 07e6027..652d98c 100644 --- a/kernel/sched/idle_task.c +++ b/kernel/sched/idle_task.c @@ -28,6 +28,9 @@ pick_next_task_idle(struct rq *rq, struct task_struct *prev) if (prev) prev->sched_class->put_prev_task(rq, prev); + if (prev != rq->idle) + rq->nr_switches++; + schedstat_inc(rq, sched_goidle); return rq->idle; } diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c index 5f10918..d1e9b82 100644 --- a/kernel/sched/stop_task.c +++ b/kernel/sched/stop_task.c @@ -32,6 +32,8 @@ pick_next_task_stop(struct rq *rq, struct task_struct *prev) stop->se.exec_start = rq->clock_task; if (prev) prev->sched_class->put_prev_task(rq, prev); + if (prev != rq->stop) + rq->nr_switches++; return stop; } -- 1.7.11.7
next prev parent reply other threads:[~2013-01-09 11:46 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 ` [PATCH v5 05/11] sched: adjust exec_clock to use it as cpu usage metric Glauber Costa 2013-01-09 11:45 ` 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 ` Glauber Costa [this message] 2013-01-09 11:45 ` [PATCH v5 10/11] sched: change nr_context_switches calculation 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-11-git-send-email-glommer@parallels.com \ --to=glommer@parallels.com \ --cc=a.p.zijlstra@chello.nl \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --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.