From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752657AbcGAIq1 (ORCPT ); Fri, 1 Jul 2016 04:46:27 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33233 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751680AbcGAIoE (ORCPT ); Fri, 1 Jul 2016 04:44:04 -0400 Subject: Re: [PATCH v1 09/11] KVM: x86: reset lapic base in kvm_lapic_reset To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org, kvm@vger.kernel.org References: <20160630205429.16480-1-rkrcmar@redhat.com> <20160630205429.16480-10-rkrcmar@redhat.com> Cc: "Lan, Tianyu" , Igor Mammedov , Jan Kiszka , Peter Xu From: Paolo Bonzini Message-ID: <137055b6-436e-ee22-e3c2-6e0c06cf4a88@redhat.com> Date: Fri, 1 Jul 2016 10:43:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <20160630205429.16480-10-rkrcmar@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 30/06/2016 22:54, Radim Krčmář wrote: > LAPIC is reset in xAPIC mode and the surrounding code expects that. > KVM never resets after initialization. This patch is just for sanity. > > Signed-off-by: Radim Krčmář > --- > 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 143df33f451e..46eb71c425cf 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1758,8 +1758,11 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) > /* Stop the timer in case it's a reset to an active apic */ > hrtimer_cancel(&apic->lapic_timer.timer); > > - if (!init_event) > + if (!init_event) { > + kvm_lapic_set_base(vcpu, APIC_DEFAULT_PHYS_BASE | > + MSR_IA32_APICBASE_ENABLE); > kvm_apic_set_xapic_id(apic, vcpu->vcpu_id); > + } > kvm_apic_set_version(apic->vcpu); > > for (i = 0; i < KVM_APIC_LVT_NUM; i++) > @@ -1898,9 +1901,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) > * thinking that APIC satet has changed. > */ > vcpu->arch.apic_base = MSR_IA32_APICBASE_ENABLE; > - kvm_lapic_set_base(vcpu, > - APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE); > - > static_key_slow_inc(&apic_sw_disabled.key); /* sw disabled at reset */ > kvm_lapic_reset(vcpu, false); > kvm_iodevice_init(&apic->dev, &apic_mmio_ops); > Reviewed-by: Paolo Bonzini