From 13e84e665dccd908900043b7e2887a211bc08dfc Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 9 Jun 2017 13:57:06 +0200 Subject: [PATCH] x86/pv: Align %rsp before pushing the failsafe stack frame Architecturally, all 64bit stacks are aligned on a 16 byte boundary before an exception frame is pushed. The failsafe frame should not special in this regard. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: cbcaccb5e991155a4ae85a032e990614c3dc6960 master date: 2017-05-09 19:00:20 +0100 --- xen/arch/x86/domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fa2aeade1d..bfe614d7b7 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1344,9 +1344,8 @@ static void load_segments(struct vcpu *n) struct pv_vcpu *pv = &n->arch.pv_vcpu; struct cpu_user_regs *regs = guest_cpu_user_regs(); unsigned long *rsp = - (n->arch.flags & TF_kernel_mode) ? - (unsigned long *)regs->rsp : - (unsigned long *)pv->kernel_sp; + (unsigned long *)(((n->arch.flags & TF_kernel_mode) + ? regs->rsp : pv->kernel_sp) & ~0xf); unsigned long cs_and_mask, rflags; if ( is_pv_32bit_vcpu(n) ) -- 2.39.5