From: Paul Turner <pjt@google.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Bharata B Rao <bharata@linux.vnet.ibm.com>,
Dhaval Giani <dhaval.giani@gmail.com>,
Balbir Singh <balbir@linux.vnet.ibm.com>,
Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>,
Srivatsa Vaddagiri <vatsa@in.ibm.com>,
Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>,
Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>,
Ingo Molnar <mingo@elte.hu>, Pavel Emelyanov <xemul@openvz.org>,
Hu Tao <hutao@cn.fujitsu.com>, Nikhil Rao <ncrao@google.com>
Subject: [patch 15/17] sched: add exports tracking cfs bandwidth control statistics
Date: Wed, 06 Jul 2011 22:30:51 -0700 [thread overview]
Message-ID: <20110707053101.110722366@google.com> (raw)
In-Reply-To: 20110707053036.173186930@google.com
[-- Attachment #1: sched-bwc-throttle_stats.patch --]
[-- Type: text/plain, Size: 3605 bytes --]
From: Nikhil Rao <ncrao@google.com>
This change introduces statistics exports for the cpu sub-system, these are
added through the use of a stat file similar to that exported by other
subsystems.
The following exports are included:
nr_periods: number of periods in which execution occurred
nr_throttled: the number of periods above in which execution was throttle
throttled_time: cumulative wall-time that any cpus have been throttled for
this group
Signed-off-by: Paul Turner <pjt@google.com>
Signed-off-by: Nikhil Rao <ncrao@google.com>
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
---
kernel/sched.c | 21 +++++++++++++++++++++
kernel/sched_fair.c | 7 +++++++
2 files changed, 28 insertions(+)
Index: tip/kernel/sched.c
===================================================================
--- tip.orig/kernel/sched.c
+++ tip/kernel/sched.c
@@ -259,6 +259,9 @@ struct cfs_bandwidth {
struct hrtimer period_timer;
struct list_head throttled_cfs_rq;
+ /* statistics */
+ int nr_periods, nr_throttled;
+ u64 throttled_time;
#endif
};
@@ -399,6 +402,7 @@ struct cfs_rq {
u64 runtime_expires;
s64 runtime_remaining;
+ u64 throttled_timestamp;
int throttled, throttle_count;
struct list_head throttled_list;
#endif
@@ -9212,6 +9216,19 @@ static int __cfs_schedulable(struct task
return ret;
}
+
+static int cpu_stats_show(struct cgroup *cgrp, struct cftype *cft,
+ struct cgroup_map_cb *cb)
+{
+ struct task_group *tg = cgroup_tg(cgrp);
+ struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(tg);
+
+ cb->fill(cb, "nr_periods", cfs_b->nr_periods);
+ cb->fill(cb, "nr_throttled", cfs_b->nr_throttled);
+ cb->fill(cb, "throttled_time", cfs_b->throttled_time);
+
+ return 0;
+}
#endif /* CONFIG_CFS_BANDWIDTH */
#endif /* CONFIG_FAIR_GROUP_SCHED */
@@ -9258,6 +9275,10 @@ static struct cftype cpu_files[] = {
.read_u64 = cpu_cfs_period_read_u64,
.write_u64 = cpu_cfs_period_write_u64,
},
+ {
+ .name = "stat",
+ .read_map = cpu_stats_show,
+ },
#endif
#ifdef CONFIG_RT_GROUP_SCHED
{
Index: tip/kernel/sched_fair.c
===================================================================
--- tip.orig/kernel/sched_fair.c
+++ tip/kernel/sched_fair.c
@@ -1522,6 +1522,7 @@ static void throttle_cfs_rq(struct cfs_r
rq->nr_running -= task_delta;
cfs_rq->throttled = 1;
+ cfs_rq->throttled_timestamp = rq->clock;
raw_spin_lock(&cfs_b->lock);
list_add_tail_rcu(&cfs_rq->throttled_list, &cfs_b->throttled_cfs_rq);
raw_spin_unlock(&cfs_b->lock);
@@ -1576,8 +1577,10 @@ static void unthrottle_cfs_rq(struct cfs
cfs_rq->throttled = 0;
raw_spin_lock(&cfs_b->lock);
+ cfs_b->throttled_time += rq->clock - cfs_rq->throttled_timestamp;
list_del_rcu(&cfs_rq->throttled_list);
raw_spin_unlock(&cfs_b->lock);
+ cfs_rq->throttled_timestamp = 0;
update_rq_clock(rq);
/* update hierarchical throttle state */
@@ -1665,6 +1668,7 @@ static int do_sched_cfs_period_timer(str
throttled = !list_empty(&cfs_b->throttled_cfs_rq);
/* idle depends on !throttled (for the case of a large deficit) */
idle = cfs_b->idle && !throttled;
+ cfs_b->nr_periods += overrun;
/* if we're going inactive then everything else can be deferred */
if (idle)
@@ -1678,6 +1682,9 @@ static int do_sched_cfs_period_timer(str
goto out_unlock;
}
+ /* account preceding periods in which throttling occurred */
+ cfs_b->nr_throttled += overrun;
+
/*
* There are throttled entities so we must first use the new bandwidth
* to unthrottle them before making it generally available. This
next prev parent reply other threads:[~2011-07-07 5:33 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 5:30 [patch 00/17] CFS Bandwidth Control v7.1 Paul Turner
2011-07-07 5:30 ` [patch 01/17] sched: (fixlet) dont update shares twice on on_rq parent Paul Turner
2011-07-21 18:28 ` [tip:sched/core] sched: Don't " tip-bot for Paul Turner
2011-07-07 5:30 ` [patch 02/17] sched: hierarchical task accounting for SCHED_OTHER Paul Turner
2011-07-07 5:30 ` [patch 03/17] sched: introduce primitives to account for CFS bandwidth tracking Paul Turner
2011-07-07 13:48 ` Peter Zijlstra
2011-07-07 21:30 ` Paul Turner
2011-07-07 5:30 ` [patch 04/17] sched: validate CFS quota hierarchies Paul Turner
2011-07-07 5:30 ` [patch 05/17] sched: accumulate per-cfs_rq cpu usage and charge against bandwidth Paul Turner
2011-07-07 5:30 ` [patch 06/17] sched: add a timer to handle CFS bandwidth refresh Paul Turner
2011-07-07 5:30 ` [patch 07/17] sched: expire invalid runtime Paul Turner
2011-07-07 5:30 ` [patch 08/17] sched: add support for throttling group entities Paul Turner
2011-07-07 5:30 ` [patch 09/17] sched: add support for unthrottling " Paul Turner
2011-07-07 5:30 ` [patch 10/17] sched: allow for positional tg_tree walks Paul Turner
2011-07-07 5:30 ` [patch 11/17] sched: prevent interactions with throttled entities Paul Turner
2011-07-07 5:30 ` [patch 12/17] sched: prevent buddy " Paul Turner
2011-07-07 5:30 ` [patch 13/17] sched: migrate throttled tasks on HOTPLUG Paul Turner
2011-07-07 5:30 ` [patch 14/17] sched: throttle entities exceeding their allowed bandwidth Paul Turner
2011-07-07 5:30 ` Paul Turner [this message]
2011-07-07 5:30 ` [patch 16/17] sched: return unused runtime on group dequeue Paul Turner
2011-07-07 5:30 ` [patch 17/17] sched: add documentation for bandwidth control Paul Turner
2011-07-07 11:13 ` [patch 00/17] CFS Bandwidth Control v7.1 Peter Zijlstra
2011-07-11 1:22 ` Hu Tao
2011-07-07 11:23 ` Ingo Molnar
2011-07-07 11:28 ` Peter Zijlstra
2011-07-07 14:38 ` Peter Zijlstra
2011-07-07 14:51 ` Ingo Molnar
2011-07-07 14:54 ` Peter Zijlstra
2011-07-07 14:56 ` Ingo Molnar
2011-07-07 16:23 ` Jason Baron
2011-07-07 17:20 ` Peter Zijlstra
2011-07-07 18:15 ` Jason Baron
2011-07-07 20:36 ` jump_label defaults (was Re: [patch 00/17] CFS Bandwidth Control v7.1) Peter Zijlstra
2011-07-08 9:20 ` Peter Zijlstra
2011-07-08 15:47 ` Jason Baron
2011-07-07 16:52 ` [patch 00/17] CFS Bandwidth Control v7.1 Andi Kleen
2011-07-07 17:08 ` Peter Zijlstra
2011-07-07 17:59 ` Peter Zijlstra
2011-07-07 19:36 ` Jason Baron
2011-07-08 7:45 ` Paul Turner
2011-07-08 7:39 ` Paul Turner
2011-07-08 10:32 ` Peter Zijlstra
2011-07-09 7:34 ` Paul Turner
2011-07-10 18:12 ` Ingo Molnar
2011-07-07 14:06 ` Peter Zijlstra
2011-07-08 7:35 ` Paul Turner
2011-07-11 1:22 ` Hu Tao
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=20110707053101.110722366@google.com \
--to=pjt@google.com \
--cc=a.p.zijlstra@chello.nl \
--cc=balbir@linux.vnet.ibm.com \
--cc=bharata@linux.vnet.ibm.com \
--cc=dhaval.giani@gmail.com \
--cc=hutao@cn.fujitsu.com \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=ncrao@google.com \
--cc=seto.hidetoshi@jp.fujitsu.com \
--cc=svaidy@linux.vnet.ibm.com \
--cc=vatsa@in.ibm.com \
--cc=xemul@openvz.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).