summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-05-08 18:38:44 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-19 10:04:35 -0700
commite171327c07f33c79dab763e08feb7b0ad24dfe71 (patch)
tree8a5ad03377257acab30fbf549a28f463cadb4b32 /arch
parentea88a24912c191babee3a3a2658ade2d53b880a9 (diff)
downloadlinux-stable-e171327c07f33c79dab763e08feb7b0ad24dfe71.tar.gz
linux-stable-e171327c07f33c79dab763e08feb7b0ad24dfe71.tar.bz2
linux-stable-e171327c07f33c79dab763e08feb7b0ad24dfe71.zip
KVM: VMX: fix halt emulation while emulating invalid guest sate
commit 8d76c49e9ffeee839bc0b7a3278a23f99101263e upstream. The invalid guest state emulation loop does not check halt_request which causes 100% cpu loop while guest is in halt and in invalid state, but more serious issue is that this leaves halt_request set, so random instruction emulated by vm86 #GP exit can be interpreted as halt which causes guest hang. Fix both problems by handling halt_request in emulation loop. Reported-by: Tomas Papan <tomas.papan@gmail.com> Tested-by: Tomas Papan <tomas.papan@gmail.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 2ad060acc445..be1d830ca98e 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3836,6 +3836,12 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
if (err != EMULATE_DONE)
return 0;
+ if (vcpu->arch.halt_request) {
+ vcpu->arch.halt_request = 0;
+ ret = kvm_emulate_halt(vcpu);
+ goto out;
+ }
+
if (signal_pending(current))
goto out;
if (need_resched())