From: Mohammed Gamal Subject: [PATCH] VMX: Return to userspace on invalid state emulation failure Date: Mon, 24 Aug 2009 07:07:54 +0300 Message-ID: <1251086875-21412-1-git-send-email-m.gamal005@gmail.com> Cc: kvm@vger.kernel.org, Mohammed Gamal To: avi@redhat.com Return-path: Received: from mail-ew0-f207.google.com ([209.85.219.207]:62646 "EHLO mail-ew0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933AbZHXEIC (ORCPT ); Mon, 24 Aug 2009 00:08:02 -0400 Received: by ewy3 with SMTP id 3so2041438ewy.18 for ; Sun, 23 Aug 2009 21:08:02 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: Return to userspace instead of repeatedly trying to emulate instructions that have already failed Signed-off-by: Mohammed Gamal --- arch/x86/kvm/vmx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1ee811c..6030671 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3341,6 +3341,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, if (err != EMULATE_DONE) { kvm_report_emulation_failure(vcpu, "emulation failure"); + kvm_run->exit_reason = KVM_EXIT_INTERNAL_ERROR; + kvm_run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION; break; } @@ -3612,7 +3614,8 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) vmx->entry_time = ktime_get(); /* Handle invalid guest state instead of entering VMX */ - if (vmx->emulation_required && emulate_invalid_guest_state) { + if (vmx->emulation_required && emulate_invalid_guest_state + && kvm_run->internal.suberror != KVM_INTERNAL_ERROR_EMULATION) { handle_invalid_guest_state(vcpu, kvm_run); return; } -- 1.6.0.4