From patchwork Tue Feb 2 10:08:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 44274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 37339B7D23 for ; Tue, 2 Feb 2010 21:44:18 +1100 (EST) Received: from localhost ([127.0.0.1]:54099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcGD0-0007iH-Gf for incoming@patchwork.ozlabs.org; Tue, 02 Feb 2010 05:42:14 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcFgk-0002pU-Bg for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:54 -0500 Received: from [199.232.76.173] (port=38610 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcFgh-0002nX-Pp for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:51 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcFga-0006z0-JV for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:51 -0500 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:49466 helo=TX2EHSOBE007.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1NcFgZ-0006vT-US for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:44 -0500 Received: from mail195-tx2-R.bigfish.com (10.9.14.239) by TX2EHSOBE007.bigfish.com (10.9.40.27) with Microsoft SMTP Server id 8.1.340.0; Tue, 2 Feb 2010 10:08:36 +0000 Received: from mail195-tx2 (localhost [127.0.0.1]) by mail195-tx2-R.bigfish.com (Postfix) with ESMTP id 7D0B385074F; Tue, 2 Feb 2010 10:08:36 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzab9bh936eMzz1202hzzz32i6bh43j61h) Received: from mail195-tx2 (localhost.localdomain [127.0.0.1]) by mail195-tx2 (MessageSwitch) id 1265105315800372_13037; Tue, 2 Feb 2010 10:08:35 +0000 (UTC) Received: from TX2EHSMHS006.bigfish.com (unknown [10.9.14.241]) by mail195-tx2.bigfish.com (Postfix) with ESMTP id BF16711E0012; Tue, 2 Feb 2010 10:08:35 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by TX2EHSMHS006.bigfish.com (10.9.99.106) with Microsoft SMTP Server (TLS) id 14.0.482.39; Tue, 2 Feb 2010 10:08:34 +0000 Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id o12AAFPG015800; Tue, 2 Feb 2010 04:10:18 -0600 X-WSS-ID: 0KX7LI4-01-GTD-02 X-M-MSG: Received: from sausexbh1.amd.com (sausexbh1.amd.com [163.181.22.101]) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2D2C51028762; Tue, 2 Feb 2010 04:08:27 -0600 (CST) Received: from sausexmb1.amd.com ([163.181.3.156]) by sausexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 2 Feb 2010 04:08:29 -0600 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 2 Feb 2010 04:08:29 -0600 Received: from gwo.osrc.amd.com ([165.204.16.204]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 2 Feb 2010 11:08:19 +0100 Received: from localhost.localdomain (tronje.osrc.amd.com [165.204.15.48]) by gwo.osrc.amd.com (Postfix) with ESMTP id 8FC3D49C219; Tue, 2 Feb 2010 10:08:38 +0000 (GMT) From: Andre Przywara To: qemu-devel@nongnu.org Date: Tue, 2 Feb 2010 11:08:17 +0100 Message-ID: <1265105301-3455-10-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1265105301-3455-1-git-send-email-andre.przywara@amd.com> References: <1265105301-3455-1-git-send-email-andre.przywara@amd.com> X-OriginalArrivalTime: 02 Feb 2010 10:08:19.0853 (UTC) FILETIME=[A54193D0:01CAA3EF] MIME-Version: 1.0 X-Reverse-DNS: unknown X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: john.cooper@redhat.com, Andre Przywara Subject: [Qemu-devel] [PATCH 09/13] cpuid: propagate further CPUID leafs when -cpu host X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org -cpu host currently only propagates the CPU's family/model/stepping, the brand name and the feature bits. Add a whitelist of safe CPUID leafs to let the guest see the actual CPU's cache details and other things. Signed-off-by: Andre Przywara --- target-i386/cpu.h | 5 ++++- target-i386/cpuid.c | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index f826d3d..982f815 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -581,6 +581,9 @@ typedef struct { #define NB_MMU_MODES 2 +#define CPUID_FLAGS_VENDOR_OVERRIDE 1 +#define CPUID_FLAGS_HOST 2 + typedef struct CPUX86State { /* standard registers */ target_ulong regs[CPU_NB_REGS]; @@ -685,7 +688,7 @@ typedef struct CPUX86State { uint32_t cpuid_ext2_features; uint32_t cpuid_ext3_features; uint32_t cpuid_apic_id; - int cpuid_vendor_override; + uint32_t cpuid_flags; /* MTRRs */ uint64_t mtrr_fixed[11]; diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 635c2f4..6aa1f3f 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -122,7 +122,7 @@ typedef struct x86_def_t { uint32_t features, ext_features, ext2_features, ext3_features, kvm_features; uint32_t xlevel; char model_id[48]; - int vendor_override; + uint32_t flags; } x86_def_t; #define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE) @@ -419,7 +419,7 @@ static int cpu_x86_fill_host(x86_def_t *x86_cpu_def) x86_cpu_def->ext2_features = edx; x86_cpu_def->ext3_features = ecx; cpu_x86_fill_model_id(x86_cpu_def->model_id); - x86_cpu_def->vendor_override = 0; + x86_cpu_def->flags = CPUID_FLAGS_HOST; return 0; } @@ -529,7 +529,7 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) x86_cpu_def->vendor2 |= ((uint8_t)val[i + 4]) << (8 * i); x86_cpu_def->vendor3 |= ((uint8_t)val[i + 8]) << (8 * i); } - x86_cpu_def->vendor_override = 1; + x86_cpu_def->flags |= CPUID_FLAGS_VENDOR_OVERRIDE; } else if (!strcmp(featurestr, "model_id")) { pstrcpy(x86_cpu_def->model_id, sizeof(x86_cpu_def->model_id), val); @@ -602,7 +602,7 @@ int cpu_x86_register (CPUX86State *env, const char *cpu_model) env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; } - env->cpuid_vendor_override = def->vendor_override; + env->cpuid_flags = def->flags; env->cpuid_level = def->level; if (def->family > 0x0f) env->cpuid_version = 0xf00 | ((def->family - 0x0f) << 20); @@ -647,22 +647,38 @@ static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx, * this if you want to use KVM's sysenter/syscall emulation * in compatibility mode and when doing cross vendor migration */ - if (kvm_enabled() && env->cpuid_vendor_override) { + if (kvm_enabled() && + (env->cpuid_flags & CPUID_FLAGS_VENDOR_OVERRIDE) == 0) { host_cpuid(0, 0, NULL, ebx, ecx, edx); } } +#define CPUID_LEAF_PROPAGATE ((1 << 0x02) | (1 << 0x04) | (1 << 0x05) |\ + (1 << 0x0D)) +#define CPUID_LEAF_PROPAGATE_EXTENDED ((1 << 0x05) | (1 << 0x06) |\ + (1 << 0x08) | (1 << 0x19) | (1 << 0x1A)) + void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - /* test if maximum index reached */ if (index & 0x80000000) { + /* test if maximum index reached */ if (index > env->cpuid_xlevel) index = env->cpuid_level; + if ((env->cpuid_flags & CPUID_FLAGS_HOST) && + ((1 << (index - 0x80000000)) & CPUID_LEAF_PROPAGATE_EXTENDED)) { + host_cpuid(index, count, eax, ebx, ecx, edx); + return; + } } else { if (index > env->cpuid_level) index = env->cpuid_level; + if ((env->cpuid_flags & CPUID_FLAGS_HOST) && + ((1 << index) & CPUID_LEAF_PROPAGATE)) { + host_cpuid(index, count, eax, ebx, ecx, edx); + return; + } } switch(index) {