xen64: deal with extra words Xen pushes onto exception frames

Xen pushes two extra words containing the values of rcx and r11.  This
pvop hook copies the words back into their appropriate registers, and
cleans them off the stack.  This leaves the stack in native form, so
the normal handler can run unchanged.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jeremy Fitzhardinge 2008-07-08 15:07:00 -07:00 committed by Ingo Molnar
parent e176d367d0
commit 997409d3d0
3 changed files with 8 additions and 1 deletions

View File

@ -1091,7 +1091,7 @@ static const struct pv_irq_ops xen_irq_ops __initdata = {
.safe_halt = xen_safe_halt, .safe_halt = xen_safe_halt,
.halt = xen_halt, .halt = xen_halt,
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
.adjust_exception_frame = paravirt_nop, .adjust_exception_frame = xen_adjust_exception_frame,
#endif #endif
}; };

View File

@ -133,6 +133,11 @@ check_events:
ret ret
#endif #endif
ENTRY(xen_adjust_exception_frame)
mov 8+0(%rsp),%rcx
mov 8+8(%rsp),%r11
ret $16
ENTRY(xen_iret) ENTRY(xen_iret)
pushq $0 pushq $0
jmp hypercall_page + __HYPERVISOR_iret * 32 jmp hypercall_page + __HYPERVISOR_iret * 32

View File

@ -67,7 +67,9 @@ DECL_ASM(void, xen_irq_disable_direct, void);
DECL_ASM(unsigned long, xen_save_fl_direct, void); DECL_ASM(unsigned long, xen_save_fl_direct, void);
DECL_ASM(void, xen_restore_fl_direct, unsigned long); DECL_ASM(void, xen_restore_fl_direct, unsigned long);
/* These are not functions, and cannot be called normally */
void xen_iret(void); void xen_iret(void);
void xen_sysexit(void); void xen_sysexit(void);
void xen_adjust_exception_frame(void);
#endif /* XEN_OPS_H */ #endif /* XEN_OPS_H */