From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH] KVM: VMX: Fix locking imbalance on emulation failure
Date: Tue, 21 Jul 2009 14:35:14 -0300
Message-ID: <20090721173514.GE6959@amt.cnet>
References: <4A657F9B.1090305@siemens.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm-devel <kvm@vger.kernel.org>
To: Jan Kiszka <jan.kiszka@siemens.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:35688 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752802AbZGURuL (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 21 Jul 2009 13:50:11 -0400
Content-Disposition: inline
In-Reply-To: <4A657F9B.1090305@siemens.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Tue, Jul 21, 2009 at 10:43:07AM +0200, Jan Kiszka wrote:
> We have to disable preemption and IRQs on every exit from
> handle_invalid_guest_state, otherwise we generate at least a
> preempt_disable imbalance.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
>  arch/x86/kvm/vmx.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 3a75db3..7a8d464 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -3335,7 +3335,7 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu,
>  
>  		if (err != EMULATE_DONE) {
>  			kvm_report_emulation_failure(vcpu, "emulation failure");
> -			return;
> +			break;
>  		}
>  
>  		if (signal_pending(current))

Applied, thanks.