Merge tag 'trace-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

torvalds · torvalds · commit be65e2595b4c · 2018-09-06T09:06:49.000-07:00
Pull tracing fixes from Steven Rostedt:
 "This fixes two annoying bugs:

   - The first one is a side effect caused by using SRCU for rcuidle
     tracepoints. It seems that the perf was depending on the rcuidle
     tracepoints to make RCU watch when it wasn't.

     The real fix will be to have perf use SRCU instead of depending on
     RCU watching, but that can't be done until SRCU is safe to use in
     NMI context (Paul's working on that).

   - The second bug fix is for a bug that's been periodically making my
     tests fail randomly for some time. I haven't had time to track it
     down, but finally have. It has to do with stressing NMIs (via perf)
     while enabling or disabling ftrace function handling with lockdep
     enabled.

     If an interrupt happens and just as it returns, it sets lockdep
     back to "interrupts enabled" but before it returns an NMI is
     triggered, and if this happens while printk_nmi_enter has a
     breakpoint attached to it (because ftrace is converting it to or
     from nop to call fentry), the breakpoint trap also calls into
     lockdep, and since returning from the NMI to a interrupt handler,
     interrupts were disabled when the NMI went off, lockdep keeps its
     state as interrupts disabled when it returns back from the
     interrupt handler where interrupts are enabled.

     This causes lockdep_assert_irqs_enabled() to trigger a false
     positive"

* tag 'trace-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  printk/tracing: Do not trace printk_nmi_enter()
  tracing: Add back in rcu_irq_enter/exit_irqson() for rcuidle tracepoints
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
@@ -158,8 +158,10 @@ extern void syscall_unregfunc(void);
 		 * For rcuidle callers, use srcu since sched-rcu	\
 		 * doesn't work from the idle path.			\
 		 */							\
-		if (rcuidle)						\
+		if (rcuidle) {						\
 			idx = srcu_read_lock_notrace(&tracepoint_srcu);	\
+			rcu_irq_enter_irqson();				\
+		}							\
 									\
 		it_func_ptr = rcu_dereference_raw((tp)->funcs);		\
 									\
@@ -171,8 +173,10 @@ extern void syscall_unregfunc(void);
 			} while ((++it_func_ptr)->func);		\
 		}							\
 									\
-		if (rcuidle)						\
+		if (rcuidle) {						\
+			rcu_irq_exit_irqson();				\
 			srcu_read_unlock_notrace(&tracepoint_srcu, idx);\
+		}							\
 									\
 		preempt_enable_notrace();				\
 	} while (0)
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
@@ -306,12 +306,12 @@ static __printf(1, 0) int vprintk_nmi(const char *fmt, va_list args)
 	return printk_safe_log_store(s, fmt, args);
 }
 
-void printk_nmi_enter(void)
+void notrace printk_nmi_enter(void)
 {
 	this_cpu_or(printk_context, PRINTK_NMI_CONTEXT_MASK);
 }
 
-void printk_nmi_exit(void)
+void notrace printk_nmi_exit(void)
 {
 	this_cpu_and(printk_context, ~PRINTK_NMI_CONTEXT_MASK);
 }

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,10 @@ extern void syscall_unregfunc(void);`
`158`	`158`	`* For rcuidle callers, use srcu since sched-rcu \`
`159`	`159`	`* doesn't work from the idle path. \`
`160`	`160`	`*/ \`
`161`		`- if (rcuidle) \`
	`161`	`+ if (rcuidle) { \`
`162`	`162`	`idx = srcu_read_lock_notrace(&tracepoint_srcu); \`
	`163`	`+ rcu_irq_enter_irqson(); \`
	`164`	`+ } \`
`163`	`165`	`\`
`164`	`166`	`it_func_ptr = rcu_dereference_raw((tp)->funcs); \`
`165`	`167`	`\`
`@@ -171,8 +173,10 @@ extern void syscall_unregfunc(void);`
`171`	`173`	`} while ((++it_func_ptr)->func); \`
`172`	`174`	`} \`
`173`	`175`	`\`
`174`		`- if (rcuidle) \`
	`176`	`+ if (rcuidle) { \`
	`177`	`+ rcu_irq_exit_irqson(); \`
`175`	`178`	`srcu_read_unlock_notrace(&tracepoint_srcu, idx);\`
	`179`	`+ } \`
`176`	`180`	`\`
`177`	`181`	`preempt_enable_notrace(); \`
`178`	`182`	`} while (0)`
Original file line number	Diff line number	Diff line change
`@@ -306,12 +306,12 @@ static __printf(1, 0) int vprintk_nmi(const char *fmt, va_list args)`
`306`	`306`	`return printk_safe_log_store(s, fmt, args);`
`307`	`307`	`}`
`308`	`308`
`309`		`-void printk_nmi_enter(void)`
	`309`	`+void notrace printk_nmi_enter(void)`
`310`	`310`	`{`
`311`	`311`	`this_cpu_or(printk_context, PRINTK_NMI_CONTEXT_MASK);`
`312`	`312`	`}`
`313`	`313`
`314`		`-void printk_nmi_exit(void)`
	`314`	`+void notrace printk_nmi_exit(void)`
`315`	`315`	`{`
`316`	`316`	`this_cpu_and(printk_context, ~PRINTK_NMI_CONTEXT_MASK);`
`317`	`317`	`}`