From patchwork Sun May 3 14:04:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 21627 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n43E4Lig026863 for ; Sun, 3 May 2009 14:04:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752642AbZECOET (ORCPT ); Sun, 3 May 2009 10:04:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754087AbZECOET (ORCPT ); Sun, 3 May 2009 10:04:19 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37326 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752642AbZECOEN (ORCPT ); Sun, 3 May 2009 10:04:13 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n43E49Lb030831; Sun, 3 May 2009 10:04:11 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n43E46sX028909; Sun, 3 May 2009 10:04:06 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n43E44cR009862; Sun, 3 May 2009 10:04:05 -0400 Received: from localhost.localdomain (dhcp-1-197.tlv.redhat.com [10.35.1.197]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 37267A0043; Sun, 3 May 2009 17:04:04 +0300 (IDT) From: Avi Kivity To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH 1/4] kvm: Add support for querying supported cpu features Date: Sun, 3 May 2009 17:04:01 +0300 Message-Id: <1241359444-8538-2-git-send-email-avi@redhat.com> In-Reply-To: <1241359444-8538-1-git-send-email-avi@redhat.com> References: <1241359444-8538-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org kvm does not support all cpu features; add support for dunamically querying the supported feature set. Signed-off-by: Avi Kivity --- kvm.h | 3 ++ target-i386/kvm.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/kvm.h b/kvm.h index bd4e8d4..c134c45 100644 --- a/kvm.h +++ b/kvm.h @@ -124,6 +124,9 @@ void kvm_arch_remove_all_hw_breakpoints(void); void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg); +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, + int reg); + /* generic hooks - to be moved/refactored once there are more users */ static inline void cpu_synchronize_state(CPUState *env, int modified) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index b534b2d..5f54ff5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -34,6 +34,86 @@ do { } while (0) #endif +#ifdef KVM_CAP_EXT_CPUID + +static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) +{ + struct kvm_cpuid2 *cpuid; + int r, size; + + size = sizeof(*cpuid) + max * sizeof(*cpuid->entries); + cpuid = (struct kvm_cpuid2 *)qemu_mallocz(size); + cpuid->nent = max; + r = kvm_ioctl(s, KVM_GET_SUPPORTED_CPUID, cpuid); + if (r < 0) { + if (r == -E2BIG) { + qemu_free(cpuid); + return NULL; + } else { + fprintf(stderr, "KVM_GET_SUPPORTED_CPUID failed: %s\n", + strerror(-r)); + exit(1); + } + } + return cpuid; +} + +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg) +{ + struct kvm_cpuid2 *cpuid; + int i, max; + uint32_t ret = 0; + uint32_t cpuid_1_edx; + + if (!kvm_check_extension(KVM_CAP_EXT_CPUID)) { + return -1U; + } + + max = 1; + while ((cpuid = try_get_cpuid(env->kvm_state, max)) == NULL) { + max *= 2; + } + + for (i = 0; i < cpuid->nent; ++i) { + if (cpuid->entries[i].function == function) { + switch (reg) { + case R_EAX: + ret = cpuid->entries[i].eax; + break; + case R_EBX: + ret = cpuid->entries[i].ebx; + break; + case R_ECX: + ret = cpuid->entries[i].ecx; + break; + case R_EDX: + ret = cpuid->entries[i].edx; + if (function == 0x80000001) { + /* On Intel, kvm returns cpuid according to the Intel spec, + * so add missing bits according to the AMD spec: + */ + cpuid_1_edx = kvm_arch_get_supported_cpuid(env, 1, R_EDX); + ret |= cpuid_1_edx & 0xdfeff7ff; + } + break; + } + } + } + + qemu_free(cpuid); + + return ret; +} + +#else + +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg) +{ + return -1U; +} + +#endif + int kvm_arch_init_vcpu(CPUState *env) { struct {