Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Ingo Molnar <mi...@kernel.org> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Oleg Nesterov <o...@redhat.com> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Rik van Riel <r...@redhat.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Tony Luck <tony.l...@intel.com> Cc: Wu Fengguang <fengguang...@intel.com> Signed-off-by: Frederic Weisbecker <fweis...@gmail.com> --- arch/powerpc/kernel/time.c | 2 +- arch/s390/kernel/vtime.c | 2 +- include/linux/kernel_stat.h | 2 +- kernel/sched/cputime.c | 20 ++++++-------------- 4 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index c69c8cc..e44558c 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -346,7 +346,7 @@ void vtime_account_system(struct task_struct *tsk) delta = vtime_delta(tsk, &sys_scaled, &stolen); account_system_time(tsk, 0, delta, sys_scaled); if (stolen) - account_steal_time(stolen); + account_steal_time(cputime_to_nsecs(stolen)); } EXPORT_SYMBOL_GPL(vtime_account_system); diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index 0ec68b8..a2dfba1 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c @@ -91,7 +91,7 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset) steal = S390_lowcore.steal_timer; if ((s64) steal > 0) { S390_lowcore.steal_timer = 0; - account_steal_time(steal); + account_steal_time(cputime_to_nsecs(steal)); } return virt_timer_forward(user + system); diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 9ec9881..b164be9 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -86,7 +86,7 @@ extern unsigned long long task_delta_exec(struct task_struct *); extern void account_user_time(struct task_struct *, u64, u64); extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t); -extern void account_steal_time(cputime_t); +extern void account_steal_time(u64); extern void account_idle_time(cputime_t); #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 02fd2e7..ee8a9bf 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -223,11 +223,11 @@ void account_system_time(struct task_struct *p, int hardirq_offset, * Account for involuntary wait time. * @cputime: the cpu time spent in involuntary wait */ -void account_steal_time(cputime_t cputime) +void account_steal_time(u64 cputime) { u64 *cpustat = kcpustat_this_cpu->cpustat; - cpustat[CPUTIME_STEAL] += cputime_to_nsecs(cputime); + cpustat[CPUTIME_STEAL] += cputime; } /* @@ -250,21 +250,13 @@ static __always_inline bool steal_account_process_tick(void) #ifdef CONFIG_PARAVIRT if (static_key_false(¶virt_steal_enabled)) { u64 steal; - cputime_t steal_ct; steal = paravirt_steal_clock(smp_processor_id()); steal -= this_rq()->prev_steal_time; + this_rq()->prev_steal_time += steal; + account_steal_time(steal); - /* - * cputime_t may be less precise than nsecs (eg: if it's - * based on jiffies). Lets cast the result to cputime - * granularity and account the rest on the next rounds. - */ - steal_ct = nsecs_to_cputime(steal); - this_rq()->prev_steal_time += cputime_to_nsecs(steal_ct); - - account_steal_time(steal_ct); - return steal_ct; + return steal; } #endif return false; @@ -489,7 +481,7 @@ void account_process_tick(struct task_struct *p, int user_tick) */ void account_steal_ticks(unsigned long ticks) { - account_steal_time(jiffies_to_cputime(ticks)); + account_steal_time(jiffies_to_nsecs(ticks)); } /* -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/