From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVbiM-0006yJ-Lu for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:46:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVbiI-0007tH-Px for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:46:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVbiI-0007t6-Hx for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:46:46 -0400 From: Igor Mammedov Date: Fri, 5 Aug 2016 11:46:12 +0200 Message-Id: <1470390377-228219-14-git-send-email-imammedo@redhat.com> In-Reply-To: <1470390377-228219-1-git-send-email-imammedo@redhat.com> References: <1470390377-228219-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 13/18] 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: pbonzini@redhat.com, ehabkost@redhat.com, mtosatti@redhat.com, rkrcmar@redhat.com, mst@redhat.com, kevin@koconnor.net, lersek@redhat.com Signed-off-by: Igor Mammedov --- target-i386/kvm_i386.h | 1 + hw/i386/kvm/apic.c | 13 +++++++++++-- target-i386/kvm.c | 14 ++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h index 42b00af..dad0dcf 100644 --- a/target-i386/kvm_i386.h +++ b/target-i386/kvm_i386.h @@ -41,4 +41,5 @@ int kvm_device_msix_set_vector(KVMState *s, uint32_t dev_id, uint32_t vector, int kvm_device_msix_assign(KVMState *s, uint32_t dev_id); int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id); +bool kvm_has_x2apic_ids(void); #endif diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 2bd0de8..3b33502 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -15,6 +15,7 @@ #include "hw/i386/apic_internal.h" #include "hw/pci/msi.h" #include "sysemu/kvm.h" +#include "kvm_i386.h" static inline void kvm_apic_set_reg(struct kvm_lapic_state *kapic, int reg_id, uint32_t val) @@ -34,7 +35,11 @@ void kvm_put_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) int i; memset(kapic, 0, sizeof(*kapic)); - kvm_apic_set_reg(kapic, 0x2, s->id << 24); + if (kvm_has_x2apic_ids() && 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 +64,11 @@ void kvm_get_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) APICCommonState *s = APIC_COMMON(dev); int i, v; - s->id = kvm_apic_get_reg(kapic, 0x2) >> 24; + if (kvm_has_x2apic_ids() && s->apicbase & MSR_IA32_APICBASE_EXTD) { + assert(kvm_apic_get_reg(kapic, 0x2) == s->initial_apic_id); + } else { + s->id = kvm_apic_get_reg(kapic, 0x2) >> 24; + } s->tpr = kvm_apic_get_reg(kapic, 0x8); s->arb_id = kvm_apic_get_reg(kapic, 0x9); s->log_dest = kvm_apic_get_reg(kapic, 0xd) >> 24; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 9697e16..f1c2a93 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -111,8 +111,15 @@ static int has_pit_state2; static bool has_msr_mcg_ext_ctl; +static bool has_x2apic_ids; + static struct kvm_cpuid2 *cpuid_cache; +bool kvm_has_x2apic_ids(void) +{ + return has_x2apic_ids; +} + int kvm_has_pit_state2(void) { return has_pit_state2; @@ -1155,6 +1162,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s) has_pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2); #endif +#ifdef KVM_CAP_X2APIC_API + if (kvm_check_extension(s, KVM_CAP_X2APIC_API)) { + has_x2apic_ids = !kvm_vm_enable_cap(s, KVM_CAP_X2APIC_API, 0, + KVM_X2APIC_API_USE_32BIT_IDS); + } +#endif + ret = kvm_get_supported_msrs(s); if (ret < 0) { return ret; -- 2.7.4