Messages in this thread Patch in this message | | | Date | Wed, 11 Dec 2019 06:15:57 -0000 | From | "tip-bot2 for Flavio Leitner" <> | Subject | [tip: sched/urgent] sched/cputime, proc/stat: Fix incorrect guest nice cpustat value |
| |
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 346da4d2c7ea39de65487b249aaa4733317a40ec Gitweb: https://git.kernel.org/tip/346da4d2c7ea39de65487b249aaa4733317a40ec Author: Flavio Leitner <fbl@sysclose.org> AuthorDate: Thu, 05 Dec 2019 03:03:44 +01:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Wed, 11 Dec 2019 07:09:58 +01:00
sched/cputime, proc/stat: Fix incorrect guest nice cpustat 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 <fbl@sysclose.org> Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lkml.kernel.org/r/20191205020344.14940-1-frederic@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- 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 37bdbec..fd931d3 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));
| |