Commit 613871cd authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

x86/static_call: Add ANNOTATE_NOENDBR to static call trampoline 



The static call trampoline is never indirect-branched to, but is
referenced by the static call key.  Add ANNOTATE_NOENDBR.

Fixes: ed53a0d9 ("x86/alternative: Use .ibt_endbr_seal to seal indirect calls")
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/1b5b54aad7d81241dabe5e0c9b40dea64b540b00.1650300597.git.jpoimboe@redhat.com
parent 4a5de9b7

arch/x86/include/asm/static_call.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
	    ".align 4						\n"	\

	    ".globl " STATIC_CALL_TRAMP_STR(name) "		\n"	\

	    STATIC_CALL_TRAMP_STR(name) ":			\n"	\

	    ANNOTATE_NOENDBR						\

	    insns "						\n"	\

	    ".byte 0x53, 0x43, 0x54				\n"	\

	    ".type " STATIC_CALL_TRAMP_STR(name) ", @function	\n"	\