diff options
| author | Paul E. McKenney <paulmck@kernel.org> | 2020-05-19 17:00:54 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2020-06-29 11:58:50 -0700 |
| commit | 04b25a495bd68c1dad07263fb91e8b5a31c00a9e (patch) | |
| tree | 38f0a073484ad3d36ab5b87d64f3ed1c0fe59441 /kernel/rcu | |
| parent | 55fbe86ef303bc8ab040e579fba34a750c08200e (diff) | |
| download | lwn-04b25a495bd68c1dad07263fb91e8b5a31c00a9e.tar.gz lwn-04b25a495bd68c1dad07263fb91e8b5a31c00a9e.zip | |
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>
Diffstat (limited to 'kernel/rcu')
| -rw-r--r-- | kernel/rcu/tree.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index feb31c201dee..d17e5a08bf43 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() |