aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiantian Feng <fengtiantian@huawei.com>2017-04-19 12:18:39 -0400
committerIngo Molnar <mingo@kernel.org>2017-04-20 04:06:57 -0400
commitfba4f472b33aa81ca1836f57d005455261e9126f (patch)
tree935ae5a7615651dd9771c5fa46ad9042a6735f7c
parentd594aa0277e541bb997aef0bc0a55172d8138340 (diff)
x86/reboot: Turn off KVM when halting a CPU
A CPU in VMX root mode will ignore INIT signals and will fail to bring up the APs after reboot. Therefore, on a panic we disable VMX on all CPUs before rebooting or triggering kdump. Do this when halting the machine as well, in case a firmware-level reboot does not perform a cold reset for all processors. Without doing this, rebooting the host may hang. Signed-off-by: Tiantian Feng <fengtiantian@huawei.com> Signed-off-by: Xishi Qiu <qiuxishi@huawei.com> [ Rewritten commit message. ] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: kvm@vger.kernel.org Link: http://lkml.kernel.org/r/20170419161839.30550-1-pbonzini@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/smp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index d3c66a15bbde..9d7223cad389 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -33,6 +33,7 @@
33#include <asm/mce.h> 33#include <asm/mce.h>
34#include <asm/trace/irq_vectors.h> 34#include <asm/trace/irq_vectors.h>
35#include <asm/kexec.h> 35#include <asm/kexec.h>
36#include <asm/virtext.h>
36 37
37/* 38/*
38 * Some notes on x86 processor bugs affecting SMP operation: 39 * Some notes on x86 processor bugs affecting SMP operation:
@@ -162,6 +163,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs)
162 if (raw_smp_processor_id() == atomic_read(&stopping_cpu)) 163 if (raw_smp_processor_id() == atomic_read(&stopping_cpu))
163 return NMI_HANDLED; 164 return NMI_HANDLED;
164 165
166 cpu_emergency_vmxoff();
165 stop_this_cpu(NULL); 167 stop_this_cpu(NULL);
166 168
167 return NMI_HANDLED; 169 return NMI_HANDLED;
@@ -174,6 +176,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs)
174asmlinkage __visible void smp_reboot_interrupt(void) 176asmlinkage __visible void smp_reboot_interrupt(void)
175{ 177{
176 ipi_entering_ack_irq(); 178 ipi_entering_ack_irq();
179 cpu_emergency_vmxoff();
177 stop_this_cpu(NULL); 180 stop_this_cpu(NULL);
178 irq_exit(); 181 irq_exit();
179} 182}