aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm/kvm_main.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-12-02 10:52:50 -0500
committerAvi Kivity <avi@redhat.com>2011-01-12 04:30:18 -0500
commitb7c4145ba2eb0717db0ddac1b5f7f48012189c53 (patch)
tree9b259970f56451ecb0f5d84ecd81d67386f63224 /virt/kvm/kvm_main.c
parent4cc703100b1fd97c71804e2fa5c9c377c5b37dc5 (diff)
KVM: Don't spin on virt instruction faults during reboot
Since vmx blocks INIT signals, we disable virtualization extensions during reboot. This leads to virtualization instructions faulting; we trap these faults and spin while the reboot continues. Unfortunately spinning on a non-preemptible kernel may block a task that reboot depends on; this causes the reboot to hang. Fix by skipping over the instruction and hoping for the best. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r--virt/kvm/kvm_main.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index ee99b77e4451..7f686251f711 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -90,7 +90,8 @@ static void hardware_disable_all(void);
90 90
91static void kvm_io_bus_destroy(struct kvm_io_bus *bus); 91static void kvm_io_bus_destroy(struct kvm_io_bus *bus);
92 92
93static bool kvm_rebooting; 93bool kvm_rebooting;
94EXPORT_SYMBOL_GPL(kvm_rebooting);
94 95
95static bool largepages_enabled = true; 96static bool largepages_enabled = true;
96 97
@@ -2171,18 +2172,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
2171} 2172}
2172 2173
2173 2174
2174asmlinkage void kvm_handle_fault_on_reboot(void) 2175asmlinkage void kvm_spurious_fault(void)
2175{ 2176{
2176 if (kvm_rebooting) {
2177 /* spin while reset goes on */
2178 local_irq_enable();
2179 while (true)
2180 cpu_relax();
2181 }
2182 /* Fault while not rebooting. We want the trace. */ 2177 /* Fault while not rebooting. We want the trace. */
2183 BUG(); 2178 BUG();
2184} 2179}
2185EXPORT_SYMBOL_GPL(kvm_handle_fault_on_reboot); 2180EXPORT_SYMBOL_GPL(kvm_spurious_fault);
2186 2181
2187static int kvm_reboot(struct notifier_block *notifier, unsigned long val, 2182static int kvm_reboot(struct notifier_block *notifier, unsigned long val,
2188 void *v) 2183 void *v)