Skip to content

Commit f977df7

Browse files
thejhIngo Molnar
authored andcommitted
x86/entry/64: Fix unwind hints in rewind_stack_do_exit()
The LEAQ instruction in rewind_stack_do_exit() moves the stack pointer directly below the pt_regs at the top of the task stack before calling do_exit(). Tell the unwinder to expect pt_regs. Fixes: 8c1f755 ("x86/entry/64: Add unwind hint annotations") Reviewed-by: Miroslav Benes <mbenes@suse.cz> Signed-off-by: Jann Horn <jannh@google.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Dave Jones <dsj@fb.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Link: https://lore.kernel.org/r/68c33e17ae5963854916a46f522624f8e1d264f2.1587808742.git.jpoimboe@redhat.com
1 parent 96c6480 commit f977df7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/entry/entry_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ SYM_CODE_START(rewind_stack_do_exit)
17391739

17401740
movq PER_CPU_VAR(cpu_current_top_of_stack), %rax
17411741
leaq -PTREGS_SIZE(%rax), %rsp
1742-
UNWIND_HINT_FUNC sp_offset=PTREGS_SIZE
1742+
UNWIND_HINT_REGS
17431743

17441744
call do_exit
17451745
SYM_CODE_END(rewind_stack_do_exit)

0 commit comments

Comments
 (0)