From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwpdI-0007xt-EX for qemu-devel@nongnu.org; Wed, 19 Oct 2016 08:06:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwpdH-0003JM-Az for qemu-devel@nongnu.org; Wed, 19 Oct 2016 08:06:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40726) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwpdH-0003Iw-3u for qemu-devel@nongnu.org; Wed, 19 Oct 2016 08:06:07 -0400 From: Igor Mammedov Date: Wed, 19 Oct 2016 14:05:38 +0200 Message-Id: <1476878743-144953-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1476878743-144953-1-git-send-email-imammedo@redhat.com> References: <1476878743-144953-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 08/13] pc: kvm_apic: pass APIC ID depending on xAPIC/x2APIC mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, ehabkost@redhat.com, liuxiaojian6@huawei.com, mst@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, kevin@koconnor.net, pbonzini@redhat.com, lersek@redhat.com, chao.gao@intel.com Signed-off-by: Igor Mammedov Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 Reviewed-by: Eduardo Habkost --- v4: - restore kvm_has_x2apic_api() and use it to avoid side-effects of kvm_enable_x2apic(). x2APIC API will be enabled by iommu if it's present or not enabled at all. v3: - drop kvm_has_x2apic_api() and reuse kvm_enable_x2apic() instead --- target-i386/kvm_i386.h | 1 + hw/i386/kvm/apic.c | 12 ++++++++++-- target-i386/kvm.c | 13 ++++++++++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h index 5c369b1..7607929 100644 --- a/target-i386/kvm_i386.h +++ b/target-i386/kvm_i386.h @@ -44,4 +44,5 @@ int kvm_device_msix_deassign(KVMState *s, uint32_t dev_= id); void kvm_put_apicbase(X86CPU *cpu, uint64_t value); =20 bool kvm_enable_x2apic(void); +bool kvm_has_x2apic_api(void); #endif diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index be55102..39b73e7 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -34,7 +34,11 @@ static void kvm_put_apic_state(APICCommonState *s, str= uct kvm_lapic_state *kapic int i; =20 memset(kapic, 0, sizeof(*kapic)); - kvm_apic_set_reg(kapic, 0x2, s->id << 24); + if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) { + kvm_apic_set_reg(kapic, 0x2, s->initial_apic_id); + } else { + kvm_apic_set_reg(kapic, 0x2, s->id << 24); + } kvm_apic_set_reg(kapic, 0x8, s->tpr); kvm_apic_set_reg(kapic, 0xd, s->log_dest << 24); kvm_apic_set_reg(kapic, 0xe, s->dest_mode << 28 | 0x0fffffff); @@ -59,7 +63,11 @@ void kvm_get_apic_state(DeviceState *dev, struct kvm_l= apic_state *kapic) APICCommonState *s =3D APIC_COMMON(dev); int i, v; =20 - s->id =3D kvm_apic_get_reg(kapic, 0x2) >> 24; + if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) { + assert(kvm_apic_get_reg(kapic, 0x2) =3D=3D s->initial_apic_id); + } else { + s->id =3D kvm_apic_get_reg(kapic, 0x2) >> 24; + } s->tpr =3D kvm_apic_get_reg(kapic, 0x8); s->arb_id =3D kvm_apic_get_reg(kapic, 0x9); s->log_dest =3D kvm_apic_get_reg(kapic, 0xd) >> 24; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0472f45..86b41a9 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -129,9 +129,8 @@ static bool kvm_x2apic_api_set_flags(uint64_t flags) return !kvm_vm_enable_cap(s, KVM_CAP_X2APIC_API, 0, flags); } =20 -#define MEMORIZE(fn) \ +#define MEMORIZE(fn, _result) \ ({ \ - static typeof(fn) _result; \ static bool _memorized; \ \ if (_memorized) { \ @@ -141,11 +140,19 @@ static bool kvm_x2apic_api_set_flags(uint64_t flags= ) _result =3D fn; \ }) =20 +static bool has_x2apic_api; + +bool kvm_has_x2apic_api(void) +{ + return has_x2apic_api; +} + bool kvm_enable_x2apic(void) { return MEMORIZE( kvm_x2apic_api_set_flags(KVM_X2APIC_API_USE_32BIT_IDS | - KVM_X2APIC_API_DISABLE_BROADCAST_Q= UIRK)); + KVM_X2APIC_API_DISABLE_BROADCAST_Q= UIRK), + has_x2apic_api); } =20 static int kvm_get_tsc(CPUState *cs) --=20 2.7.4