]> git.baikalelectronics.ru Git - kernel.git/commitdiff
xen,kdump: handle pv domain in paddr_vmcoreinfo_note()
authorJuergen Gross <jgross@suse.com>
Tue, 11 Apr 2017 16:14:26 +0000 (18:14 +0200)
committerJuergen Gross <jgross@suse.com>
Tue, 2 May 2017 09:13:17 +0000 (11:13 +0200)
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 <jgross@suse.com>
Tested-by: Petr Tesarik <ptesarik@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
arch/x86/xen/mmu_pv.c

index c98bfb9f0248ae50c4335854b288167fc70d490f..9d9ae6650aa1d3d9e84a9929a7e5937ec89b6135 100644 (file)
@@ -49,6 +49,9 @@
 #include <linux/memblock.h>
 #include <linux/seq_file.h>
 #include <linux/crash_dump.h>
+#ifdef CONFIG_KEXEC_CORE
+#include <linux/kexec.h>
+#endif
 
 #include <trace/events/xen.h>
 
@@ -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 */