Skip to content

Commit e8d61bd

Browse files
author
Peter Zijlstra
committed
x86/ibt,sev: Annotations
No IBT on AMD so far.. probably correct, who knows. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lore.kernel.org/r/20220308154318.995109889@infradead.org
1 parent 3215de8 commit e8d61bd

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

arch/x86/entry/entry_64.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ SYM_CODE_START(entry_SYSCALL_64)
9595
movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp
9696

9797
SYM_INNER_LABEL(entry_SYSCALL_64_safe_stack, SYM_L_GLOBAL)
98+
ANNOTATE_NOENDBR
9899

99100
/* Construct struct pt_regs on stack */
100101
pushq $__USER_DS /* pt_regs->ss */

arch/x86/entry/entry_64_compat.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ SYM_CODE_START(entry_SYSCALL_compat)
214214
movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp
215215

216216
SYM_INNER_LABEL(entry_SYSCALL_compat_safe_stack, SYM_L_GLOBAL)
217+
ANNOTATE_NOENDBR
217218

218219
/* Construct struct pt_regs on stack */
219220
pushq $__USER32_DS /* pt_regs->ss */

arch/x86/kernel/head_64.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ SYM_CODE_END(start_cpu0)
332332
*/
333333
SYM_CODE_START_NOALIGN(vc_boot_ghcb)
334334
UNWIND_HINT_IRET_REGS offset=8
335+
ENDBR
335336

336337
/* Build pt_regs */
337338
PUSH_AND_CLEAR_REGS
@@ -439,6 +440,7 @@ SYM_CODE_END(early_idt_handler_common)
439440
*/
440441
SYM_CODE_START_NOALIGN(vc_no_ghcb)
441442
UNWIND_HINT_IRET_REGS offset=8
443+
ENDBR
442444

443445
/* Build pt_regs */
444446
PUSH_AND_CLEAR_REGS

0 commit comments

Comments
 (0)