rcu: Remove spurious instrumentation_end() in rcu_nmi_enter()
authorZhouyi Zhou <zhouzhouyi@gmail.com>
Mon, 11 Jan 2021 01:08:59 +0000 (09:08 +0800)
committerPaul E. McKenney <paulmck@kernel.org>
Mon, 8 Mar 2021 22:17:35 +0000 (14:17 -0800)
commit6494ccb93271bee596a12db32ff44867d5be2321
tree28b8ddd7d65f49e1ed3651da783a804bef3651f2
parent47fcbc8dd62f15dc75916225ebacdc3bca9c12b2
rcu: Remove spurious instrumentation_end() in rcu_nmi_enter()

In rcu_nmi_enter(), there is an erroneous instrumentation_end() in the
second branch of the "if" statement.  Oddly enough, "objtool check -f
vmlinux.o" fails to complain because it is unable to correctly cover
all cases.  Instead, objtool visits the third branch first, which marks
following trace_rcu_dyntick() as visited.  This commit therefore removes
the spurious instrumentation_end().

Fixes: 04b25a495bd6 ("rcu: Mark rcu_nmi_enter() call to rcu_cleanup_after_idle() noinstr")
Reported-by Neeraj Upadhyay <neeraju@codeaurora.org>
Signed-off-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
kernel/rcu/tree.c