mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i386/cpu: Consolidate the use of topo_info in cpu_x86_cpuid()

Browse Source 
In cpu_x86_cpuid(), there are many variables in representing the cpu
topology, e.g., topo_info, cs->nr_cores and cs->nr_threads.

Since the names of cs->nr_cores and cs->nr_threads do not accurately
represent its meaning, the use of cs->nr_cores or cs->nr_threads is
prone to confusion and mistakes.

And the structure X86CPUTopoInfo names its members clearly, thus the
variable "topo_info" should be preferred.

In addition, in cpu_x86_cpuid(), to uniformly use the topology variable,
replace env->dies with topo_info.dies_per_pkg as well.

Suggested-by: Robert Hoo <robert.hu@linux.intel.com>
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Babu Moger <babu.moger@amd.com>
Message-ID: <20240424154929.1487382-9-zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Zhao Liu 2024-04-24 23:49:16 +08:00 committed by Paolo Bonzini
parent 9a085c4b4a
commit 2613747a79
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
target/i386/cpu.c
View File

@ -6165,11 +6165,16 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
uint32_t limit; uint32_t limit;
uint32_t signature[3]; uint32_t signature[3];
X86CPUTopoInfo topo_info; X86CPUTopoInfo topo_info;
uint32_t cores_per_pkg;
uint32_t threads_per_pkg;
topo_info.dies_per_pkg = env->nr_dies; topo_info.dies_per_pkg = env->nr_dies;
topo_info.cores_per_die = cs->nr_cores / env->nr_dies; topo_info.cores_per_die = cs->nr_cores / env->nr_dies;
topo_info.threads_per_core = cs->nr_threads; topo_info.threads_per_core = cs->nr_threads;
cores_per_pkg = topo_info.cores_per_die * topo_info.dies_per_pkg;
threads_per_pkg = cores_per_pkg * topo_info.threads_per_core;
/* Calculate & apply limits for different index ranges */ /* Calculate & apply limits for different index ranges */
if (index >= 0xC0000000) { if (index >= 0xC0000000) {
limit = env->cpuid_xlevel2; limit = env->cpuid_xlevel2;
@ -6205,8 +6210,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*ecx |= CPUID_EXT_OSXSAVE; *ecx |= CPUID_EXT_OSXSAVE;
} }
*edx = env->features[FEAT_1_EDX]; *edx = env->features[FEAT_1_EDX];
if (cs->nr_cores * cs->nr_threads > 1) { if (threads_per_pkg > 1) {
*ebx |= (cs->nr_cores * cs->nr_threads) << 16; *ebx |= threads_per_pkg << 16;
*edx |= CPUID_HT; *edx |= CPUID_HT;
} }
if (!cpu->enable_pmu) { if (!cpu->enable_pmu) {
@ -6254,15 +6259,15 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*/ */
if (*eax & 31) { if (*eax & 31) {
int host_vcpus_per_cache = 1 + ((*eax & 0x3FFC000) >> 14); int host_vcpus_per_cache = 1 + ((*eax & 0x3FFC000) >> 14);
int vcpus_per_socket = cs->nr_cores * cs->nr_threads;
if (cs->nr_cores > 1) { if (cores_per_pkg > 1) {
addressable_cores_width = apicid_pkg_offset(&topo_info) - addressable_cores_width = apicid_pkg_offset(&topo_info) -
apicid_core_offset(&topo_info); apicid_core_offset(&topo_info);
*eax &= ~0xFC000000; *eax &= ~0xFC000000;
*eax |= ((1 << addressable_cores_width) - 1) << 26; *eax |= ((1 << addressable_cores_width) - 1) << 26;
} }
if (host_vcpus_per_cache > vcpus_per_socket) { if (host_vcpus_per_cache > threads_per_pkg) {
/* Share the cache at package level. */ /* Share the cache at package level. */
addressable_threads_width = apicid_pkg_offset(&topo_info); addressable_threads_width = apicid_pkg_offset(&topo_info);
@ -6412,12 +6417,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
switch (count) { switch (count) {
case 0: case 0:
*eax = apicid_core_offset(&topo_info); *eax = apicid_core_offset(&topo_info);
*ebx = cs->nr_threads; *ebx = topo_info.threads_per_core;
*ecx |= CPUID_TOPOLOGY_LEVEL_SMT; *ecx |= CPUID_TOPOLOGY_LEVEL_SMT;
break; break;
case 1: case 1:
*eax = apicid_pkg_offset(&topo_info); *eax = apicid_pkg_offset(&topo_info);
*ebx = cs->nr_cores * cs->nr_threads; *ebx = threads_per_pkg;
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE; *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
break; break;
default: default:
@ -6437,7 +6442,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break; break;
case 0x1F: case 0x1F:
/* V2 Extended Topology Enumeration Leaf */ /* V2 Extended Topology Enumeration Leaf */
if (env->nr_dies < 2) { if (topo_info.dies_per_pkg < 2) {
*eax = *ebx = *ecx = *edx = 0; *eax = *ebx = *ecx = *edx = 0;
break; break;
} }
@ -6447,7 +6452,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
switch (count) { switch (count) {
case 0: case 0:
*eax = apicid_core_offset(&topo_info); *eax = apicid_core_offset(&topo_info);
*ebx = cs->nr_threads; *ebx = topo_info.threads_per_core;
*ecx |= CPUID_TOPOLOGY_LEVEL_SMT; *ecx |= CPUID_TOPOLOGY_LEVEL_SMT;
break; break;
case 1: case 1:
@ -6457,7 +6462,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break; break;
case 2: case 2:
*eax = apicid_pkg_offset(&topo_info); *eax = apicid_pkg_offset(&topo_info);
*ebx = cs->nr_cores * cs->nr_threads; *ebx = threads_per_pkg;
*ecx |= CPUID_TOPOLOGY_LEVEL_DIE; *ecx |= CPUID_TOPOLOGY_LEVEL_DIE;
break; break;
default: default:
@ -6685,7 +6690,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
* discards multiple thread information if it is set. * discards multiple thread information if it is set.
* So don't set it here for Intel to make Linux guests happy. * So don't set it here for Intel to make Linux guests happy.
*/ */
if (cs->nr_cores * cs->nr_threads > 1) { if (threads_per_pkg > 1) {
if (env->cpuid_vendor1 != CPUID_VENDOR_INTEL_1 || if (env->cpuid_vendor1 != CPUID_VENDOR_INTEL_1 ||
env->cpuid_vendor2 != CPUID_VENDOR_INTEL_2 || env->cpuid_vendor2 != CPUID_VENDOR_INTEL_2 ||
env->cpuid_vendor3 != CPUID_VENDOR_INTEL_3) { env->cpuid_vendor3 != CPUID_VENDOR_INTEL_3) {
@ -6752,7 +6757,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*eax |= (cpu->guest_phys_bits << 16); *eax |= (cpu->guest_phys_bits << 16);
} }
*ebx = env->features[FEAT_8000_0008_EBX]; *ebx = env->features[FEAT_8000_0008_EBX];
if (cs->nr_cores * cs->nr_threads > 1) { if (threads_per_pkg > 1) {
/* /*
* Bits 15:12 is "The number of bits in the initial * Bits 15:12 is "The number of bits in the initial
* Core::X86::Apic::ApicId[ApicId] value that indicate * Core::X86::Apic::ApicId[ApicId] value that indicate
@ -6760,7 +6765,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
* Bits 7:0 is "The number of threads in the package is NC+1" * Bits 7:0 is "The number of threads in the package is NC+1"
*/ */
*ecx = (apicid_pkg_offset(&topo_info) << 12) | *ecx = (apicid_pkg_offset(&topo_info) << 12) |
((cs->nr_cores * cs->nr_threads) - 1); (threads_per_pkg - 1);
} else { } else {
*ecx = 0; *ecx = 0;
} }