mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
jump_label,noinstr: Avoid instrumentation for JUMP_LABEL=n builds
[ Upstream commit 656d054e0a
]
When building x86_64 with JUMP_LABEL=n it's possible for
instrumentation to sneak into noinstr:
vmlinux.o: warning: objtool: exit_to_user_mode+0x14: call to static_key_count.constprop.0() leaves .noinstr.text section
vmlinux.o: warning: objtool: syscall_exit_to_user_mode+0x2d: call to static_key_count.constprop.0() leaves .noinstr.text section
vmlinux.o: warning: objtool: irqentry_exit_to_user_mode+0x1b: call to static_key_count.constprop.0() leaves .noinstr.text section
Switch to arch_ prefixed atomic to avoid the explicit instrumentation.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
320acaf84a
commit
cb8da20d71
1 changed files with 2 additions and 2 deletions
|
@ -249,9 +249,9 @@ extern void static_key_disable_cpuslocked(struct static_key *key);
|
|||
#include <linux/atomic.h>
|
||||
#include <linux/bug.h>
|
||||
|
||||
static inline int static_key_count(struct static_key *key)
|
||||
static __always_inline int static_key_count(struct static_key *key)
|
||||
{
|
||||
return atomic_read(&key->enabled);
|
||||
return arch_atomic_read(&key->enabled);
|
||||
}
|
||||
|
||||
static __always_inline void jump_label_init(void)
|
||||
|
|
Loading…
Reference in a new issue