From 29985b09613ba106a1ed0496988636d288600515 Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: Tue, 11 Apr 2017 18:14:26 +0200 Subject: xen,kdump: handle pv domain in paddr_vmcoreinfo_note() For kdump to work correctly it needs the physical address of vmcoreinfo_note. When running as dom0 this means the virtual address has to be translated to the related machine address. paddr_vmcoreinfo_note() is meant to do the translation via __pa_symbol() only, but being attributed "weak" it can be replaced easily in Xen case. Signed-off-by: Juergen Gross Tested-by: Petr Tesarik Reviewed-by: Boris Ostrovsky Reviewed-by: Daniel Kiper Signed-off-by: Juergen Gross --- arch/x86/xen/mmu_pv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index c98bfb9f0248..9d9ae6650aa1 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -49,6 +49,9 @@ #include #include #include +#ifdef CONFIG_KEXEC_CORE +#include +#endif #include @@ -2715,3 +2718,13 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order) spin_unlock_irqrestore(&xen_reservation_lock, flags); } EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region); + +#ifdef CONFIG_KEXEC_CORE +phys_addr_t paddr_vmcoreinfo_note(void) +{ + if (xen_pv_domain()) + return virt_to_machine(&vmcoreinfo_note).maddr; + else + return __pa_symbol(&vmcoreinfo_note); +} +#endif /* CONFIG_KEXEC_CORE */ -- cgit v1.2.3