Re: [PATCH] sched, cpuacct: fix niced guest time accounting

[Avi Kivity]

On 10/20/2009 05:00 PM, Ryota Ozaki wrote:

Hi Avi,

This is the patch we discussed earlier. Please review it.

   


It looks good to me.


BTW, should this be sent to lkml as well?

   



In fact, it should go through tip.git, not kvm.git, so please send to 
lkml and copy Ingo.


Acked-by: Avi Kivity a...@redhat.com

--
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] sched, cpuacct: fix niced guest time accounting

[Ryota Ozaki]

On Thu, Oct 22, 2009 at 6:47 PM, Avi Kivity a...@redhat.com wrote:
 On 10/20/2009 05:00 PM, Ryota Ozaki wrote:

 Hi Avi,

 This is the patch we discussed earlier. Please review it.



 It looks good to me.

 BTW, should this be sent to lkml as well?




 In fact, it should go through tip.git, not kvm.git, so please send to lkml
 and copy Ingo.

Thanks for your review. I'll rebase and forward it soon.
  ozaki-r



 Acked-by: Avi Kivity a...@redhat.com

 --
 error compiling committee.c: too many arguments to function


--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] sched, cpuacct: fix niced guest time accounting

[Ryota Ozaki]

Hi Avi,

This is the patch we discussed earlier. Please review it.

BTW, should this be sent to lkml as well?

Regards,
  ozaki-r

From 8aea0f1a9acc891d1208bc462a05797765451ab4 Mon Sep 17 00:00:00 2001
From: Ryota Ozaki ozaki.ry...@gmail.com
Date: Tue, 20 Oct 2009 22:41:12 +0900
Subject: [PATCH] sched, cpuacct: fix niced guest time accounting

CPU time of a guest is always accounted in 'user' time
without concern for the nice value of its counterpart
process although the guest is scheduled under the nice
value.

This patch fixes the defect and accounts cpu time of
a niced guest in 'nice' time as same as a niced process.

And also the patch adds 'guest_nice' to cpuacct. The
value provides niced guest cpu time which is like 'nice'
to 'user'.

Signed-off-by: Ryota Ozaki ozaki.ry...@gmail.com
---
 Documentation/filesystems/proc.txt |3 ++-
 fs/proc/stat.c |   17 +++--
 include/linux/kernel_stat.h|1 +
 kernel/sched.c |9 +++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Documentation/filesystems/proc.txt
b/Documentation/filesystems/proc.txt
index 2c48f94..4af0018 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1072,7 +1072,8 @@ second).  The meanings of the columns are as
follows, from left to right:
 - irq: servicing interrupts
 - softirq: servicing softirqs
 - steal: involuntary wait
-- guest: running a guest
+- guest: running a normal guest
+- guest_nice: running a niced guest

 The intr line gives counts of interrupts  serviced since boot time, for each
 of the  possible system interrupts.   The first  column  is the  total of  all
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 7cc726c..67c30a7 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -27,7 +27,7 @@ static int show_stat(struct seq_file *p, void *v)
int i, j;
unsigned long jif;
cputime64_t user, nice, system, idle, iowait, irq, softirq, steal;
-   cputime64_t guest;
+   cputime64_t guest, guest_nice;
u64 sum = 0;
u64 sum_softirq = 0;
unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
@@ -36,7 +36,7 @@ static int show_stat(struct seq_file *p, void *v)

user = nice = system = idle = iowait =
irq = softirq = steal = cputime64_zero;
-   guest = cputime64_zero;
+   guest = guest_nice = cputime64_zero;
getboottime(boottime);
jif = boottime.tv_sec;

@@ -51,6 +51,8 @@ static int show_stat(struct seq_file *p, void *v)
softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
+   guest_nice = cputime64_add(guest_nice,
+   kstat_cpu(i).cpustat.guest_nice);
for_each_irq_nr(j) {
sum += kstat_irqs_cpu(j, i);
}
@@ -65,7 +67,7 @@ static int show_stat(struct seq_file *p, void *v)
}
sum += arch_irq_stat();

-   seq_printf(p, cpu  %llu %llu %llu %llu %llu %llu %llu %llu %llu¥n,
+   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),
@@ -74,7 +76,8 @@ static int show_stat(struct seq_file *p, void *v)
(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),
+   (unsigned long long)cputime64_to_clock_t(guest_nice));
for_each_online_cpu(i) {

/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
@@ -88,8 +91,9 @@ static int show_stat(struct seq_file *p, void *v)
softirq = kstat_cpu(i).cpustat.softirq;
steal = kstat_cpu(i).cpustat.steal;
guest = kstat_cpu(i).cpustat.guest;
+   guest_nice = kstat_cpu(i).cpustat.guest_nice;
seq_printf(p,
-   cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu¥n,
+   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),
@@ -99,7 +103,8 @@ static int show_stat(struct seq_file *p, void *v)
(unsigned long long)cputime64_to_clock_t(irq),
(unsigned long long)cputime64_to_clock_t(softirq),
(unsigned long long)cputime64_to_clock_t(steal