aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@redhat.com>2022-04-18 09:50:25 -0700
committerPeter Zijlstra <peterz@infradead.org>2022-04-19 21:58:49 +0200
commit1ab80a0da4c4a4dd496fc14faabbc8bde61a605c (patch)
tree5fc8af5969da4e68c756d82398744d78795ddacc /arch/x86/xen
parentx86/uaccess: Add ENDBR to __put_user_nocheck*() (diff)
downloadlinux-dev-1ab80a0da4c4a4dd496fc14faabbc8bde61a605c.tar.xz
linux-dev-1ab80a0da4c4a4dd496fc14faabbc8bde61a605c.zip
x86/xen: Add ANNOTATE_NOENDBR to startup_xen()
The startup_xen() kernel entry point is referenced by the ".note.Xen" section, and is the real entry point of the VM. Control transfer is through IRET, which *could* set NEED_ENDBR, however Xen currently does no such thing. Add ANNOTATE_NOENDBR to silence future objtool warnings. Fixes: ed53a0d97192 ("x86/alternative: Use .ibt_endbr_seal to seal indirect calls") Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> Link: https://lkml.kernel.org/r/a87bd48b06d11ec4b98122a429e71e489b4e48c3.1650300597.git.jpoimboe@redhat.com
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/xen-head.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index ac17196e2518..3a2cd93bf059 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -45,6 +45,7 @@ SYM_CODE_END(hypercall_page)
__INIT
SYM_CODE_START(startup_xen)
UNWIND_HINT_EMPTY
+ ANNOTATE_NOENDBR
cld
/* Clear .bss */