Skip to contentSkip to conversation

nohz: Fixlet and Kconfig cleanup

GIT PULL In review Frederic Weisbecker 2 participants 4 messages Apr 24, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull the latest nohz branch from:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
timers/nohz

HEAD: 65e709dc0c25dbd563861924815e9a3a93878b75

Thanks.

---
Frederic Weisbecker (2):
nohz: Fix unavailable tick_stop tracepoint in dynticks idle
nohz: Remove full dynticks' superfluous dependency on RCU tree

 include/trace/events/timer.h |    2 +-
 kernel/time/Kconfig          |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/2 nohz: Fix unavailable tick_stop tracepoint in dynticks idle

The trace_tick_stop() tracepoint is only available in full dynticks. But it's also used by dynticks-idle so let's build it for the latter config as well.

This fixes:

kernel/time/tick-sched.c: In function tick_nohz_stop_sched_tick:
kernel/time/tick-sched.c:644: error: implicit declaration of function trace_tick_stop make[2]: *** [kernel/time/tick-sched.o] Erreur 1

Cc Chris Metcalf <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Geoff Levand <[email protected]>
Cc Gilad Ben Yossef <[email protected]>
Cc Hakan Akkan <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Li Zhong <[email protected]>
Cc Oleg Nesterov <[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]>
---
 include/trace/events/timer.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/trace/events/timer.h +1 -1
index f5eb53e..e967dd8 100644
@@ -323,7 +323,7 @@ TRACE_EVENT(itimer_expire,
 		  (int) __entry->pid, (unsigned long long)__entry->now)
 );
 
-#ifdef CONFIG_NO_HZ_FULL
+#ifdef CONFIG_NO_HZ_COMMON
 TRACE_EVENT(tick_stop,
 
 	TP_PROTO(int success, char *error_msg),
Signature · 1 line
1.7.5.4
Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] nohz: Fix unavailable tick_stop tracepoint in dynticks idle

Quoted 10 lines · Frederic Weisbecker

The trace_tick_stop() tracepoint is only available in full dynticks. But it's also used by dynticks-idle so let's build it for the latter config as well.

This fixes:

kernel/time/tick-sched.c: In function tick_nohz_stop_sched_tick:
kernel/time/tick-sched.c:644: error: implicit declaration of function trace_tick_stop make[2]: *** [kernel/time/tick-sched.o] Erreur 1

Quoted 16 lines
Cc Chris Metcalf <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Geoff Levand <[email protected]>
Cc Gilad Ben Yossef <[email protected]>
Cc Hakan Akkan <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Li Zhong <[email protected]>
Cc Oleg Nesterov <[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]>

Fixes all of the build errors I've detected in timers/nohz.

#3 lore raw

PATCH 2/2 nohz: Remove full dynticks' superfluous dependency on RCU tree

In reply to Frederic Weisbecker

Remove the dependency on (TREE_RCU || TREE_PREEMPT_RCU). The full dynticks option already depends on SMP which implies (whatever flavour of) RCU tree config anyway.

Cc Chris Metcalf <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Geoff Levand <[email protected]>
Cc Gilad Ben Yossef <[email protected]>
Cc Hakan Akkan <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Li Zhong <[email protected]>
Cc Oleg Nesterov <[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]>
---
 kernel/time/Kconfig |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
kernel/time/Kconfig +0 -2
index e1ac129..1ea2bba 100644
@@ -104,8 +104,6 @@ config NO_HZ_FULL
 	depends on SMP
 	# RCU_USER_QS dependency
 	depends on HAVE_CONTEXT_TRACKING
-	# RCU_NOCB_CPU dependency
-	depends on TREE_RCU || TREE_PREEMPT_RCU
 	depends on VIRT_CPU_ACCOUNTING_GEN
 	select NO_HZ_COMMON
 	select RCU_USER_QS
Signature · 1 line
1.7.5.4