34845636a1
Commit 2a95ea6c0d ("procfs: do not overflow get_{idle,iowait}_time
for nohz") did not take into account that one some architectures jiffies
and cputime use different units.
This causes get_idle_time() to return numbers in the wrong units, making
the idle time fields in /proc/stat wrong.
Instead of converting the usec value returned by
get_cpu_{idle,iowait}_time_us to units of jiffies, use the new function
usecs_to_cputime64 to convert it to the correct unit of cputime64_t.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Artem S. Tashkinov" <t.artem@mailcity.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
75 lines
2.2 KiB
C
75 lines
2.2 KiB
C
#ifndef _ASM_GENERIC_CPUTIME_H
|
|
#define _ASM_GENERIC_CPUTIME_H
|
|
|
|
#include <linux/time.h>
|
|
#include <linux/jiffies.h>
|
|
|
|
typedef unsigned long cputime_t;
|
|
|
|
#define cputime_zero (0UL)
|
|
#define cputime_one_jiffy jiffies_to_cputime(1)
|
|
#define cputime_max ((~0UL >> 1) - 1)
|
|
#define cputime_add(__a, __b) ((__a) + (__b))
|
|
#define cputime_sub(__a, __b) ((__a) - (__b))
|
|
#define cputime_div(__a, __n) ((__a) / (__n))
|
|
#define cputime_halve(__a) ((__a) >> 1)
|
|
#define cputime_eq(__a, __b) ((__a) == (__b))
|
|
#define cputime_gt(__a, __b) ((__a) > (__b))
|
|
#define cputime_ge(__a, __b) ((__a) >= (__b))
|
|
#define cputime_lt(__a, __b) ((__a) < (__b))
|
|
#define cputime_le(__a, __b) ((__a) <= (__b))
|
|
#define cputime_to_jiffies(__ct) (__ct)
|
|
#define cputime_to_scaled(__ct) (__ct)
|
|
#define jiffies_to_cputime(__hz) (__hz)
|
|
|
|
typedef u64 cputime64_t;
|
|
|
|
#define cputime64_zero (0ULL)
|
|
#define cputime64_add(__a, __b) ((__a) + (__b))
|
|
#define cputime64_sub(__a, __b) ((__a) - (__b))
|
|
#define cputime64_to_jiffies64(__ct) (__ct)
|
|
#define jiffies64_to_cputime64(__jif) (__jif)
|
|
#define cputime_to_cputime64(__ct) ((u64) __ct)
|
|
#define cputime64_gt(__a, __b) ((__a) > (__b))
|
|
|
|
#define nsecs_to_cputime64(__ct) nsecs_to_jiffies64(__ct)
|
|
|
|
|
|
/*
|
|
* Convert cputime to microseconds and back.
|
|
*/
|
|
#define cputime_to_usecs(__ct) jiffies_to_usecs(__ct)
|
|
#define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs)
|
|
#define usecs_to_cputime64(__msecs) nsecs_to_jiffies64((__msecs) * 1000)
|
|
|
|
/*
|
|
* Convert cputime to seconds and back.
|
|
*/
|
|
#define cputime_to_secs(jif) ((jif) / HZ)
|
|
#define secs_to_cputime(sec) ((sec) * HZ)
|
|
|
|
/*
|
|
* Convert cputime to timespec and back.
|
|
*/
|
|
#define timespec_to_cputime(__val) timespec_to_jiffies(__val)
|
|
#define cputime_to_timespec(__ct,__val) jiffies_to_timespec(__ct,__val)
|
|
|
|
/*
|
|
* Convert cputime to timeval and back.
|
|
*/
|
|
#define timeval_to_cputime(__val) timeval_to_jiffies(__val)
|
|
#define cputime_to_timeval(__ct,__val) jiffies_to_timeval(__ct,__val)
|
|
|
|
/*
|
|
* Convert cputime to clock and back.
|
|
*/
|
|
#define cputime_to_clock_t(__ct) jiffies_to_clock_t(__ct)
|
|
#define clock_t_to_cputime(__x) clock_t_to_jiffies(__x)
|
|
|
|
/*
|
|
* Convert cputime64 to clock.
|
|
*/
|
|
#define cputime64_to_clock_t(__ct) jiffies_64_to_clock_t(__ct)
|
|
|
|
#endif
|