rcu: Mark rcu_nmi_enter() call to rcu_cleanup_after_idle() noinstr

The objtool complains about the call to rcu_cleanup_after_idle() from
rcu_nmi_enter(), so this commit adds instrumentation_begin() before that
call and instrumentation_end() after it.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index feb31c201dee9e5cafd99d131628ec41dc41e809..d17e5a08bf43f5442112c963dad18b34041771a8 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -990,8 +990,11 @@ noinstr void rcu_nmi_enter(void)
                rcu_dynticks_eqs_exit();
                // ... but is watching here.
 
-               if (!in_nmi())
+               if (!in_nmi()) {
+                       instrumentation_begin();
                        rcu_cleanup_after_idle();
+                       instrumentation_end();
+               }
 
                instrumentation_begin();
                // instrumentation for the noinstr rcu_dynticks_curr_cpu_in_eqs()