5743021831
Currently, if there was any irq or softirq time during 'ticks' jiffies, the entire period will be accounted as irq or softirq time. This is inaccurate if only a subset of the time was actually spent handling irqs, and could conceivably mis-count all of the ticks during a period as irq time, when there was some irq and some softirq time. This can actually happen when irqtime_account_process_tick is called from account_idle_ticks, which can pass a larger number of ticks down all at once. Fix this by changing irqtime_account_hi_update(), irqtime_account_si_update(), and steal_account_process_ticks() to work with cputime_t time units, and return the amount of time spent in each mode. Rename steal_account_process_ticks() to steal_account_process_time(), to reflect that time is now accounted in cputime_t, instead of ticks. Additionally, have irqtime_account_process_tick() take into account how much time was spent in each of steal, irq, and softirq time. The latter could help improve the accuracy of cputime accounting when returning from idle on a NO_HZ_IDLE CPU. Properly accounting how much time was spent in hardirq and softirq time will also allow the NO_HZ_FULL code to re-use these same functions for hardirq and softirq accounting. Signed-off-by: Rik van Riel <riel@redhat.com> [ Make nsecs_to_cputime64() actually return cputime64_t. ] Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Radim Krcmar <rkrcmar@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wanpeng Li <wanpeng.li@hotmail.com> Link: http://lkml.kernel.org/r/1468421405-20056-2-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
123 lines
3.1 KiB
C
123 lines
3.1 KiB
C
/*
|
|
* Definitions for measuring cputime in nsecs resolution.
|
|
*
|
|
* Based on <arch/ia64/include/asm/cputime.h>
|
|
*
|
|
* Copyright (C) 2007 FUJITSU LIMITED
|
|
* Copyright (C) 2007 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
*/
|
|
|
|
#ifndef _ASM_GENERIC_CPUTIME_NSECS_H
|
|
#define _ASM_GENERIC_CPUTIME_NSECS_H
|
|
|
|
#include <linux/math64.h>
|
|
|
|
typedef u64 __nocast cputime_t;
|
|
typedef u64 __nocast cputime64_t;
|
|
|
|
#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new)
|
|
|
|
#define cputime_one_jiffy jiffies_to_cputime(1)
|
|
|
|
#define cputime_div(__ct, divisor) div_u64((__force u64)__ct, divisor)
|
|
#define cputime_div_rem(__ct, divisor, remainder) \
|
|
div_u64_rem((__force u64)__ct, divisor, remainder);
|
|
|
|
/*
|
|
* Convert cputime <-> jiffies (HZ)
|
|
*/
|
|
#define cputime_to_jiffies(__ct) \
|
|
cputime_div(__ct, NSEC_PER_SEC / HZ)
|
|
#define cputime_to_scaled(__ct) (__ct)
|
|
#define jiffies_to_cputime(__jif) \
|
|
(__force cputime_t)((__jif) * (NSEC_PER_SEC / HZ))
|
|
#define cputime64_to_jiffies64(__ct) \
|
|
cputime_div(__ct, NSEC_PER_SEC / HZ)
|
|
#define jiffies64_to_cputime64(__jif) \
|
|
(__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ))
|
|
|
|
|
|
/*
|
|
* Convert cputime <-> nanoseconds
|
|
*/
|
|
#define cputime_to_nsecs(__ct) \
|
|
(__force u64)(__ct)
|
|
#define nsecs_to_cputime(__nsecs) \
|
|
(__force cputime_t)(__nsecs)
|
|
#define nsecs_to_cputime64(__nsecs) \
|
|
(__force cputime64_t)(__nsecs)
|
|
|
|
|
|
/*
|
|
* Convert cputime <-> microseconds
|
|
*/
|
|
#define cputime_to_usecs(__ct) \
|
|
cputime_div(__ct, NSEC_PER_USEC)
|
|
#define usecs_to_cputime(__usecs) \
|
|
(__force cputime_t)((__usecs) * NSEC_PER_USEC)
|
|
#define usecs_to_cputime64(__usecs) \
|
|
(__force cputime64_t)((__usecs) * NSEC_PER_USEC)
|
|
|
|
/*
|
|
* Convert cputime <-> seconds
|
|
*/
|
|
#define cputime_to_secs(__ct) \
|
|
cputime_div(__ct, NSEC_PER_SEC)
|
|
#define secs_to_cputime(__secs) \
|
|
(__force cputime_t)((__secs) * NSEC_PER_SEC)
|
|
|
|
/*
|
|
* Convert cputime <-> timespec (nsec)
|
|
*/
|
|
static inline cputime_t timespec_to_cputime(const struct timespec *val)
|
|
{
|
|
u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec;
|
|
return (__force cputime_t) ret;
|
|
}
|
|
static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)
|
|
{
|
|
u32 rem;
|
|
|
|
val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);
|
|
val->tv_nsec = rem;
|
|
}
|
|
|
|
/*
|
|
* Convert cputime <-> timeval (msec)
|
|
*/
|
|
static inline cputime_t timeval_to_cputime(const struct timeval *val)
|
|
{
|
|
u64 ret = (u64)val->tv_sec * NSEC_PER_SEC +
|
|
val->tv_usec * NSEC_PER_USEC;
|
|
return (__force cputime_t) ret;
|
|
}
|
|
static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)
|
|
{
|
|
u32 rem;
|
|
|
|
val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);
|
|
val->tv_usec = rem / NSEC_PER_USEC;
|
|
}
|
|
|
|
/*
|
|
* Convert cputime <-> clock (USER_HZ)
|
|
*/
|
|
#define cputime_to_clock_t(__ct) \
|
|
cputime_div(__ct, (NSEC_PER_SEC / USER_HZ))
|
|
#define clock_t_to_cputime(__x) \
|
|
(__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ))
|
|
|
|
/*
|
|
* Convert cputime64 to clock.
|
|
*/
|
|
#define cputime64_to_clock_t(__ct) \
|
|
cputime_to_clock_t((__force cputime_t)__ct)
|
|
|
|
#endif
|