2019-12-05 00:45:59

by Flavio Leitner

Subject: [PATCH] /proc/stat: fix wrong cpustat gnice value

The value being used for guest_nice should be CPUTIME_GUEST_NICE
and not CPUTIME_USER.

Fixes: 26dae145a76c "procfs: Use all-in-one vtime aware kcpustat accessor"
Signed-off-by: Flavio Leitner <[email protected]>
---
fs/proc/stat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 37bdbec5b402..fd931d3e77be 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -134,7 +134,7 @@ static int show_stat(struct seq_file *p, void *v)
softirq += cpustat[CPUTIME_SOFTIRQ];
steal += cpustat[CPUTIME_STEAL];
guest += cpustat[CPUTIME_GUEST];
- guest_nice += cpustat[CPUTIME_USER];
+ guest_nice += cpustat[CPUTIME_GUEST_NICE];
sum += kstat_cpu_irqs_sum(i);
sum += arch_irq_stat_cpu(i);

@@ -175,7 +175,7 @@ static int show_stat(struct seq_file *p, void *v)
softirq = cpustat[CPUTIME_SOFTIRQ];
steal = cpustat[CPUTIME_STEAL];
guest = cpustat[CPUTIME_GUEST];
- guest_nice = cpustat[CPUTIME_USER];
+ guest_nice = cpustat[CPUTIME_GUEST_NICE];
seq_printf(p, "cpu%d", i);
seq_put_decimal_ull(p, " ", nsec_to_clock_t(user));
seq_put_decimal_ull(p, " ", nsec_to_clock_t(nice));
--
2.23.0

2019-12-05 01:59:23

by Frederic Weisbecker

Subject: Re: [PATCH] /proc/stat: fix wrong cpustat gnice value

On Wed, Dec 04, 2019 at 09:39:36PM -0300, Flavio Leitner wrote:
> The value being used for guest_nice should be CPUTIME_GUEST_NICE
> and not CPUTIME_USER.
>
> Fixes: 26dae145a76c "procfs: Use all-in-one vtime aware kcpustat accessor"
> Signed-off-by: Flavio Leitner <[email protected]>

Good catch, thanks!

> ---
> fs/proc/stat.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/proc/stat.c b/fs/proc/stat.c
> index 37bdbec5b402..fd931d3e77be 100644
> --- a/fs/proc/stat.c
> +++ b/fs/proc/stat.c
> @@ -134,7 +134,7 @@ static int show_stat(struct seq_file *p, void *v)
> softirq += cpustat[CPUTIME_SOFTIRQ];
> steal += cpustat[CPUTIME_STEAL];
> guest += cpustat[CPUTIME_GUEST];
> - guest_nice += cpustat[CPUTIME_USER];
> + guest_nice += cpustat[CPUTIME_GUEST_NICE];
> sum += kstat_cpu_irqs_sum(i);
> sum += arch_irq_stat_cpu(i);
>
> @@ -175,7 +175,7 @@ static int show_stat(struct seq_file *p, void *v)
> softirq = cpustat[CPUTIME_SOFTIRQ];
> steal = cpustat[CPUTIME_STEAL];
> guest = cpustat[CPUTIME_GUEST];
> - guest_nice = cpustat[CPUTIME_USER];
> + guest_nice = cpustat[CPUTIME_GUEST_NICE];
> seq_printf(p, "cpu%d", i);
> seq_put_decimal_ull(p, " ", nsec_to_clock_t(user));
> seq_put_decimal_ull(p, " ", nsec_to_clock_t(nice));
> --
> 2.23.0
>