LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 2/2] CFS CGroup: Report usage
@ 2007-10-23  0:49 Paul Menage
  2007-10-23  2:40 ` Srivatsa Vaddagiri
                   ` (3 more replies)
  0 siblings, 4 replies; 18+ messages in thread
From: Paul Menage @ 2007-10-23  0:49 UTC (permalink / raw)
  To: Andrew Morton, Ingo Molnar, Srivatsa Vaddagiri; +Cc: containers, linux-kernel

Report CPU usage in CFS Cgroup directories

Adds a cpu.usage file to the CFS cgroup that reports CPU usage in
milliseconds for that cgroup's tasks

This replaces the "example CPU Accounting CGroup subsystem" that
was merged into mainline last week.

Signed-off-by: Paul Menage <menage@google.com>

---
 kernel/sched.c |   32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

Index: container-2.6.23-mm1/kernel/sched.c
===================================================================
--- container-2.6.23-mm1.orig/kernel/sched.c
+++ container-2.6.23-mm1/kernel/sched.c
@@ -7005,15 +7005,37 @@ static u64 cpu_shares_read_uint(struct c
 	return (u64) tg->shares;
 }
 
-static struct cftype cpu_shares = {
-	.name = "shares",
-	.read_uint = cpu_shares_read_uint,
-	.write_uint = cpu_shares_write_uint,
+static u64 cpu_usage_read(struct cgroup *cgrp, struct cftype *cft)
+{
+	struct task_group *tg = cgroup_tg(cgrp);
+	int i;
+	u64 res = 0;
+	for_each_possible_cpu(i) {
+		unsigned long flags;
+		spin_lock_irqsave(&tg->cfs_rq[i]->rq->lock, flags);
+		res += tg->se[i]->sum_exec_runtime;
+		spin_unlock_irqrestore(&tg->cfs_rq[i]->rq->lock, flags);
+	}
+	/* Convert from ns to ms */
+	do_div(res, 1000000);
+	return res;
+}
+
+static struct cftype cpu_files[] = {
+	{
+		.name = "shares",
+		.read_uint = cpu_shares_read_uint,
+		.write_uint = cpu_shares_write_uint,
+	},
+	{
+		.name = "usage",
+		.read_uint = cpu_usage_read,
+	},
 };
 
 static int cpu_cgroup_populate(struct cgroup_subsys *ss, struct cgroup *cont)
 {
-	return cgroup_add_file(cont, ss, &cpu_shares);
+	return cgroup_add_files(cont, ss, cpu_files, ARRAY_SIZE(cpu_files));
 }
 
 struct cgroup_subsys cpu_cgroup_subsys = {

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2007-10-26  1:25 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-23  0:49 [PATCH 2/2] CFS CGroup: Report usage Paul Menage
2007-10-23  2:40 ` Srivatsa Vaddagiri
2007-10-23  6:06   ` Paul Menage
2007-10-23  7:21     ` Paul Menage
2007-10-23  7:49       ` Balbir Singh
2007-10-23  7:53         ` Paul Menage
2007-10-23  7:57           ` Balbir Singh
2007-10-23  8:08             ` Paul Menage
2007-10-23 16:41     ` Srivatsa Vaddagiri
2007-10-23  3:17 ` Balbir Singh
2007-10-23  6:09   ` Paul Menage
2007-10-23 16:43 ` Srivatsa Vaddagiri
2007-10-23 16:47 ` Srivatsa Vaddagiri
2007-10-23 16:41   ` Paul Menage
2007-10-23 17:38     ` Srivatsa Vaddagiri
2007-10-24  2:28       ` Paul Menage
2007-10-24  4:39         ` Srivatsa Vaddagiri
2007-10-26  1:24           ` Paul Menage

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).