sched/cputime: Push time to account_system_time() in nsecs

This is one more step toward converting cputime accounting to pure nsecs.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-25-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 5dc801d977908cca4f07cc6f234fad7818c27319..f15bca4776a74ae6f126a0209f9885701139870d 100644 (file)
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -21,6 +21,7 @@
 #include <linux/timex.h>
 #include <linux/timekeeper_internal.h>
 #include <linux/platform_device.h>
+#include <linux/cputime.h>
 
 #include <asm/machvec.h>
 #include <asm/delay.h>
@@ -64,29 +65,29 @@ extern cputime_t cycle_to_cputime(u64 cyc);
 void vtime_flush(struct task_struct *tsk)
 {
        struct thread_info *ti = task_thread_info(tsk);
-       cputime_t delta;
+       u64 delta;
 
        if (ti->utime)
                account_user_time(tsk, cputime_to_nsecs(cycle_to_cputime(ti->utime)));
 
        if (ti->gtime)
-               account_guest_time(tsk, cycle_to_cputime(ti->gtime));
+               account_guest_time(tsk, cputime_to_nsecs(cycle_to_cputime(ti->gtime)));
 
        if (ti->idle_time)
                account_idle_time(cputime_to_nsecs(cycle_to_cputime(ti->idle_time)));
 
        if (ti->stime) {
-               delta = cycle_to_cputime(ti->stime);
+               delta = cputime_to_nsecs(cycle_to_cputime(ti->stime));
                account_system_index_time(tsk, delta, CPUTIME_SYSTEM);
        }
 
        if (ti->hardirq_time) {
-               delta = cycle_to_cputime(ti->hardirq_time);
+               delta = cputime_to_nsecs(cycle_to_cputime(ti->hardirq_time));
                account_system_index_time(tsk, delta, CPUTIME_IRQ);
        }
 
        if (ti->softirq_time) {
-               delta = cycle_to_cputime(ti->softirq_time);
+               delta = cputime_to_nsecs(cycle_to_cputime(ti->softirq_time));
                account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ);
        }
 

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 739897a10fd3a72f0e0659a7fb93c894b4ad4b3a..01f53bfe100b38b02c18f016f306e4215c7add64 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -57,6 +57,7 @@
 #include <linux/clk-provider.h>
 #include <linux/suspend.h>
 #include <linux/rtc.h>
+#include <linux/cputime.h>
 #include <asm/trace.h>
 
 #include <asm/io.h>
@@ -72,7 +73,6 @@
 #include <asm/smp.h>
 #include <asm/vdso_datapage.h>
 #include <asm/firmware.h>
-#include <asm/cputime.h>
 #include <asm/asm-prototypes.h>
 
 /* powerpc clocksource/clockevent code */
@@ -399,7 +399,7 @@ void vtime_flush(struct task_struct *tsk)
                tsk->utimescaled += cputime_to_nsecs(acct->utime_scaled);
 
        if (acct->gtime)
-               account_guest_time(tsk, acct->gtime);
+               account_guest_time(tsk, cputime_to_nsecs(acct->gtime));
 
        if (acct->steal_time)
                account_steal_time(cputime_to_nsecs(acct->steal_time));
@@ -408,16 +408,17 @@ void vtime_flush(struct task_struct *tsk)
                account_idle_time(cputime_to_nsecs(acct->idle_time));
 
        if (acct->stime)
-               account_system_index_time(tsk, acct->stime, CPUTIME_SYSTEM);
-
+               account_system_index_time(tsk, cputime_to_nsecs(acct->stime),
+                                         CPUTIME_SYSTEM);
        if (acct->stime_scaled)
                tsk->stimescaled += cputime_to_nsecs(acct->stime_scaled);
 
        if (acct->hardirq_time)
-               account_system_index_time(tsk, acct->hardirq_time, CPUTIME_IRQ);
-
+               account_system_index_time(tsk, cputime_to_nsecs(acct->hardirq_time),
+                                         CPUTIME_IRQ);
        if (acct->softirq_time)
-               account_system_index_time(tsk, acct->softirq_time, CPUTIME_SOFTIRQ);
+               account_system_index_time(tsk, cputime_to_nsecs(acct->softirq_time),
+                                         CPUTIME_SOFTIRQ);
 
        acct->utime = 0;
        acct->utime_scaled = 0;

diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 99f1d8185ae2756cdefa5d320c6d46f894b3175e..5c0e08e761c3e8d6aaa021995c9df9fb7d5cbe9c 100644 (file)
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -12,7 +12,7 @@
 #include <linux/notifier.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
-#include <asm/cputime.h>
+#include <linux/cputime.h>
 #include <asm/nmi.h>
 #include <asm/smp.h>
 #include "entry.h"

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 1e7023c6ef237e46359bbc248763f2b239092488..b4a3e9e06ef244967b440057a1ee46b05bdb0def 100644 (file)
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -6,13 +6,13 @@
  */
 
 #include <linux/kernel_stat.h>
+#include <linux/cputime.h>
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/timex.h>
 #include <linux/types.h>
 #include <linux/time.h>
 
-#include <asm/cputime.h>
 #include <asm/vtimer.h>
 #include <asm/vtime.h>
 #include <asm/cpu_mf.h>
@@ -115,7 +115,7 @@ static void account_system_index_scaled(struct task_struct *p,
                                        enum cpu_usage_stat index)
 {
        p->stimescaled += cputime_to_nsecs(scaled);
-       account_system_index_time(p, cputime, index);
+       account_system_index_time(p, cputime_to_nsecs(cputime), index);
 }
 
 /*
@@ -171,7 +171,7 @@ static int do_account_vtime(struct task_struct *tsk)
        }
 
        if (guest) {
-               account_guest_time(tsk, guest);
+               account_guest_time(tsk, cputime_to_nsecs(guest));
                tsk->utimescaled += cputime_to_nsecs(scale_vtime(guest));
        }
 

diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index e1cd8970e096fbf0d86ae2eb9f17c00f5a1ae294..66be8b6becebec1d8a79d65f925a3f3096d22427 100644 (file)
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -9,7 +9,6 @@
 #include <linux/sched.h>
 #include <linux/vtime.h>
 #include <asm/irq.h>
-#include <linux/cputime.h>
 
 /*
  * 'kernel_stat.h' contains the definitions needed for doing
@@ -79,9 +78,9 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu)
 }
 
 extern void account_user_time(struct task_struct *, u64);
-extern void account_guest_time(struct task_struct *, cputime_t);
-extern void account_system_time(struct task_struct *, int, cputime_t);
-extern void account_system_index_time(struct task_struct *, cputime_t,
+extern void account_guest_time(struct task_struct *, u64);
+extern void account_system_time(struct task_struct *, int, u64);
+extern void account_system_index_time(struct task_struct *, u64,
                                      enum cpu_usage_stat);
 extern void account_steal_time(u64);
 extern void account_idle_time(u64);

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index fd5375f956fe5a64afdfcc16626c3f5289946c57..d28e9c53727c53a5b930e29d3658efdd5ef6f26e 100644 (file)
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -4,6 +4,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/static_key.h>
 #include <linux/context_tracking.h>
+#include <linux/cputime.h>
 #include "sched.h"
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
@@ -138,22 +139,22 @@ void account_user_time(struct task_struct *p, u64 cputime)
  * @p: the process that the cpu time gets accounted to
  * @cputime: the cpu time spent in virtual machine since the last update
  */
-void account_guest_time(struct task_struct *p, cputime_t cputime)
+void account_guest_time(struct task_struct *p, u64 cputime)
 {
        u64 *cpustat = kcpustat_this_cpu->cpustat;
 
        /* Add guest time to process. */
-       p->utime += cputime_to_nsecs(cputime);
-       account_group_user_time(p, cputime_to_nsecs(cputime));
-       p->gtime += cputime_to_nsecs(cputime);
+       p->utime += cputime;
+       account_group_user_time(p, cputime);
+       p->gtime += cputime;
 
        /* Add guest time to cpustat. */
        if (task_nice(p) > 0) {
-               cpustat[CPUTIME_NICE] += cputime_to_nsecs(cputime);
-               cpustat[CPUTIME_GUEST_NICE] += cputime_to_nsecs(cputime);
+               cpustat[CPUTIME_NICE] += cputime;
+               cpustat[CPUTIME_GUEST_NICE] += cputime;
        } else {
-               cpustat[CPUTIME_USER] += cputime_to_nsecs(cputime);
-               cpustat[CPUTIME_GUEST] += cputime_to_nsecs(cputime);
+               cpustat[CPUTIME_USER] += cputime;
+               cpustat[CPUTIME_GUEST] += cputime;
        }
 }
 
@@ -164,14 +165,14 @@ void account_guest_time(struct task_struct *p, cputime_t cputime)
  * @index: pointer to cpustat field that has to be updated
  */
 void account_system_index_time(struct task_struct *p,
-                              cputime_t cputime, enum cpu_usage_stat index)
+                              u64 cputime, enum cpu_usage_stat index)
 {
        /* Add system time to process. */
-       p->stime += cputime_to_nsecs(cputime);
-       account_group_system_time(p, cputime_to_nsecs(cputime));
+       p->stime += cputime;
+       account_group_system_time(p, cputime);
 
        /* Add system time to cpustat. */
-       task_group_account_field(p, index, cputime_to_nsecs(cputime));
+       task_group_account_field(p, index, cputime);
 
        /* Account for system time used */
        acct_account_cputime(p);
@@ -183,8 +184,7 @@ void account_system_index_time(struct task_struct *p,
  * @hardirq_offset: the offset to subtract from hardirq_count()
  * @cputime: the cpu time spent in kernel space since the last update
  */
-void account_system_time(struct task_struct *p, int hardirq_offset,
-                        cputime_t cputime)
+void account_system_time(struct task_struct *p, int hardirq_offset, u64 cputime)
 {
        int index;
 
@@ -388,16 +388,15 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
                 * So, we have to handle it separately here.
                 * Also, p->stime needs to be updated for ksoftirqd.
                 */
-               account_system_index_time(p, old_cputime, CPUTIME_SOFTIRQ);
+               account_system_index_time(p, cputime, CPUTIME_SOFTIRQ);
        } else if (user_tick) {
                account_user_time(p, cputime);
        } else if (p == rq->idle) {
                account_idle_time(cputime);
        } else if (p->flags & PF_VCPU) { /* System time or guest time */
-
-               account_guest_time(p, old_cputime);
+               account_guest_time(p, cputime);
        } else {
-               account_system_index_time(p, old_cputime, CPUTIME_SYSTEM);
+               account_system_index_time(p, cputime, CPUTIME_SYSTEM);
        }
 }
 
@@ -502,7 +501,7 @@ void account_process_tick(struct task_struct *p, int user_tick)
        if (user_tick)
                account_user_time(p, cputime);
        else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET))
-               account_system_time(p, HARDIRQ_OFFSET, old_cputime);
+               account_system_time(p, HARDIRQ_OFFSET, cputime);
        else
                account_idle_time(cputime);
 }
@@ -722,7 +721,7 @@ static void __vtime_account_system(struct task_struct *tsk)
 {
        cputime_t delta_cpu = get_vtime_delta(tsk);
 
-       account_system_time(tsk, irq_count(), delta_cpu);
+       account_system_time(tsk, irq_count(), cputime_to_nsecs(delta_cpu));
 }
 
 void vtime_account_system(struct task_struct *tsk)