Commit 2340b62f authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Avi Kivity

kdump: forcibly disable VMX and SVM on machine_crash_shutdown()

We need to disable virtualization extensions on all CPUs before booting
the kdump kernel, otherwise the kdump kernel booting will fail, and
rebooting after the kdump kernel did its task may also fail.

We do it using cpu_emergency_vmxoff() and cpu_emergency_svm_disable(),
that should always work, because those functions check if the CPUs
support SVM or VMX before doing their tasks.
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0f3e9eeb
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/kdebug.h> #include <linux/kdebug.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/virtext.h>
#include <mach_ipi.h> #include <mach_ipi.h>
...@@ -49,6 +50,15 @@ static void kdump_nmi_callback(int cpu, struct die_args *args) ...@@ -49,6 +50,15 @@ static void kdump_nmi_callback(int cpu, struct die_args *args)
#endif #endif
crash_save_cpu(regs, cpu); crash_save_cpu(regs, cpu);
/* Disable VMX or SVM if needed.
*
* We need to disable virtualization on all CPUs.
* Having VMX or SVM enabled on any CPU may break rebooting
* after the kdump kernel has finished its task.
*/
cpu_emergency_vmxoff();
cpu_emergency_svm_disable();
disable_local_APIC(); disable_local_APIC();
} }
...@@ -80,6 +90,14 @@ void native_machine_crash_shutdown(struct pt_regs *regs) ...@@ -80,6 +90,14 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
local_irq_disable(); local_irq_disable();
kdump_nmi_shootdown_cpus(); kdump_nmi_shootdown_cpus();
/* Booting kdump kernel with VMX or SVM enabled won't work,
* because (among other limitations) we can't disable paging
* with the virt flags.
*/
cpu_emergency_vmxoff();
cpu_emergency_svm_disable();
lapic_shutdown(); lapic_shutdown();
#if defined(CONFIG_X86_IO_APIC) #if defined(CONFIG_X86_IO_APIC)
disable_IO_APIC(); disable_IO_APIC();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment