Skip to content

Commit

Permalink
x86/xen: Make the boot CPU idle task reliable
Browse files Browse the repository at this point in the history
The unwinder reports the boot CPU idle task's stack on XEN PV as
unreliable, which affects at least live patching. There are two reasons
for this. First, the task does not follow the x86 convention that its
stack starts at the offset right below saved pt_regs. It allows the
unwinder to easily detect the end of the stack and verify it. Second,
startup_xen() function does not store the return address before jumping
to xen_start_kernel() which confuses the unwinder.

Amend both issues by moving the starting point of initial stack in
startup_xen() and storing the return address before the jump, which is
exactly what call instruction does.

Signed-off-by: Miroslav Benes <mbenes@suse.cz>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
  • Loading branch information
Miroslav Benes authored and Juergen Gross committed Mar 30, 2020
1 parent 69086bd commit 2f62f36
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions arch/x86/xen/xen-head.S
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ SYM_CODE_START(startup_xen)
rep __ASM_SIZE(stos)

mov %_ASM_SI, xen_start_info
mov $init_thread_union+THREAD_SIZE, %_ASM_SP
#ifdef CONFIG_X86_64
mov initial_stack(%rip), %rsp
#else
mov pa(initial_stack), %esp
#endif

#ifdef CONFIG_X86_64
/* Set up %gs.
Expand All @@ -51,7 +55,7 @@ SYM_CODE_START(startup_xen)
wrmsr
#endif

jmp xen_start_kernel
call xen_start_kernel
SYM_CODE_END(startup_xen)
__FINIT
#endif
Expand Down

0 comments on commit 2f62f36

Please sign in to comment.