Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1524663
| From | Frederic Weisbecker <fweisbec@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 24/36] cputime: Push time to account_idle_time() in nsecs |
| Date | 2016-11-17 19:20 +0100 |
| Message-ID | <sEzrY-4eD-29@gated-at.bofh.it> (permalink) |
| References | <sEzih-48J-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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/ia64/kernel/time.c | 2 +-
arch/powerpc/kernel/time.c | 2 +-
arch/s390/kernel/idle.c | 2 +-
include/linux/kernel_stat.h | 2 +-
kernel/sched/cputime.c | 18 +++++++++---------
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ce6bf09..0287ffe 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(vtime_account_system);
void vtime_account_idle(struct task_struct *tsk)
{
- account_idle_time(vtime_delta(tsk));
+ account_idle_time(cputime_to_nsecs(vtime_delta(tsk)));
}
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3efa5a6..7cd3b3c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -370,7 +370,7 @@ void vtime_account_idle(struct task_struct *tsk)
unsigned long delta, sys_scaled, stolen;
delta = vtime_delta(tsk, &sys_scaled, &stolen);
- account_idle_time(delta + stolen);
+ account_idle_time(cputime_to_nsecs(delta + stolen));
}
/*
diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 7a55c29..99f1d81 100644
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -43,7 +43,7 @@ void enabled_wait(void)
idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;
idle->idle_time += idle_time;
idle->idle_count++;
- account_idle_time(idle_time);
+ account_idle_time(cputime_to_nsecs(idle_time));
write_seqcount_end(&idle->seqcount);
}
NOKPROBE_SYMBOL(enabled_wait);
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 8355f8e..07b103e 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -81,7 +81,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(u64);
-extern void account_idle_time(cputime_t);
+extern void account_idle_time(u64);
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
static inline void account_process_tick(struct task_struct *tsk, int user)
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index e6990a4..ac9aa7e 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -218,15 +218,15 @@ void account_steal_time(u64 cputime)
* Account for idle time.
* @cputime: the cpu time spent in idle wait
*/
-void account_idle_time(cputime_t cputime)
+void account_idle_time(u64 cputime)
{
u64 *cpustat = kcpustat_this_cpu->cpustat;
struct rq *rq = this_rq();
if (atomic_read(&rq->nr_iowait) > 0)
- cpustat[CPUTIME_IOWAIT] += cputime_to_nsecs(cputime);
+ cpustat[CPUTIME_IOWAIT] += cputime;
else
- cpustat[CPUTIME_IDLE] += cputime_to_nsecs(cputime);
+ cpustat[CPUTIME_IDLE] += cputime;
}
/*
@@ -392,7 +392,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
} else if (user_tick) {
account_user_time(p, cputime);
} else if (p == rq->idle) {
- account_idle_time(old_cputime);
+ account_idle_time(cputime);
} else if (p->flags & PF_VCPU) { /* System time or guest time */
account_guest_time(p, old_cputime);
@@ -506,7 +506,7 @@ void account_process_tick(struct task_struct *p, int user_tick)
else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET))
account_system_time(p, HARDIRQ_OFFSET, old_cputime);
else
- account_idle_time(old_cputime);
+ account_idle_time(cputime);
}
/*
@@ -515,15 +515,15 @@ void account_process_tick(struct task_struct *p, int user_tick)
*/
void account_idle_ticks(unsigned long ticks)
{
- cputime_t cputime, steal;
+ u64 cputime, steal;
if (sched_clock_irqtime) {
irqtime_account_idle_ticks(ticks);
return;
}
- cputime = jiffies_to_cputime(ticks);
- steal = steal_account_process_time(ULONG_MAX);
+ cputime = ticks * TICK_NSEC;
+ steal = cputime_to_nsecs(steal_account_process_time(ULONG_MAX));
if (steal >= cputime)
return;
@@ -789,7 +789,7 @@ void vtime_account_idle(struct task_struct *tsk)
{
cputime_t delta_cpu = get_vtime_delta(tsk);
- account_idle_time(delta_cpu);
+ account_idle_time(cputime_to_nsecs(delta_cpu));
}
void arch_vtime_task_switch(struct task_struct *prev)
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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