nohz: A few improvements
Ingo,
Please pull the timers/nohz branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
timers/nohz
Changes:
* Get rid of the passive dependency on VIRT_CPU_ACCOUNTING_GEN (finally!)
* Preparation patch to remove the dependency on CONFIG_64BITS
Thanks,
Frederic
---
Frederic Weisbecker (1):
nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
Kevin Hilman (1):
cputime_nsecs: use math64.h for nsec resolution conversion helpers
include/asm-generic/cputime_nsecs.h | 28 +++++++++++++++++++--------- init/Kconfig | 8 ++++---- kernel/time/Kconfig | 4 +++- 3 files changed, 26 insertions(+), 14 deletions(-)
PATCH 1/2 nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
Turn the full dynticks passive dependency on VIRT_CPU_ACCOUNTING_GEN to an active one.
The full dynticks Kconfig is currently hidden behind the full dynticks cputime accounting, which is an awkward and counter-intuitive layout:
the user first has to select the dynticks cputime accounting in order to make the full dynticks feature to be visible.
We definetly want it the other way around. The usual way to perform this kind of active dependency is use "select" on the depended target. Now we can't use the Kconfig "select" instruction when the target is a "choice".
So this patch inspires on how the RCU subsystem Kconfig interact with its dependencies on SMP and PREEMPT: we make sure that cputime accounting can't propose another option than VIRT_CPU_ACCOUNTING_GEN when NO_HZ_FULL is selected by using the right "depends on" instruction for each cputime accounting choices.
--- init/Kconfig | 8 ++++---- kernel/time/Kconfig | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-)
init/Kconfig +4 -4
@@ -306,7 +306,7 @@ choice # Kind of a stub config for the pure tick based cputime accounting config TICK_CPU_ACCOUNTING bool "Simple tick based cputime accounting" - depends on !S390 + depends on !S390 && !NO_HZ_FULL help This is the basic tick based cputime accounting that maintains statistics about user, system and idle time spent on per jiffies
@@ -316,7 +316,7 @@ config TICK_CPU_ACCOUNTING config VIRT_CPU_ACCOUNTING_NATIVE bool "Deterministic task and CPU time accounting" - depends on HAVE_VIRT_CPU_ACCOUNTING + depends on HAVE_VIRT_CPU_ACCOUNTING && !NO_HZ_FULL select VIRT_CPU_ACCOUNTING help Select this option to enable more accurate task and CPU time
@@ -329,7 +329,7 @@ config VIRT_CPU_ACCOUNTING_NATIVE config VIRT_CPU_ACCOUNTING_GEN bool "Full dynticks CPU time accounting" - depends on HAVE_CONTEXT_TRACKING && 64BIT + depends on HAVE_CONTEXT_TRACKING && 64BIT && NO_HZ_FULL select VIRT_CPU_ACCOUNTING select CONTEXT_TRACKING help
@@ -346,7 +346,7 @@ config VIRT_CPU_ACCOUNTING_GEN config IRQ_TIME_ACCOUNTING bool "Fine granularity task level IRQ time accounting" - depends on HAVE_IRQ_TIME_ACCOUNTING + depends on HAVE_IRQ_TIME_ACCOUNTING && !NO_HZ_FULL help Select this option to enable fine granularity task irq time accounting. This is done by reading a timestamp on each
kernel/time/Kconfig +3 -1
@@ -104,11 +104,13 @@ config NO_HZ_FULL depends on SMP # RCU_USER_QS dependency depends on HAVE_CONTEXT_TRACKING - depends on VIRT_CPU_ACCOUNTING_GEN + # VIRT_CPU_ACCOUNTING_GEN dependency + depends on 64BIT select NO_HZ_COMMON select RCU_USER_QS select RCU_NOCB_CPU select RCU_NOCB_CPU_ALL + select VIRT_CPU_ACCOUNTING_GEN select CONTEXT_TRACKING_FORCE select IRQ_WORK help
Signature · 1 line
1.7.5.4
Re: [PATCH 1/2] nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
Quoted 13 lines · Frederic Weisbecker
Turn the full dynticks passive dependency on
VIRT_CPU_ACCOUNTING_GENto an active one.The full dynticks
Kconfigis currently hidden behind the full dynticks cputime accounting, which is an awkward and counter-intuitive layout:
the user first has to select the dynticks cputime accounting in order to make the full dynticks feature to be visible.We definetly want it the other way around. The usual way to perform this kind of active dependency is use "select" on the depended target. Now we can't use the
Kconfig"select" instruction when the target is a "choice".
Quoted 5 lines
So this patch inspires on how the RCU subsystem
Kconfiginteract with its dependencies on SMP and PREEMPT: we make sure that cputime accounting can't propose another option thanVIRT_CPU_ACCOUNTING_GENwhenNO_HZ_FULLis selected by using the right "depends on" instruction for each cputime accounting choices.
Ah, putting it back onto VIRT_CPU_ACCOUNTING_GEN, cute!
Quoted 40 lines
Reported-by Ingo Molnar <[email protected]>Signed-off-by Frederic Weisbecker <[email protected]>Cc Christoph Lameter <[email protected]>Cc Hakan Akkan <[email protected]>Cc Ingo Molnar <[email protected]>Cc Kevin Hilman <[email protected]>Cc Li Zhong <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Paul Gortmaker <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Steven Rostedt <[email protected]>Cc Thomas Gleixner <[email protected]>--- init/Kconfig | 8 ++++---- kernel/time/Kconfig | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-)init/Kconfig +2
-2@@ -306,7 +306,7 @@ choice # Kind of a stub config for the pure tick based cputime accounting config TICK_CPU_ACCOUNTING bool "Simple tick based cputime accounting" - depends on !S390 + depends on !S390 && !NO_HZ_FULL help This is the basic tick based cputime accounting that maintains statistics about user, system and idle time spent on per jiffies@@ -316,7 +316,7 @@ config TICK_CPU_ACCOUNTING config VIRT_CPU_ACCOUNTING_NATIVE bool "Deterministic task and CPU time accounting" - depends on HAVE_VIRT_CPU_ACCOUNTING + depends on HAVE_VIRT_CPU_ACCOUNTING && !NO_HZ_FULL select VIRT_CPU_ACCOUNTING help Select this option to enable more accurate task and CPU time
init/Kconfig config VIRT_CPU_ACCOUNTING_NATIVE · line 332
Quoted 5 lines
init/Kconfig +1
-1@@ -329,7 +329,7 @@ config VIRT_CPU_ACCOUNTING_NATIVE config VIRT_CPU_ACCOUNTING_GEN bool "Full dynticks CPU time accounting" - depends on HAVE_CONTEXT_TRACKING && 64BIT + depends on HAVE_CONTEXT_TRACKING && 64BIT && NO_HZ_FULL
Do you really want this change? This prohibits VIRT_CPU_ACCOUNTING_GEN unless NO_HZ_FULL, which means that it can no longer be used in situations where it used to be usable. My guess is that you want to leave this particular line as it was.
Thanx, Paul
Quoted 34 lines
init/Kconfig +1
-1select VIRT_CPU_ACCOUNTING select CONTEXT_TRACKING help@@ -346,7 +346,7 @@ config VIRT_CPU_ACCOUNTING_GEN config IRQ_TIME_ACCOUNTING bool "Fine granularity task level IRQ time accounting" - depends on HAVE_IRQ_TIME_ACCOUNTING + depends on HAVE_IRQ_TIME_ACCOUNTING && !NO_HZ_FULL help Select this option to enable fine granularity task irq time accounting. This is done by reading a timestamp on eachkernel/time/Kconfig +3
-1@@ -104,11 +104,13 @@ config NO_HZ_FULL depends on SMP # RCU_USER_QS dependency depends on HAVE_CONTEXT_TRACKING - depends on VIRT_CPU_ACCOUNTING_GEN + # VIRT_CPU_ACCOUNTING_GEN dependency + depends on 64BIT select NO_HZ_COMMON select RCU_USER_QS select RCU_NOCB_CPU select RCU_NOCB_CPU_ALL + select VIRT_CPU_ACCOUNTING_GEN select CONTEXT_TRACKING_FORCE select IRQ_WORK helpSignature · 1 line
1.7.5.4
Re: [PATCH 1/2] nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
Quoted 9 lines · Paul E. McKenney
init/Kconfig config VIRT_CPU_ACCOUNTING_NATIVE · line 332
Quoted 4 lines
config
VIRT_CPU_ACCOUNTING_GENinit/Kconfig +1
-1bool "Full dynticks CPU time accounting" - depends on HAVE_CONTEXT_TRACKING && 64BIT + depends on HAVE_CONTEXT_TRACKING && 64BIT && NO_HZ_FULLDo you really want this change? This prohibits
VIRT_CPU_ACCOUNTING_GENunlessNO_HZ_FULL, which means that it can no longer be used in situations where it used to be usable. My guess is that you want to leave this particular line as it was.
Hmm, this can make sense. This can be used to perform comparisons between tick-based and tickless cputime accounting easily.
I'll respin.
Re: [PATCH 1/2] nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
2013/4/26 Frederic Weisbecker <[email protected]>:
Quoted 11 lines · Paul E. McKenney
Quoted 9 lines
init/Kconfig config VIRT_CPU_ACCOUNTING_NATIVE · line 332
Quoted 4 lines
config
VIRT_CPU_ACCOUNTING_GEN
bool "Full dynticks CPU time accounting"init/Kconfig +1
-1- depends on HAVE_CONTEXT_TRACKING && 64BIT + depends on HAVE_CONTEXT_TRACKING && 64BIT && NO_HZ_FULLDo you really want this change? This prohibits
VIRT_CPU_ACCOUNTING_GENunlessNO_HZ_FULL, which means that it can no longer be used in situations where it used to be usable. My guess is that you want to leave this particular line as it was.
Quoted 4 lines
Hmm, this can make sense. This can be used to perform comparisons between tick-based and tickless cputime accounting easily.
I'll respin.
So Ingo please pull "timers/nohz-v2" instead. It does the same but keeps VIRT_CPU_ACCOUNTING_GEN available even without full dynticks (could be useful when users need something more precise than tick based cputime accounting.)
HEAD is 8c23b80ec7f1f5405f07bb56c2f8378800ecf401
If you've already pulled the previous branch I'll make a delta instead.
Thanks.
Re: [PATCH 1/2] nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
Quoted 22 lines · Frederic Weisbecker
2013/4/26 Frederic Weisbecker <[email protected]>:
Quoted 11 lines · Paul E. McKenney
Quoted 9 lines
init/Kconfig config VIRT_CPU_ACCOUNTING_NATIVE · line 332
Quoted 4 lines
config
VIRT_CPU_ACCOUNTING_GEN
bool "Full dynticks CPU time accounting"init/Kconfig +1
-1- depends on HAVE_CONTEXT_TRACKING && 64BIT + depends on HAVE_CONTEXT_TRACKING && 64BIT && NO_HZ_FULLDo you really want this change? This prohibits
VIRT_CPU_ACCOUNTING_GENunlessNO_HZ_FULL, which means that it can no longer be used in situations where it used to be usable. My guess is that you want to leave this particular line as it was.Quoted 4 lines
Hmm, this can make sense. This can be used to perform comparisons between tick-based and tickless cputime accounting easily.
I'll respin.
So Ingo please pull "timers/nohz-v2" instead. It does the same but keeps
VIRT_CPU_ACCOUNTING_GENavailable even without full dynticks (could be useful when users need something more precise than tick based cputime accounting.)
Quoted 5 lines
HEAD is
8c23b80ec7f1f5405f07bb56c2f8378800ecf401If you've already pulled the previous branch I'll make a delta instead.
Thanks.
Pulled, thanks Frederic!
Ingo
Re: [PATCH 1/2] nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
In reply to Frederic WeisbeckerQuoted 2 lines · Frederic Weisbecker
Turn the full dynticks passive dependency on
VIRT_CPU_ACCOUNTING_GENto an active one.
[...]
init/Kconfig config VIRT_CPU_ACCOUNTING_NATIVE · line 335
Quoted 9 lines
init/Kconfig +1
-1@@ -329,7 +329,7 @@ config VIRT_CPU_ACCOUNTING_NATIVE config VIRT_CPU_ACCOUNTING_GEN bool "Full dynticks CPU time accounting" - depends on HAVE_CONTEXT_TRACKING && 64BIT + depends on HAVE_CONTEXT_TRACKING && 64BIT && NO_HZ_FULL select VIRT_CPU_ACCOUNTING select CONTEXT_TRACKING help
Existing 64-bit dependency is here...
kernel/time/Kconfig config NO_HZ_FULL · line 108
Quoted 11 lines
kernel/time/Kconfig +2
-1@@ -104,11 +104,13 @@ config NO_HZ_FULL depends on SMP # RCU_USER_QS dependency depends on HAVE_CONTEXT_TRACKING - depends on VIRT_CPU_ACCOUNTING_GEN + # VIRT_CPU_ACCOUNTING_GEN dependency + depends on 64BIT
...and another one added here?
Is there a new 64-bit dependency in NO_HZ_FULL not covered by the one already in VIRT_CPU_ACCOUNTING_GEN? Or do you have reasons to be doubly paranoid about the non 64-bit usage? ;)
Kevin
PATCH 2/2 cputime_nsecs: use math64.h for nsec resolution conversion helpers
In reply to Frederic WeisbeckerFrom: Kevin Hilman <[email protected]>
For the nsec resolution conversions to be useable on non 64-bit architectures, the helpers in <linux/math64.h> need to be used so the right arch-specific 64-bit math helpers can be used (e.g. do_div())
--- include/asm-generic/cputime_nsecs.h | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-)
include/asm-generic/cputime_nsecs.h +19 -9
@@ -16,21 +16,27 @@#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 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) \ - ((__force u64)(__ct) / (NSEC_PER_SEC / HZ)) + 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) \ - ((__force u64)(__ct) / (NSEC_PER_SEC / HZ)) + cputime_div(__ct, NSEC_PER_SEC / HZ)#define jiffies64_to_cputime64 (__jif) \ (__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ))
@@ -45,7 +51,7 @@ typedef u64 __nocast cputime64_t;* Convert cputime <-> microseconds */ #define cputime_to_usecs (__ct) \ - ((__force u64)(__ct) / NSEC_PER_USEC) + cputime_div(__ct, NSEC_PER_USEC)#define usecs_to_cputime (__usecs) \ (__force cputime_t)((__usecs) * NSEC_PER_USEC)#define usecs_to_cputime64 (__usecs) \
@@ -55,7 +61,7 @@ typedef u64 __nocast cputime64_t;* Convert cputime <-> seconds */ #define cputime_to_secs (__ct) \ - ((__force u64)(__ct) / NSEC_PER_SEC) + cputime_div(__ct, NSEC_PER_SEC)#define secs_to_cputime (__secs) \ (__force cputime_t)((__secs) * NSEC_PER_SEC)
@@ -69,8 +75,10 @@ static inline cputime_t timespec_to_cputime(const struct timespec *val) }static inline void cputime_to_timespec (const cputime_t ct,struct timespec *val) { - val->tv_sec = (__force u64 ) ct /NSEC_PER_SEC ; - val->tv_nsec = (__force u64 ) ct %NSEC_PER_SEC ; +u32 rem; + + val->tv_sec =cputime_div_rem (ct,NSEC_PER_SEC , &rem); + val->tv_nsec = rem; }/*
@@ -83,15 +91,17 @@ static inline cputime_t timeval_to_cputime(const struct timeval *val) }static inline void cputime_to_timeval (const cputime_t ct,struct timeval *val) { - val->tv_sec = (__force u64 ) ct /NSEC_PER_SEC ; - val->tv_usec = ((__force u64 ) ct %NSEC_PER_SEC ) /NSEC_PER_USEC ; +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) \ - ((__force u64)(__ct) / (NSEC_PER_SEC / USER_HZ)) + cputime_div(__ct, (NSEC_PER_SEC / USER_HZ))#define clock_t_to_cputime (__x) \ (__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ))
Signature · 1 line
1.7.5.4