diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-05-08 18:38:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-19 10:54:34 -0700 |
| commit | cb5dfa51315da5d7c041f49f7f139a6c6659b584 (patch) | |
| tree | d93674cfdaccf4081d98d6973e8e20a4c01b479f /arch | |
| parent | 68233b884a3817fbc54b6763e8b4321c56e57a3a (diff) | |
| download | linux-3.10-cb5dfa51315da5d7c041f49f7f139a6c6659b584.tar.gz linux-3.10-cb5dfa51315da5d7c041f49f7f139a6c6659b584.tar.bz2 linux-3.10-cb5dfa51315da5d7c041f49f7f139a6c6659b584.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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4ff0ab9bc3c..90f5c0ed9d2 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4889,6 +4889,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()) |