Commit 656d054e authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

jump_label,noinstr: Avoid instrumentation for JUMP_LABEL=n builds 



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: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent a6a5eb26

include/linux/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -256,9 +256,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)