Commit 04b25a49 authored May 19, 2020 by Paul E. McKenney

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>

parent 55fbe86e

kernel/rcu/tree.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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()

Admin message