Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

x86/entry/64/compat: Fix stack switching for XEN PV

While in the native case entry into the kernel happens on the trampoline
stack, PV Xen kernels get entered with the current thread stack right
away. Hence source and destination stacks are identical in that case,
and special care is needed.

Other than in sync_regs() the copying done on the INT80 path isn't
NMI / #MC safe, as either of these events occurring in the middle of the
stack copying would clobber data on the (source) stack.

There is similar code in interrupt_entry() and nmi(), but there is no fixup
required because those code paths are unreachable in XEN PV guests.

[ tglx: Sanitized subject, changelog, Fixes tag and stable mail address. Sigh ]

Fixes: 7f2590a110b8 ("x86/entry/64: Use a per-CPU trampoline stack for IDT entries")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Peter Anvin <hpa@zytor.com>
Cc: xen-devel@lists.xenproject.org>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/5C3E1128020000780020DFAD@prv1-mh.provo.novell.com

authored by

Jan Beulich and committed by
Thomas Gleixner
fc24d75a 993a1103

+4 -2
+4 -2
arch/x86/entry/entry_64_compat.S
··· 361 361 362 362 /* Need to switch before accessing the thread stack. */ 363 363 SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi 364 - movq %rsp, %rdi 364 + /* In the Xen PV case we already run on the thread stack. */ 365 + ALTERNATIVE "movq %rsp, %rdi", "jmp .Lint80_keep_stack", X86_FEATURE_XENPV 365 366 movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp 366 367 367 368 pushq 6*8(%rdi) /* regs->ss */ ··· 371 370 pushq 3*8(%rdi) /* regs->cs */ 372 371 pushq 2*8(%rdi) /* regs->ip */ 373 372 pushq 1*8(%rdi) /* regs->orig_ax */ 374 - 375 373 pushq (%rdi) /* pt_regs->di */ 374 + .Lint80_keep_stack: 375 + 376 376 pushq %rsi /* pt_regs->si */ 377 377 xorl %esi, %esi /* nospec si */ 378 378 pushq %rdx /* pt_regs->dx */