From nobody Fri Nov 7 09:22:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547440768902330.6965726782388; Sun, 13 Jan 2019 20:39:28 -0800 (PST) Received: from localhost ([127.0.0.1]:56455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giu23-00009w-OM for importer@patchew.org; Sun, 13 Jan 2019 23:39:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giu0D-0007hG-0M for qemu-devel@nongnu.org; Sun, 13 Jan 2019 23:37:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1giu0B-0002f9-LQ for qemu-devel@nongnu.org; Sun, 13 Jan 2019 23:37:32 -0500 Received: from mga05.intel.com ([192.55.52.43]:15389) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1giu02-0002TQ-3Q for qemu-devel@nongnu.org; Sun, 13 Jan 2019 23:37:25 -0500 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2019 20:37:09 -0800 Received: from xulike-server.sh.intel.com ([10.239.48.60]) by fmsmga005.fm.intel.com with ESMTP; 13 Jan 2019 20:37:08 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,476,1539673200"; d="scan'208";a="311554096" From: Like Xu To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 20:24:59 +0800 Message-Id: <1547468699-17633-6-git-send-email-like.xu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1547468699-17633-1-git-send-email-like.xu@linux.intel.com> References: <1547468699-17633-1-git-send-email-like.xu@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v1 5/5] i386: add CPUID.1F to cpuid_data with host_cpuid check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, Peter Crosthwaite , Eduardo Habkost , "Michael S. Tsirkin" , like.xu@intel.com, Marcelo Tosatti , Paolo Bonzini , imammedo@redhat.com, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When cs->nr_dies is larger than 1, the CPUID.1F should be generated and is added to cpuid_data.entries for guest awareness. This patch provides a return option in kvm_has_cpuid_1f for default choice. Signed-off-by: Like Xu --- target/i386/kvm.c | 34 +++++++++++++++++++++++++++++++++- target/i386/kvm_i386.h | 1 + 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 739cf8c..eb0d1ee 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -120,6 +120,17 @@ bool kvm_has_smm(void) return kvm_check_extension(kvm_state, KVM_CAP_X86_SMM); } =20 +bool kvm_has_cpuid_1f(void) +{ + uint32_t eax =3D 0x1f, ecx =3D 1, ebx =3D 0, edx =3D 0; + host_cpuid(0x1f, 0, &eax, &ebx, &ecx, &edx); + if (eax !=3D 0) { + printf("It's recommended to disable CPUID.1F emulation \ + on Intel non-MCP platform.\n"); + } + return true; +} + bool kvm_has_adjust_clock_stable(void) { int ret =3D kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK); @@ -1035,7 +1046,6 @@ int kvm_arch_init_vcpu(CPUState *cs) } =20 cpu_x86_cpuid(env, 0, 0, &limit, &unused, &unused, &unused); - for (i =3D 0; i <=3D limit; i++) { if (cpuid_i =3D=3D KVM_MAX_CPUID_ENTRIES) { fprintf(stderr, "unsupported level value: 0x%x\n", limit); @@ -1127,6 +1137,28 @@ int kvm_arch_init_vcpu(CPUState *cs) } } =20 + cpu->enable_cpuid_0x1f =3D kvm_has_cpuid_1f(); + if (cs->nr_dies > 1) { + i =3D 0x1f; + for (j =3D 0; ; j++) { + c->function =3D i; + c->flags =3D KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index =3D j; + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx); + if (i =3D=3D 0x1f && j =3D=3D 3) { + break; + } + if (cpuid_i =3D=3D KVM_MAX_CPUID_ENTRIES) { + fprintf(stderr, "cpuid_data is full, no space for " + "cpuid(eax:0x%x,ecx:0x%x)\n", i, j); + abort(); + } + c =3D &cpuid_data.entries[cpuid_i++]; + if (!cpu->enable_cpuid_0x1f) + break; + } + } + if (limit >=3D 0x0a) { uint32_t eax, edx; =20 diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h index 3057ba4..ef9d41e 100644 --- a/target/i386/kvm_i386.h +++ b/target/i386/kvm_i386.h @@ -38,6 +38,7 @@ bool kvm_has_adjust_clock_stable(void); void kvm_synchronize_all_tsc(void); void kvm_arch_reset_vcpu(X86CPU *cs); void kvm_arch_do_init_vcpu(X86CPU *cs); +bool kvm_has_cpuid_1f(void); =20 int kvm_device_pci_assign(KVMState *s, PCIHostDeviceAddress *dev_addr, uint32_t flags, uint32_t *dev_id); --=20 1.8.3.1