From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH] KVM: x86: Fix APIC map calculation after re-enabling
Date: Mon, 30 Dec 2013 18:59:09 -0200
Message-ID: <20131230205909.GA10059@amt.cnet>
References: <52BF7AFA.4050806@web.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Gleb Natapov <gleb@kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>, kvm <kvm@vger.kernel.org>
To: Jan Kiszka <jan.kiszka@web.de>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:6727 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932196Ab3L3U70 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 30 Dec 2013 15:59:26 -0500
Content-Disposition: inline
In-Reply-To: <52BF7AFA.4050806@web.de>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Sun, Dec 29, 2013 at 02:29:30AM +0100, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Update arch.apic_base before triggering recalculate_apic_map. Otherwise
> the recalculation will work against the previous state of the APIC and
> will fail to build the correct map when an APIC is hardware-enabled
> again.
> 
> This fixes a regression of 1e08ec4a13.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Stable material.
> 
>  arch/x86/kvm/lapic.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 5439117..ab58ea4 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -1346,6 +1346,10 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
>  		return;
>  	}
>  
> +	if (!kvm_vcpu_is_bsp(apic->vcpu))
> +		value &= ~MSR_IA32_APICBASE_BSP;
> +	vcpu->arch.apic_base = value;
> +
>  	/* update jump label if enable bit changes */
>  	if ((vcpu->arch.apic_base ^ value) & MSR_IA32_APICBASE_ENABLE) {
>  		if (value & MSR_IA32_APICBASE_ENABLE)
> @@ -1355,10 +1359,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
>  		recalculate_apic_map(vcpu->kvm);
>  	}
>  
> -	if (!kvm_vcpu_is_bsp(apic->vcpu))
> -		value &= ~MSR_IA32_APICBASE_BSP;
> -
> -	vcpu->arch.apic_base = value;
>  	if ((old_value ^ value) & X2APIC_ENABLE) {
>  		if (value & X2APIC_ENABLE) {
>  			u32 id = kvm_apic_id(apic);
> -- 

Applied to master branch, thanks.