[RFC 2/3] Revert "tracing: Add back in rcu_irq_enter/exit_irqson() for rcuidle tracepoints"

From: Joel Fernandes (Google)
Date: Fri Feb 07 2020 - 15:57:12 EST


This reverts commit 865e63b04e9b2a658d7f26bd13a71dcd964a9118.

Signed-off-by: Joel Fernandes (Google) <joel@xxxxxxxxxxxxxxxxx>
---
include/linux/tracepoint.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 59463c90fdc3d..ab1f13b7f7d2c 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -179,10 +179,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
* 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); \
\
@@ -194,10 +192,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
} while ((++it_func_ptr)->func); \
} \
\
- if (rcuidle) { \
- rcu_irq_exit_irqson(); \
+ if (rcuidle) \
srcu_read_unlock_notrace(&tracepoint_srcu, idx);\
- } \
\
preempt_enable_notrace(); \
} while (0)
--
2.25.0.341.g760bfbb309-goog