From: Jan Beulich Date: Tue, 16 Sep 2014 11:57:44 +0000 (+0200) Subject: x86: show page walk when create_bounce_frame() encounters a fault X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4405^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d268f6ae2d191cc945f3492e8797fa8444877c10;p=xen.git x86: show page walk when create_bounce_frame() encounters a fault ... getting the native code in sync with the compat mode one. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 42835d0341..ade555b655 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -442,19 +442,30 @@ UNLIKELY_START(z, create_bounce_frame_bad_bounce_ip) __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) movq %rax,UREGS_rip+8(%rsp) ret - _ASM_EXTABLE(.Lft2, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft3, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft4, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft5, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft6, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft7, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft8, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft9, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft10, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft11, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft12, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft13, dom_crash_sync_extable) - + _ASM_EXTABLE(.Lft2, domain_crash_page_fault_32) + _ASM_EXTABLE(.Lft3, domain_crash_page_fault_24) + _ASM_EXTABLE(.Lft4, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft5, domain_crash_page_fault_16) + _ASM_EXTABLE(.Lft6, domain_crash_page_fault) + _ASM_EXTABLE(.Lft7, domain_crash_page_fault) + _ASM_EXTABLE(.Lft8, domain_crash_page_fault_24) + _ASM_EXTABLE(.Lft9, domain_crash_page_fault_16) + _ASM_EXTABLE(.Lft10, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft11, domain_crash_page_fault) + _ASM_EXTABLE(.Lft12, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft13, domain_crash_page_fault) + +domain_crash_page_fault_32: + addq $8,%rsi +domain_crash_page_fault_24: + addq $8,%rsi +domain_crash_page_fault_16: + addq $8,%rsi +domain_crash_page_fault_8: + addq $8,%rsi +domain_crash_page_fault: + movq %rsi,%rdi + call show_page_walk ENTRY(dom_crash_sync_extable) # Get out of the guest-save area of the stack. GET_STACK_BASE(%rax)