Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1524650

[PATCH 23/36] cputime: Push time to account_steal_time() in nsecs

From Frederic Weisbecker <fweisbec@gmail.com>
Newsgroups linux.kernel
Subject [PATCH 23/36] cputime: Push time to account_steal_time() in nsecs
Date 2016-11-17 19:20 +0100
Message-ID <sEzrX-4eD-3@gated-at.bofh.it> (permalink)
References <sEzih-48J-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
 arch/powerpc/kernel/time.c  |  2 +-
 arch/s390/kernel/vtime.c    |  2 +-
 include/linux/kernel_stat.h |  2 +-
 kernel/sched/cputime.c      | 11 ++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9b372b1..3efa5a6 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -361,7 +361,7 @@ void vtime_account_system(struct task_struct *tsk)
 	account_system_time(tsk, 0, delta);
 	tsk->stimescaled += cputime_to_nsecs(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 0ac0d4c..02c3970 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -145,7 +145,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 6831734..8355f8e 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -80,7 +80,7 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu)
 
 extern void account_user_time(struct task_struct *, u64);
 extern void account_system_time(struct task_struct *, int, 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 f5318d9..e6990a4 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -207,11 +207,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;
 }
 
 /*
@@ -239,14 +239,15 @@ static __always_inline cputime_t steal_account_process_time(cputime_t maxtime)
 #ifdef CONFIG_PARAVIRT
 	if (static_key_false(&paravirt_steal_enabled)) {
 		cputime_t steal_cputime;
-		u64 steal;
+		u64 steal, rounded;
 
 		steal = paravirt_steal_clock(smp_processor_id());
 		steal -= this_rq()->prev_steal_time;
 
 		steal_cputime = min(nsecs_to_cputime(steal), maxtime);
-		account_steal_time(steal_cputime);
-		this_rq()->prev_steal_time += cputime_to_nsecs(steal_cputime);
+		rounded = cputime_to_nsecs(steal_cputime);
+		account_steal_time(rounded);
+		this_rq()->prev_steal_time += rounded;
 
 		return steal_cputime;
 	}
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 17/36] cputime: Increment kcpustat directly on irqtime account Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 25/36] cputime: Push time to account_system_time() in nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 02/36] time: Introduce jiffies64_to_nsecs() Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 07/36] cputime: Special API to return old-typed cputime Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 19/36] posix-timers: Convert internals to use nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 22/36] cputime: Push time to account_user_time() in nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:10 +0100
  [PATCH 23/36] cputime: Push time to account_steal_time() in nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 29/36] ia64: Move nsecs based cputime headers to the last arch using it Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 04/36] cputime: Convert kcpustat to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 01/36] jiffies: Reuse TICK_NSEC instead of NSEC_PER_JIFFY Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 34/36] s390: Remove unused cputime definitions Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 30/36] ia64: Convert vtime to use nsec units directly Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 33/36] powerpc: Remove unused cputime definitions Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 14/36] delaycct: Convert obsolete cputime type to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 09/36] alpha: Convert obsolete cputime_t to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 31/36] ia64: Remove unused cputime definitions Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 27/36] vtime: Return nsecs instead of cputime_t to account Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 24/36] cputime: Push time to account_idle_time() in nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 36/36] cputime: Remove asm generic headers Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 05/36] macintosh/rack-meter: Remove cputime_t internal use Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 13/36] acct: Convert obsolete cputime type to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 28/36] cputime: Remove jiffies based cputime Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 03/36] sched: Remove unused INIT_CPUTIME macro Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 26/36] cputime: Complete nsec conversion of tick based accounting Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 20/36] itimer: Convert internal cputime_t units to nsec Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 06/36] cputime: Convert guest time accounting to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 10/36] x86: Convert obsolete cputime type to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 35/36] cputime: Remove unused nsec_to_cputime Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 12/36] binfmt: Convert obsolete cputime type to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 18/36] posix-timers: Use TICK_NSEC instead of a dynamically ad-hoc calculated version Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 21/36] sched: Remove temporary cputime_t accessors Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 32/36] s390: Make arch_cpu_idle_time() to return nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 15/36] tsacct: Convert obsolete cputime type to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 16/36] signal: Convert obsolete cputime type to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  [PATCH 08/36] cputime: Convert task/group cputime to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-17 19:20 +0100
  Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-11-18 13:10 +0100
    Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-18 16:10 +0100
      Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-11-21 08:10 +0100
        Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-11-21 11:20 +0100
          Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-22 14:50 +0100
            Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-11-22 15:30 +0100
        Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-21 17:30 +0100
          Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Martin Schwidefsky <schwidefsky@de.ibm.com> - 2016-11-22 07:20 +0100
      Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Ingo Molnar <mingo@kernel.org> - 2016-11-21 10:50 +0100
        Re: [PATCH 00/36] cputime: Convert core use of cputime_t to nsecs Frederic Weisbecker <fweisbec@gmail.com> - 2016-11-21 17:30 +0100

csiph-web