From: Paul E. McKenney <paulmck@kernel.org>
Date: Wed, 20 May 2020 00:00:54 +0000 (-0700)
Subject: rcu: Mark rcu_nmi_enter() call to rcu_cleanup_after_idle() noinstr
X-Git-Tag: v5.9-rc1~204^2^2^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04b25a495bd68c1dad07263fb91e8b5a31c00a9e;p=thirdparty%2Fkernel%2Flinux.git

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 feb31c201dee9..d17e5a08bf43f 100644
--- 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()