From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130603221152.326071406@goodmis.org> Date: Mon, 03 Jun 2013 18:10:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tomas Papan , Paolo Bonzini , Gleb Natapov Subject: [01/65] KVM: VMX: fix halt emulation while emulating invalid guest sate References: <20130603221016.243553628@goodmis.org> Content-Disposition: inline; filename=0001-KVM-VMX-fix-halt-emulation-while-emulating-invalid-g.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.5 stable review patch. If anyone has any objections, please let me know. ------------------ From: Gleb Natapov [ Upstream commit 8d76c49e9ffeee839bc0b7a3278a23f99101263e ] 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 Tested-by: Tomas Papan Reviewed-by: Paolo Bonzini CC: stable@vger.kernel.org Signed-off-by: Gleb Natapov Signed-off-by: Steven Rostedt --- arch/x86/kvm/vmx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index ff66a3b..a0f8dc3 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5030,6 +5030,12 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) 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()) -- 1.7.10.4