From: Glauber Costa <glommer@parallels.com>
To: linux-kernel@vger.kernel.org
Cc: xemul@parallels.com, paul@paulmenage.org, lizf@cn.fujitsu.com,
daniel.lezcano@free.fr, mingo@elte.hu, a.p.zijlstra@chello.nl,
jbottomley@parallels.com, Glauber Costa <glommer@parallels.com>
Subject: [PATCH 7/9] Create cpuacct.proc.stat file
Date: Wed, 14 Sep 2011 17:04:53 -0300 [thread overview]
Message-ID: <1316030695-19826-8-git-send-email-glommer@parallels.com> (raw)
In-Reply-To: <1316030695-19826-1-git-send-email-glommer@parallels.com>
When doing containers, this file represents how /proc/stat should like
from inside it. It is user, system, etc, from the perspective of
the current cgroup.
In this submission, not all fields are converted
Signed-off-by: Glauber Costa <glommer@parallels.com>
---
kernel/sched.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 128 insertions(+), 0 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 6c953f5..4611c54 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9300,6 +9300,129 @@ static int cpuacct_stats_show(struct cgroup *cgrp, struct cftype *cft,
return 0;
}
+#ifndef arch_idle_time
+#define arch_idle_time(cpu) 0
+#endif
+
+static int cpuacct_proc_stat(struct cgroup *cgrp, struct cftype *cft,
+ struct seq_file *p)
+{
+ int i, j;
+ unsigned long jif;
+ cputime64_t user, nice, system, idle, iowait, irq, softirq, steal;
+ cputime64_t guest, guest_nice;
+ u64 sum = 0;
+ u64 sum_softirq = 0;
+ unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
+ struct timespec boottime;
+ struct cpuacct *ca = cgroup_ca(cgrp);
+ u64 *cpustat;
+
+ user = nice = system = idle = iowait =
+ irq = softirq = steal = cputime64_zero;
+ guest = guest_nice = cputime64_zero;
+ getboottime(&boottime);
+ jif = boottime.tv_sec;
+
+ for_each_possible_cpu(i) {
+ cpustat = per_cpu_ptr(ca->cpustat, i);
+ user = cputime64_add(user, cpustat[CPUACCT_STAT_USER]);
+ nice = cputime64_add(nice, cpustat[CPUACCT_STAT_NICE]);
+ system = cputime64_add(system, cpustat[CPUACCT_STAT_SYSTEM]);
+ idle = cputime64_add(idle, kstat_cpu(i).cpustat.idle);
+ idle = cputime64_sub(idle, cpustat[CPUACCT_STAT_IDLE]);
+ idle = cputime64_add(idle, arch_idle_time(i));
+ iowait = cputime64_add(iowait, kstat_cpu(i).cpustat.iowait);
+ iowait = cputime64_sub(idle, cpustat[CPUACCT_STAT_IOWAIT]);
+ irq = cputime64_add(irq, cpustat[CPUACCT_STAT_IRQ]);
+ softirq = cputime64_add(softirq, cpustat[CPUACCT_STAT_SOFTIRQ]);
+ steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
+ guest = cputime64_add(guest, cpustat[CPUACCT_STAT_GUEST]);
+ guest_nice = cputime64_add(guest_nice,
+ cpustat[CPUACCT_STAT_GUEST_NICE]);
+ sum += kstat_cpu_irqs_sum(i);
+ sum += arch_irq_stat_cpu(i);
+
+ for (j = 0; j < NR_SOFTIRQS; j++) {
+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
+
+ per_softirq_sums[j] += softirq_stat;
+ sum_softirq += softirq_stat;
+ }
+ }
+ sum += arch_irq_stat();
+
+ seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu "
+ "%llu\n",
+ (unsigned long long)cputime64_to_clock_t(user),
+ (unsigned long long)cputime64_to_clock_t(nice),
+ (unsigned long long)cputime64_to_clock_t(system),
+ (unsigned long long)cputime64_to_clock_t(idle),
+ (unsigned long long)cputime64_to_clock_t(iowait),
+ (unsigned long long)cputime64_to_clock_t(irq),
+ (unsigned long long)cputime64_to_clock_t(softirq),
+ (unsigned long long)cputime64_to_clock_t(steal),
+ (unsigned long long)cputime64_to_clock_t(guest),
+ (unsigned long long)cputime64_to_clock_t(guest_nice));
+ for_each_online_cpu(i) {
+ cpustat = per_cpu_ptr(ca->cpustat, i);
+ /* Copy values here to work around gcc-2.95.3, gcc-2.96 */
+ user = cpustat[CPUACCT_STAT_USER];
+ nice = cpustat[CPUACCT_STAT_NICE];
+ system = cpustat[CPUACCT_STAT_SYSTEM];
+ idle = kstat_cpu(i).cpustat.idle;
+ idle = cputime64_sub(idle, cpustat[CPUACCT_STAT_IDLE]);
+ idle = cputime64_add(idle, arch_idle_time(i));
+ iowait = kstat_cpu(i).cpustat.iowait;
+ iowait = cputime64_sub(iowait, cpustat[CPUACCT_STAT_IOWAIT]);
+ irq = cpustat[CPUACCT_STAT_IRQ];
+ softirq = cpustat[CPUACCT_STAT_SOFTIRQ];
+ steal = kstat_cpu(i).cpustat.steal;
+ guest = cpustat[CPUACCT_STAT_GUEST];
+ guest_nice = cpustat[CPUACCT_STAT_GUEST_NICE];
+ seq_printf(p,
+ "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu "
+ "%llu\n",
+ i,
+ (unsigned long long)cputime64_to_clock_t(user),
+ (unsigned long long)cputime64_to_clock_t(nice),
+ (unsigned long long)cputime64_to_clock_t(system),
+ (unsigned long long)cputime64_to_clock_t(idle),
+ (unsigned long long)cputime64_to_clock_t(iowait),
+ (unsigned long long)cputime64_to_clock_t(irq),
+ (unsigned long long)cputime64_to_clock_t(softirq),
+ (unsigned long long)cputime64_to_clock_t(steal),
+ (unsigned long long)cputime64_to_clock_t(guest),
+ (unsigned long long)cputime64_to_clock_t(guest_nice));
+ }
+ seq_printf(p, "intr %llu", (unsigned long long)sum);
+
+ /* sum again ? it could be updated? */
+ for_each_irq_nr(j)
+ seq_printf(p, " %u", kstat_irqs(j));
+
+ seq_printf(p,
+ "\nctxt %llu\n"
+ "btime %lu\n"
+ "processes %lu\n"
+ "procs_running %lu\n"
+ "procs_blocked %lu\n",
+ nr_context_switches(),
+ (unsigned long)jif,
+ total_forks,
+ nr_running(),
+ nr_iowait());
+
+ seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
+
+ for (i = 0; i < NR_SOFTIRQS; i++)
+ seq_printf(p, " %u", per_softirq_sums[i]);
+ seq_putc(p, '\n');
+
+ return 0;
+
+}
+
static struct cftype files[] = {
{
.name = "usage",
@@ -9314,6 +9437,11 @@ static struct cftype files[] = {
.name = "stat",
.read_map = cpuacct_stats_show,
},
+ {
+ .name = "proc.stat",
+ .read_seq_string = cpuacct_proc_stat,
+ },
+
};
static int cpuacct_populate(struct cgroup_subsys *ss, struct cgroup *cgrp)
--
1.7.6
next prev parent reply other threads:[~2011-09-14 20:06 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-14 20:04 [PATCH 0/9] Per-cgroup /proc/stat Glauber Costa
2011-09-14 20:04 ` [PATCH 1/9] Remove parent field in cpuacct cgroup Glauber Costa
2011-09-19 16:03 ` Peter Zijlstra
2011-09-19 16:09 ` Glauber Costa
2011-09-19 16:19 ` Peter Zijlstra
2011-09-19 16:30 ` Glauber Costa
2011-09-19 16:39 ` Peter Zijlstra
2011-09-19 16:41 ` Glauber Costa
2011-09-19 18:40 ` Peter Zijlstra
2011-09-20 17:29 ` Srivatsa Vaddagiri
2011-09-22 15:11 ` Balbir Singh
2011-09-22 15:17 ` Peter Zijlstra
2011-09-23 8:09 ` Balbir Singh
2011-09-23 14:35 ` Peter Zijlstra
2011-09-23 15:45 ` Glauber Costa
2011-09-19 18:35 ` Peter Zijlstra
2011-09-19 18:38 ` Glauber Costa
2011-09-19 18:44 ` Peter Zijlstra
2011-09-19 19:14 ` Glauber Costa
2011-09-19 19:18 ` Peter Zijlstra
2011-09-19 19:19 ` Glauber Costa
2011-09-14 20:04 ` [PATCH 2/9] Make cpuacct fields per cpu variables Glauber Costa
2011-09-19 16:10 ` Peter Zijlstra
2011-09-14 20:04 ` [PATCH 3/9] Include nice values in cpuacct Glauber Costa
2011-09-19 16:19 ` Peter Zijlstra
2011-09-19 16:26 ` Glauber Costa
2011-09-19 18:36 ` Peter Zijlstra
2011-09-19 18:37 ` Glauber Costa
2011-09-14 20:04 ` [PATCH 4/9] Include irq and softirq fields " Glauber Costa
2011-09-19 18:38 ` Peter Zijlstra
2011-09-19 18:40 ` Glauber Costa
2011-09-14 20:04 ` [PATCH 5/9] Include guest " Glauber Costa
2011-09-14 20:04 ` [PATCH 6/9] Include idle and iowait " Glauber Costa
2011-09-20 9:21 ` Peter Zijlstra
2011-09-20 12:36 ` Glauber Costa
2011-09-20 12:58 ` Peter Zijlstra
2011-09-20 12:58 ` Glauber Costa
2011-09-20 13:05 ` Peter Zijlstra
2011-09-20 13:29 ` Glauber Costa
2011-09-14 20:04 ` Glauber Costa [this message]
2011-09-20 9:22 ` [PATCH 7/9] Create cpuacct.proc.stat file Peter Zijlstra
2011-09-20 12:22 ` Glauber Costa
2011-09-14 20:04 ` [PATCH 8/9] per-cgroup boot time Glauber Costa
2011-09-20 9:25 ` Peter Zijlstra
2011-09-20 12:37 ` Glauber Costa
2011-09-20 13:04 ` Peter Zijlstra
2011-09-20 13:06 ` Glauber Costa
2011-09-20 13:31 ` Peter Zijlstra
2011-09-14 20:04 ` [PATCH 9/9] Report steal time for cgroup Glauber Costa
2011-09-20 9:29 ` Peter Zijlstra
2011-09-14 20:13 ` [PATCH 0/9] Per-cgroup /proc/stat Peter Zijlstra
2011-09-14 20:20 ` Glauber Costa
2011-09-15 8:53 ` Peter Zijlstra
2011-09-14 20:23 ` Andi Kleen
2011-09-15 8:56 ` Peter Zijlstra
2011-09-19 23:07 ` Paul Turner
2011-09-20 8:33 ` Peter Zijlstra
2011-09-20 21:37 ` Glauber Costa
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=1316030695-19826-8-git-send-email-glommer@parallels.com \
--to=glommer@parallels.com \
--cc=a.p.zijlstra@chello.nl \
--cc=daniel.lezcano@free.fr \
--cc=jbottomley@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=paul@paulmenage.org \
--cc=xemul@parallels.com \
/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
all inboxes | Powered by JetHome®