]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:52 +0000 (10:49 +0200)
commit6d79181f4e28ce9f058247dc5e18b1b5f1b74c83
treea94a51f24f5788a42efbd69c2a452203365d825a
parent02096868eec9485bbbe455e4981fc2c0b9024e51
rcu: Remove spurious instrumentation_end() in rcu_nmi_enter()

[ Upstream commit 6494ccb93271bee596a12db32ff44867d5be2321 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/rcu/tree.c