rackmeter: Use vtime aware kcpustat accessor

Now that we have a vtime safe kcpustat accessor, use it to fetch
CPUTIME_NICE and fix frozen kcpustat values on nohz_full CPUs.

Reported-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wanpeng Li <wanpengli@tencent.com>
Link: https://lkml.kernel.org/r/20191121024430.19938-7-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 4134e580f7869e85ae0790be0e777d0785eb17e4..60311e8d6240d8bfa02f0a710e9eba4b8c9702e3 100644 (file)
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -81,13 +81,14 @@ static int rackmeter_ignore_nice;
  */
 static inline u64 get_cpu_idle_time(unsigned int cpu)
 {
+       struct kernel_cpustat *kcpustat = &kcpustat_cpu(cpu);
        u64 retval;
 
-       retval = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE] +
-                kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];
+       retval = kcpustat->cpustat[CPUTIME_IDLE] +
+                kcpustat->cpustat[CPUTIME_IOWAIT];
 
        if (rackmeter_ignore_nice)
-               retval += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
+               retval += kcpustat_field(kcpustat, CPUTIME_NICE, cpu);
 
        return retval;
 }