Support smp.clusters for x86 in QEMU
Subsystems (2)
v5 cover Support smp.clusters for x86 in QEMU
From: Zhao Liu <[email protected]>
Hi list,
This is the our v5 patch series, rebased on the master branch at the commit 384dbdda94c0 ("Merge tag 'migration-20231020-pull-request' of
https://gitlab.com/juan.quintela/qemu into staging").
Comparing with v4 [1], v5 drops the "x-l2-cache-topo" option and adds A/R/T tags (Thanks for all the reviews, comments and tests!).
No further changes since v4 other than the removal of x-l2-cache-topo.
Welcome your comments!
PS: About the idea to implement generic smp cache topology, we're considerring to port the original x-l2-cache-topo option to smp [2]. Just like:
-smp cpus=4,sockets=2,cores=2,threads=1, \
l3-cache=socket,l2-cache=core,l1-i-cache=core,l1-d-cache=coreAny feedback about this direction is also welcomed! ;-)
---
# Introduction
This series adds the cluster support for x86 PC machine, which allows x86 can use smp.clusters to configure the module level CPU topology of x86.
This series also is the preparation to help x86 to define the more flexible cache topology, such as having multiple cores share the same L2 cache at cluster level. (That was what x-l2-cache-topo did, and we will explore a generic way.)
About why we don't share L2 cache at cluster and need a configuration way, pls see section: ## Why not share L2 cache in cluster directly.
# Background
The "clusters" parameter in "smp" is introduced by ARM [3], but x86 hasn't supported it.
At present, x86 defaults L2 cache is shared in one core, but this is not enough. There're some platforms that multiple cores share the same L2 cache, e.g., Alder Lake-P shares L2 cache for one module of Atom cores [4], that is, every four Atom cores shares one L2 cache. Therefore, we need the new CPU topology level (cluster/module).
Another reason is for hybrid architecture. cluster support not only provides another level of topology definition in x86, but would also provide required code change for future our hybrid topology support.
# Overview
## Introduction of module level for x86
"cluster" in smp is the CPU topology level which is between "core" and die.
For x86, the "cluster" in smp is corresponding to the module level [4], which is above the core level. So use the "module" other than "cluster" in x86 code.
And please note that x86 already has a cpu topology level also named "cluster" [5], this level is at the upper level of the package. Here, the cluster in x86 cpu topology is completely different from the "clusters" as the smp parameter. After the module level is introduced, the cluster as the smp parameter will actually refer to the module level of x86.
## Why not share L2 cache in cluster directly
Though "clusters" was introduced to help define L2 cache topology [3], using cluster to define x86's L2 cache topology will cause the compatibility problem:
Currently, x86 defaults that the L2 cache is shared in one core, which actually implies a default setting "cores per L2 cache is 1" and therefore implicitly defaults to having as many L2 caches as cores.
For example (i386 PC machine):
-smp 16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 (*)
Considering the topology of the L2 cache, this (*) implicitly means "1 core per L2 cache" and "2 L2 caches per die".
If we use cluster to configure L2 cache topology with the new default setting "clusters per L2 cache is 1", the above semantics will change to "2 cores per cluster" and "1 cluster per L2 cache", that is, "2 cores per L2 cache".
So the same command (*) will cause changes in the L2 cache topology, further affecting the performance of the virtual machine.
Therefore, x86 should only treat cluster as a cpu topology level and avoid using it to change L2 cache by default for compatibility.
## module level in CPUID
Linux kernel (from v6.4, with commit edc0a2b595765 ("x86/topology: Fix erroneous smp_num_siblings on Intel Hybrid platforms") is able to handle platforms with Module level enumerated via CPUID.1F.
Expose the module level in CPUID[0x1F] (for Intel CPUs) if the machine has more than 1 modules since v3.
## New cache topology info in CPUCacheInfo
Currently, by default, the cache topology is encoded as:
1. i/d cache is shared in one core.
2. L2 cache is shared in one core.
3. L3 cache is shared in one die.
This default general setting has caused a misunderstanding, that is, the cache topology is completely equated with a specific cpu topology, such as the connection between L2 cache and core level, and the connection between L3 cache and die level.
In fact, the settings of these topologies depend on the specific platform and are not static. For example, on Alder Lake-P, every four Atom cores share the same L2 cache [3].
Thus, in this patch set, we explicitly define the corresponding cache topology for different cpu models and this has two benefits:
1. Easy to expand to new CPU models in the future, which has different cache topology.
2. It can easily support custom cache topology by some command.
# Patch description
patch 1-2 Cleanups about coding style and test name.
patch 3-5 Fixes about x86 topology and Intel l1 cache topology.
patch 6-7 Cleanups about topology related CPUID encoding and QEMU
topology variables.
patch 8-9 Refactor CPUID[0x1F] encoding to prepare to introduce module
level.
patch 10-16 Add the module as the new CPU topology level in x86, and it
is corresponding to the cluster level in generic code.
patch 17,18,20 Add cache topology information in cache models.
patch 19 Update AMD CPUs' cache topology encoding.
[1]: https://lists.gnu.org/archive/html/qemu-devel/2023-09/msg03345.html
[2]: https://lists.gnu.org/archive/html/qemu-devel/2023-10/msg01954.html
[3]: https://patchew.org/QEMU/[email protected]/
[4]: https://www.intel.com/content/www/us/en/products/platforms/details/alder-lake-p.html
[5]: SDM, vol.3, ch.9, 9.9.1 Hierarchical Mapping of Shared Resources.
Best Regards,
Zhao
---
Changelog:
Changes since v4:
* Drop the "x-l2-cache-topo" option. (Michael)
* Add A/R/T tags.
Changes since v3 (main changes):
* Expose module level in CPUID[0x1F].
* Fix compile warnings. (Babu)
* Fixes cache topology uninitialization bugs for some AMD CPUs. (Babu)
Changes since v2:
* Add "Tested-by", "Reviewed-by" and "ACKed-by" tags.
* Use newly added wrapped helper to get cores per socket in qemu_init_vcpu().
Changes since v1:
* Reordered patches. (Yanan)
* Deprecated the patch to fix comment of machine_parse_smp_config(). (Yanan)
* Rename test-x86-cpuid.c to test-x86-topo.c. (Yanan)
* Split the intel's l1 cache topology fix into a new separate patch. (Yanan)
* Combined module_id and APIC ID for module level support into one patch. (Yanan)
* Make cache_into_passthrough case of cpuid 0x04 leaf in
* cpu_x86_cpuid() use max_processor_ids_for_cache() and max_core_ids_in_package() to encode CPUID[4]. (Yanan)
* Add the prefix "CPU_TOPO_LEVEL_*" for CPU topology level names. (Yanan)
---
Zhao Liu (13):
i386: Fix comment style in topology.h
tests: Rename test-x86-cpuid.c to test-x86-topo.c hw/cpu: Update the comments of nr_cores and nr_dies i386/cpu: Fix i/d-cache topology to core level for Intel CPU i386/cpu: Use APIC ID offset to encode cache topo in CPUID[4] i386/cpu: Consolidate the use of topo_info in cpu_x86_cpuid()
i386: Split topology types of CPUID[0x1F] from the definitions of
CPUID[0xB]
i386: Decouple CPUID[0x1F] subleaf with specific topology level
i386: Expose module level in CPUID[0x1F]
i386: Add cache topology info in CPUCacheInfo
i386: Use CPUCacheInfo.share_level to encode CPUID[4]
i386: Use offsets get NumSharingCache for CPUID[0x8000001D].EAX[bits
25:14]
i386: Use CPUCacheInfo.share_level to encode
CPUID[0x8000001D].EAX[bits 25:14]Zhuocheng Ding (7):
softmmu: Fix CPUSTATE.nr_cores' calculation
i386: Introduce module-level cpu topology to CPUX86State
i386: Support modules_per_die in X86CPUTopoInfo
i386: Support module_id in X86CPUTopoIDs i386/cpu: Introduce cluster-id to X86CPU
tests: Add test case of APIC ID for module level parsing hw/i386/pc: Support smp.clusters for x86 PC machine
MAINTAINERS | 2 +-
hw/i386/pc.c | 1 +
hw/i386/x86.c | 49 ++-
include/hw/core/cpu.h | 2 +-
include/hw/i386/topology.h | 68 ++--
qemu-options.hx | 10 +-
system/cpus.c | 2 +-
target/i386/cpu.c | 290 ++++++++++++++----
target/i386/cpu.h | 44 ++-
target/i386/kvm/kvm.c | 2 +-
tests/unit/meson.build | 4 +-
.../{test-x86-cpuid.c => test-x86-topo.c} | 58 ++--
12 files changed, 403 insertions(+), 129 deletions(-)
rename tests/unit/{test-x86-cpuid.c => test-x86-topo.c} (73%)Signature · 1 line
2.34.1
PATCH v5 1/20 i386: Fix comment style in topology.h
From: Zhao Liu <[email protected]>
For function comments in this file, keep the comment style consistent with other files in the directory.
---
Changes since v3:
* Optimized the description in commit message: Change "with other places" to "with other files in the directory". (Babu)
--- include/hw/i386/topology.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
include/hw/i386/topology.h +17 -16
@@ -24,7 +24,8 @@#ifndef HW_I386_TOPOLOGY_H #define HW_I386_TOPOLOGY_H -/* This file implements the APIC-ID-based CPU topology enumeration logic, +/* +* This file implements the APIC-ID-based CPU topology enumeration logic, * documented at the following document: * Intel® 64 Architecture Processor Topology Enumeration * http://software.intel.com/en-us/articles/intel-64-architecture-processor-topology-enumeration/
@@ -41,7 +42,8 @@#include "qemu/bitops.h" -/* APIC IDs can be 32-bit, but beware: APIC IDs > 255 require x2APIC support +/* +* APIC IDs can be 32-bit, but beware: APIC IDs > 255 require x2APIC support */ typedef uint32_t apic_id_t ;
@@ -58,8 +60,7 @@ typedef struct X86CPUTopoInfo {unsigned threads_per_core; } X86CPUTopoInfo; -/* Return the bit width needed for 'count' IDs -*/ +/* Return the bit width needed for 'count' IDs */ static unsigned apicid_bitwidth_for_count (unsigned count) {g_assert (count >=1 );
@@ -67,15 +68,13 @@ static unsigned apicid_bitwidth_for_count(unsigned count)return count ?32 -clz32 (count) :0 ; } -/* Bit width of the SMT_ID (thread ID) field on the APIC ID -*/ +/* Bit width of the SMT_ID (thread ID) field on the APIC ID */ static inline unsigned apicid_smt_width (X86CPUTopoInfo *topo_info) {return apicid_bitwidth_for_count (topo_info->threads_per_core); } -/* Bit width of the Core_ID field -*/ +/* Bit width of the Core_ID field */ static inline unsigned apicid_core_width (X86CPUTopoInfo *topo_info) {return apicid_bitwidth_for_count (topo_info->cores_per_die);
@@ -87,8 +86,7 @@ static inline unsigned apicid_die_width(X86CPUTopoInfo *topo_info)return apicid_bitwidth_for_count (topo_info->dies_per_pkg); } -/* Bit offset of the Core_ID field -*/ +/* Bit offset of the Core_ID field */ static inline unsigned apicid_core_offset (X86CPUTopoInfo *topo_info) {return apicid_smt_width (topo_info);
@@ -100,14 +98,14 @@ static inline unsigned apicid_die_offset(X86CPUTopoInfo *topo_info)return apicid_core_offset (topo_info) +apicid_core_width (topo_info); } -/* Bit offset of the Pkg_ID (socket ID) field -*/ +/* Bit offset of the Pkg_ID (socket ID) field */ static inline unsigned apicid_pkg_offset (X86CPUTopoInfo *topo_info) {return apicid_die_offset (topo_info) +apicid_die_width (topo_info); } -/* Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID +/* +* Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID * * The caller must make sure core_id < nr_cores and smt_id < nr_threads. */
@@ -120,7 +118,8 @@ static inline apic_id_t x86_apicid_from_topo_ids(X86CPUTopoInfo *topo_info, topo_ids->smt_id; } -/* Calculate thread/core/package IDs for a specific topology, +/* +* Calculate thread/core/package IDs for a specific topology, * based on (contiguous) CPU index */ static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info,
@@ -137,7 +136,8 @@ static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info, topo_ids->smt_id = cpu_index % nr_threads; } -/* Calculate thread/core/package IDs for a specific topology, +/* +* Calculate thread/core/package IDs for a specific topology, * based on APIC ID */ static inline void x86_topo_ids_from_apicid(apic_id_t apicid,
@@ -155,7 +155,8 @@ static inline void x86_topo_ids_from_apicid(apic_id_t apicid, topo_ids->pkg_id = apicid >>apicid_pkg_offset (topo_info); } -/* Make APIC ID for the CPU 'cpu_index' +/* +* Make APIC ID for the CPU 'cpu_index' * * 'cpu_index' is a sequential, contiguous ID for the CPU. */
Signature · 1 line
2.34.1
PATCH v5 2/20 tests: Rename test-x86-cpuid.c to test-x86-topo.c
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
The tests in this file actually test the APIC ID combinations. Rename to test-x86-topo.c to make its name more in line with its actual content.
---
Changes since v3:
* Modify the description in commit message to emphasize this file tests APIC ID combinations. (Babu)
Changes since v1:
* Rename test-x86-apicid.c to test-x86-topo.c. (Yanan)
---
MAINTAINERS | 2 +-
tests/unit/meson.build | 4 ++--
tests/unit/{test-x86-cpuid.c => test-x86-topo.c} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename tests/unit/{test-x86-cpuid.c => test-x86-topo.c} (99%)MAINTAINERS +1 -1
@@ -1748,7 +1748,7 @@ F: include/hw/southbridge/ich9.h F: include/hw/southbridge/piix.h F: hw/isa/apm.c F: include/hw/isa/apm.h -F: tests/unit/test-x86-cpuid.c +F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c PC Chipset
tests/unit/meson.build +2 -2
@@ -21,8 +21,8 @@ tests = { 'test-opts-visitor': [testqapi], 'test-visitor-serialization': [testqapi], 'test-bitmap': [], - # all code tested by test-x86-cpuid is inside topology.h - 'test-x86-cpuid': [], + # all code tested by test-x86-topo is inside topology.h + 'test-x86-topo': [], 'test-cutils': [], 'test-div128': [], 'test-shift128': [],
tests/unit/test-x86-topo.c renamed from tests/unit/test-x86-cpuid.c +1 -1
@@ -1,5 +1,5 @@/* -* Test code for x86 CPUID and Topology functions +* Test code for x86 APIC ID and Topology functions * * Copyright (c) 2012 Red Hat Inc. *
Signature · 1 line
2.34.1
Re: [PATCH v5 02/20] tests: Rename test-x86-cpuid.c to test-x86-topo.c
Quoted 6 lines · Zhao Liu
From: Zhao Liu <[email protected]>
The tests in this file actually test the APIC ID combinations. Rename to
test-x86-topo.cto make its name more in line with its actual content.
Quoted 6 lines
Signed-off-by Zhao Liu <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Tested-by Babu Moger <[email protected]>Tested-by Yongwei Ma <[email protected]>---
Re: [PATCH v5 02/20] tests: Rename test-x86-cpuid.c to test-x86-topo.c
Quoted 12 lines · Thomas Huth
Date: Tue, 24 Oct 2023 11:09:34 +0200
From: Thomas Huth <[email protected]>
Subject: Re: [PATCH v5 02/20] tests: Renametest-x86-cpuid.cto
test-x86-topo.cQuoted 6 lines · Zhao Liu
From: Zhao Liu <[email protected]>
The tests in this file actually test the APIC ID combinations. Rename to
test-x86-topo.cto make its name more in line with its actual content.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Zhao Liu <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Tested-by Babu Moger <[email protected]>Tested-by Yongwei Ma <[email protected]>---
Reviewed-by Thomas Huth <[email protected]>
Thanks!
-Zhao
PATCH v5 3/20 softmmu: Fix CPUSTATE.nr_cores' calculation
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
From CPUState.nr_cores' comment, it represents "number of cores within this CPU package".
After 003f230e37d7 ("machine: Tweak the order of topology members in struct CpuTopology"), the meaning of smp.cores changed to "the number of cores in one die", but this commit missed to change CPUState.nr_cores' calculation, so that CPUState.nr_cores became wrong and now it misses to consider numbers of clusters and dies.
At present, only i386 is using CPUState.nr_cores.
But as for i386, which supports die level, the uses of CPUState.nr_cores are very confusing:
Early uses are based on the meaning of "cores per package" (before die is introduced into i386), and later uses are based on "cores per die" (after die's introduction).
This difference is due to that commit a94e1428991f ("target/i386: Add CPUID.1F generation support for multi-dies PCMachine") misunderstood that CPUState.nr_cores means "cores per die" when calculated CPUID.1FH.01H:EBX. After that, the changes in i386 all followed this wrong understanding.
With the influence of 003f230e37d7 and a94e1428991f, for i386 currently the result of CPUState.nr_cores is "cores per die", thus the original uses of CPUState.cores based on the meaning of "cores per package" are wrong when multiple dies exist:
1. In cpu_x86_cpuid() of target/i386/cpu.c, CPUID.01H:EBX[bits 23:16] is incorrect because it expects "cpus per package" but now the result is "cpus per die".
2. In cpu_x86_cpuid() of target/i386/cpu.c, for all leaves of CPUID.04H:
EAX[bits 31:26] is incorrect because they expect "cpus per package" but now the result is "cpus per die". The error not only impacts the EAX calculation in cache_info_passthrough case, but also impacts other cases of setting cache topology for Intel CPU according to cpu topology (specifically, the incoming parameter "num_cores" expects "cores per package" in encode_cache_cpuid4()).
3. In cpu_x86_cpuid() of target/i386/cpu.c, CPUID.0BH.01H:EBX[bits 15:00] is incorrect because the EBX of 0BH.01H (core level) expects "cpus per package", which may be different with 1FH.01H (The reason is 1FH can support more levels. For QEMU, 1FH also supports die, 1FH.01H:EBX[bits 15:00] expects "cpus per die").
4. In cpu_x86_cpuid() of target/i386/cpu.c, when CPUID.80000001H is calculated, here "cpus per package" is expected to be checked, but in fact, now it checks "cpus per die". Though "cpus per die" also works for this code logic, this isn't consistent with AMD's APM.
5. In cpu_x86_cpuid() of target/i386/cpu.c, CPUID.80000008H:ECX expects "cpus per package" but it obtains "cpus per die".
6. In simulate_rdmsr() of target/i386/hvf/x86_emu.c, in kvm_rdmsr_core_thread_count() of target/i386/kvm/kvm.c, and in helper_rdmsr() of target/i386/tcg/sysemu/misc_helper.c, MSR_CORE_THREAD_COUNT expects "cpus per package" and "cores per package", but in these functions, it obtains "cpus per die" and "cores per die".
On the other hand, these uses are correct now (they are added in/after a94e1428991f):
1. In cpu_x86_cpuid() of target/i386/cpu.c, topo_info.cores_per_die meets the actual meaning of CPUState.nr_cores ("cores per die").
2. In cpu_x86_cpuid() of target/i386/cpu.c, vcpus_per_socket (in CPUID. 04H's calculation) considers number of dies, so it's correct.
3. In cpu_x86_cpuid() of target/i386/cpu.c, CPUID.1FH.01H:EBX[bits 15:00] needs "cpus per die" and it gets the correct result, and CPUID.1FH.02H:EBX[bits 15:00] gets correct "cpus per package".
When CPUState.nr_cores is correctly changed to "cores per package" again , the above errors will be fixed without extra work, but the "currently" correct cases will go wrong and need special handling to pass correct "cpus/cores per die" they want.
Fix CPUState.nr_cores' calculation to fit the original meaning "cores per package", as well as changing calculation of topo_info.cores_per_die, vcpus_per_socket and CPUID.1FH.
---
Changes since v3:
* Describe changes in imperative mood. (Babu)
* Fix spelling typo. (Babu)
* Split the comment change into a separate patch. (Xiaoyao)
Changes since v2:
* Use wrapped helper to get cores per socket in qemu_init_vcpu().
Changes since v1:
* Add comment for nr_dies in CPUX86State. (Yanan)
--- system/cpus.c | 2 +- target/i386/cpu.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-)
system/cpus.c +1 -1
@@ -624,7 +624,7 @@ void qemu_init_vcpu(CPUState *cpu) {MachineState *ms =MACHINE (qdev_get_machine ()); - cpu->nr_cores = ms->smp.cores; + cpu->nr_cores =machine_topo_get_cores_per_socket (ms); cpu->nr_threads = ms->smp.threads; cpu->stopped = true; cpu->random_seed =qemu_guest_random_seed_thread_part1 ();
target/i386/cpu.c +4 -5
@@ -6019,7 +6019,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,X86CPUTopoInfo topo_info; topo_info.dies_per_pkg = env->nr_dies; - topo_info.cores_per_die = cs->nr_cores; + topo_info.cores_per_die = cs->nr_cores / env->nr_dies; topo_info.threads_per_core = cs->nr_threads;/* Calculate & apply limits for different index ranges */
@@ -6095,8 +6095,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,*/ if (*eax &31 ) {int host_vcpus_per_cache =1 + ((*eax &0x3FFC000 ) >>14 ); -int vcpus_per_socket = env->nr_dies * cs->nr_cores * - cs->nr_threads; +int vcpus_per_socket = cs->nr_cores * cs->nr_threads;if (cs->nr_cores >1 ) { *eax &= ~0xFC000000 ; *eax |= (pow2ceil (cs->nr_cores) -1 ) <<26 ;
@@ -6273,12 +6272,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,break ;case 1 : *eax =apicid_die_offset (&topo_info); - *ebx = cs->nr_cores * cs->nr_threads; + *ebx = topo_info.cores_per_die * topo_info.threads_per_core; *ecx |=CPUID_TOPOLOGY_LEVEL_CORE ;break ;case 2 : *eax =apicid_pkg_offset (&topo_info); - *ebx = env->nr_dies * cs->nr_cores * cs->nr_threads; + *ebx = cs->nr_cores * cs->nr_threads; *ecx |=CPUID_TOPOLOGY_LEVEL_DIE ;break ;default :
Signature · 1 line
2.34.1
PATCH v5 4/20 hw/cpu: Update the comments of nr_cores and nr_dies
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
In the nr_threads' comment, specify it represents the number of threads in the "core" to avoid confusion.
Also add comment for nr_dies in CPUX86State.
---
Changes since v3:
* The new patch split out of CPUSTATE.nr_cores' fix. (Xiaoyao)
--- include/hw/core/cpu.h | 2 +- target/i386/cpu.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
include/hw/core/cpu.h +1 -1
@@ -408,7 +408,7 @@ struct qemu_work_item;* See TranslationBlock::TCG CF_CLUSTER_MASK. * @tcg_cflags: Pre-computed cflags for this cpu. * @nr_cores: Number of cores within this CPU package. -* @nr_threads: Number of threads within this CPU. +* @nr_threads: Number of threads within this CPU core. * @running: #true if CPU is currently running (lockless). * @has_waiter: #true if a CPU is currently waiting for the cpu_exec_end; * valid under cpu_list_lock.
target/i386/cpu.h +1 -0
@@ -1882,6 +1882,7 @@ typedef struct CPUArchState {TPRAccess tpr_access_type; +/* Number of dies within this CPU package. */ unsigned nr_dies; } CPUX86State;
Signature · 1 line
2.34.1
PATCH v5 5/20 i386/cpu: Fix i/d-cache topology to core level for Intel CPU
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
For i-cache and d-cache, current QEMU hardcodes the maximum IDs for CPUs sharing cache (CPUID.04H.00H:EAX[bits 25:14] and CPUID.04H.01H:EAX[bits 25:14]) to 0, and this means i-cache and d-cache are shared in the SMT level.
This is correct if there's single thread per core, but is wrong for the hyper threading case (one core contains multiple threads) since the i-cache and d-cache are shared in the core level other than SMT level.
For AMD CPU, commit 8f4202fb1080 ("i386: Populate AMD Processor Cache Information for cpuid 0x8000001D") has already introduced i/d cache topology as core level by default.
Therefore, in order to be compatible with both multi-threaded and single-threaded situations, we should set i-cache and d-cache be shared at the core level by default.
This fix changes the default i/d cache topology from per-thread to per-core. Potentially, this change in L1 cache topology may affect the performance of the VM if the user does not specifically specify the topology or bind the vCPU. However, the way to achieve optimal performance should be to create a reasonable topology and set the appropriate vCPU affinity without relying on QEMU's default topology structure.
---
Changes since v3:
* Change the description of current i/d cache encoding status to avoid misleading to "architectural rules". (Xiaoyao)
Changes since v1:
* Split this fix from the patch named "i386/cpu: Fix number of addressable IDs in CPUID.04H".
* Add the explanation of the impact on performance. (Xiaoyao)
--- target/i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/i386/cpu.c +2 -2
@@ -6112,12 +6112,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,switch (count) {case 0 :/* L1 dcache info */ encode_cache_cpuid4 (env->cache_info_cpuid4.l1d_cache, -1 , cs->nr_cores, + cs->nr_threads, cs->nr_cores, eax, ebx, ecx, edx);break ;case 1 :/* L1 icache info */ encode_cache_cpuid4 (env->cache_info_cpuid4.l1i_cache, -1 , cs->nr_cores, + cs->nr_threads, cs->nr_cores, eax, ebx, ecx, edx);break ;case 2 :/* L2 cache info */
Signature · 1 line
2.34.1
PATCH v5 6/20 i386/cpu: Use APIC ID offset to encode cache topo in CPUID[4]
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
Refer to the fixes of cache_info_passthrough ([1], [2]) and SDM, the CPUID.04H:EAX[bits 25:14] and CPUID.04H:EAX[bits 31:26] should use the nearest power-of-2 integer.
The nearest power-of-2 integer can be calculated by pow2ceil() or by using APIC ID offset (like L3 topology using 1 << die_offset [3]).
But in fact, CPUID.04H:EAX[bits 25:14] and CPUID.04H:EAX[bits 31:26] are associated with APIC ID. For example, in linux kernel, the field "num_threads_sharing" (Bits 25 - 14) is parsed with APIC ID. And for another example, on Alder Lake P, the CPUID.04H:EAX[bits 31:26] is not matched with actual core numbers and it's calculated by:
"(1 << (pkg_offset - core_offset)) - 1".
Therefore the offset of APIC ID should be preferred to calculate nearest power-of-2 integer for CPUID.04H:EAX[bits 25:14] and CPUID.04H:EAX[bits 31:26]:
1. d/i cache is shared in a core, 1 << core_offset should be used instand of "cs->nr_threads" in encode_cache_cpuid4() for CPUID.04H.00H:EAX[bits 25:14] and CPUID.04H.01H:EAX[bits 25:14].
2. L2 cache is supposed to be shared in a core as for now, thereby 1 << core_offset should also be used instand of "cs->nr_threads" in encode_cache_cpuid4() for CPUID.04H.02H:EAX[bits 25:14].
3. Similarly, the value for CPUID.04H:EAX[bits 31:26] should also be calculated with the bit width between the Package and SMT levels in the APIC ID (1 << (pkg_offset - core_offset) - 1).
In addition, use APIC ID offset to replace "pow2ceil()" for cache_info_passthrough case.
[1]: efb3934adf9e ("x86: cpu: make sure number of addressable IDs for processor cores meets the spec") [2]: d7caf13b5fcf ("x86: cpu: fixup number of addressable IDs for logical processors sharing cache") [3]: d65af288a84d ("i386: Update new x86_apicid parsing rules with die_offset support")
---
Changes since v3:
* Fix compile warnings. (Babu)
* Fix spelling typo.
Changes since v1:
* Use APIC ID offset to replace "pow2ceil()" for cache_info_passthrough case. (Yanan)
* Split the L1 cache fix into a separate patch.
* Rename the title of this patch (the original is "i386/cpu: Fix number of addressable IDs in CPUID.04H").
--- target/i386/cpu.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
target/i386/cpu.c +23 -7
@@ -6013,7 +6013,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, {X86CPU *cpu =env_archcpu (env);CPUState *cs =env_cpu (env); -uint32_t die_offset;uint32_t limit;uint32_t signature[3 ];X86CPUTopoInfo topo_info;
@@ -6097,39 +6096,56 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,int host_vcpus_per_cache =1 + ((*eax &0x3FFC000 ) >>14 );int vcpus_per_socket = cs->nr_cores * cs->nr_threads;if (cs->nr_cores >1 ) { +int addressable_cores_offset = +apicid_pkg_offset (&topo_info) - +apicid_core_offset (&topo_info); + *eax &= ~0xFC000000 ; - *eax |= (pow2ceil (cs->nr_cores) -1 ) <<26 ; + *eax |= (1 << (addressable_cores_offset -1 )) <<26 ; }if (host_vcpus_per_cache > vcpus_per_socket) { +int pkg_offset =apicid_pkg_offset (&topo_info); + *eax &= ~0x3FFC000 ; - *eax |= (pow2ceil (vcpus_per_socket) -1 ) <<14 ; + *eax |= (1 << (pkg_offset -1 )) <<14 ; } } }else if (cpu->vendor_cpuid_only &&IS_AMD_CPU (env)) { *eax = *ebx = *ecx = *edx =0 ; }else { *eax =0 ; +int addressable_cores_offset =apicid_pkg_offset (&topo_info) - +apicid_core_offset (&topo_info); +int core_offset, die_offset; +switch (count) {case 0 :/* L1 dcache info */ + core_offset =apicid_core_offset (&topo_info);encode_cache_cpuid4 (env->cache_info_cpuid4.l1d_cache, - cs->nr_threads, cs->nr_cores, + (1 << core_offset), + (1 << addressable_cores_offset), eax, ebx, ecx, edx);break ;case 1 :/* L1 icache info */ + core_offset =apicid_core_offset (&topo_info);encode_cache_cpuid4 (env->cache_info_cpuid4.l1i_cache, - cs->nr_threads, cs->nr_cores, + (1 << core_offset), + (1 << addressable_cores_offset), eax, ebx, ecx, edx);break ;case 2 :/* L2 cache info */ + core_offset =apicid_core_offset (&topo_info);encode_cache_cpuid4 (env->cache_info_cpuid4.l2_cache, - cs->nr_threads, cs->nr_cores, + (1 << core_offset), + (1 << addressable_cores_offset), eax, ebx, ecx, edx);break ;case 3 :/* L3 cache info */ die_offset =apicid_die_offset (&topo_info);if (cpu->enable_l3_cache) {encode_cache_cpuid4 (env->cache_info_cpuid4.l3_cache, - (1 << die_offset), cs->nr_cores, + (1 << die_offset), + (1 << addressable_cores_offset), eax, ebx, ecx, edx);break ; }
Signature · 1 line
2.34.1
PATCH v5 7/20 i386/cpu: Consolidate the use of topo_info in cpu_x86_cpuid()
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
In cpu_x86_cpuid(), there are many variables in representing the cpu topology, e.g., topo_info, cs->nr_cores/cs->nr_threads.
Since the names of cs->nr_cores/cs->nr_threads does not accurately represent its meaning, the use of cs->nr_cores/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.
---
Changes since v3:
* Fix typo. (Babu)
Changes since v1:
* Extract cores_per_socket from the code block and use it as a local variable for cpu_x86_cpuid(). (Yanan)
* Remove vcpus_per_socket variable and use cpus_per_pkg directly. (Yanan)
* Replace env->dies with topo_info.dies_per_pkg in cpu_x86_cpuid().
--- target/i386/cpu.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
target/i386/cpu.c +18 -13
@@ -6016,11 +6016,16 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,uint32_t limit;uint32_t signature[3 ];X86CPUTopoInfo topo_info; +uint32_t cores_per_pkg; +uint32_t cpus_per_pkg; topo_info.dies_per_pkg = env->nr_dies; topo_info.cores_per_die = cs->nr_cores / env->nr_dies; topo_info.threads_per_core = cs->nr_threads; + cores_per_pkg = topo_info.cores_per_die * topo_info.dies_per_pkg; + cpus_per_pkg = cores_per_pkg * topo_info.threads_per_core; +/* Calculate & apply limits for different index ranges */ if (index >=0xC0000000 ) { limit = env->cpuid_xlevel2;
@@ -6056,8 +6061,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *ecx |=CPUID_EXT_OSXSAVE ; } *edx = env->features[FEAT_1_EDX ]; -if (cs->nr_cores * cs->nr_threads >1 ) { - *ebx |= (cs->nr_cores * cs->nr_threads) <<16 ; +if (cpus_per_pkg >1 ) { + *ebx |= cpus_per_pkg <<16 ; *edx |=CPUID_HT ; }if (!cpu->enable_pmu) {
@@ -6094,8 +6099,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,*/ if (*eax &31 ) {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 ) {int addressable_cores_offset =apicid_pkg_offset (&topo_info) -apicid_core_offset (&topo_info);
@@ -6103,7 +6108,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *eax &= ~0xFC000000 ; *eax |= (1 << (addressable_cores_offset -1 )) <<26 ; } -if (host_vcpus_per_cache > vcpus_per_socket) { +if (host_vcpus_per_cache > cpus_per_pkg) {int pkg_offset =apicid_pkg_offset (&topo_info); *eax &= ~0x3FFC000 ;
@@ -6248,12 +6253,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,switch (count) {case 0 : *eax =apicid_core_offset (&topo_info); - *ebx = cs->nr_threads; + *ebx = topo_info.threads_per_core; *ecx |=CPUID_TOPOLOGY_LEVEL_SMT ;break ;case 1 : *eax =apicid_pkg_offset (&topo_info); - *ebx = cs->nr_cores * cs->nr_threads; + *ebx = cpus_per_pkg; *ecx |=CPUID_TOPOLOGY_LEVEL_CORE ;break ;default :
@@ -6273,7 +6278,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,break ;case 0x1F :/* V2 Extended Topology Enumeration Leaf */ -if (env->nr_dies <2 ) { +if (topo_info.dies_per_pkg <2 ) { *eax = *ebx = *ecx = *edx =0 ;break ; }
@@ -6283,7 +6288,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,switch (count) {case 0 : *eax =apicid_core_offset (&topo_info); - *ebx = cs->nr_threads; + *ebx = topo_info.threads_per_core; *ecx |=CPUID_TOPOLOGY_LEVEL_SMT ;break ;case 1 :
@@ -6293,7 +6298,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,break ;case 2 : *eax =apicid_pkg_offset (&topo_info); - *ebx = cs->nr_cores * cs->nr_threads; + *ebx = cpus_per_pkg; *ecx |=CPUID_TOPOLOGY_LEVEL_DIE ;break ;default :
@@ -6517,7 +6522,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,* discards multiple thread information if it is set. * So don't set it here for Intel to make Linux guests happy. */ -if (cs->nr_cores * cs->nr_threads >1 ) { +if (cpus_per_pkg >1 ) {if (env->cpuid_vendor1 !=CPUID_VENDOR_INTEL_1 || env->cpuid_vendor2 !=CPUID_VENDOR_INTEL_2 || env->cpuid_vendor3 !=CPUID_VENDOR_INTEL_3 ) {
@@ -6583,7 +6588,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *eax |= (cpu_x86_virtual_addr_width (env) <<8 ); } *ebx = env->features[FEAT_8000_0008_EBX ]; -if (cs->nr_cores * cs->nr_threads >1 ) { +if (cpus_per_pkg >1 ) {/* * Bits 15:12 is "The number of bits in the initial * Core::X86::Apic::ApicId[ApicId] value that indicate
@@ -6591,7 +6596,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" */ *ecx = (apicid_pkg_offset (&topo_info) <<12 ) | - ((cs->nr_cores * cs->nr_threads) -1 ); + (cpus_per_pkg -1 ); }else { *ecx =0 ; }
Signature · 1 line
2.34.1
PATCH v5 8/20 i386: Split topology types of CPUID[0x1F] from the definitions of CPUID[0xB]
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
CPUID[0xB] defines SMT, Core and Invalid types, and this leaf is shared by Intel and AMD CPUs.
But for extended topology levels, Intel CPU (in CPUID[0x1F]) and AMD CPU (in CPUID[0x80000026]) have the different definitions with different enumeration values.
Though CPUID[0x80000026] hasn't been implemented in QEMU, to avoid possible misunderstanding, split topology types of CPUID[0x1F] from the definitions of CPUID[0xB] and introduce CPUID[0x1F]-specific topology types.
---
Changes since v3:
* New commit to prepare to refactor CPUID[0x1F] encoding.
--- target/i386/cpu.c | 14 +++++++------- target/i386/cpu.h | 13 +++++++++---- 2 files changed, 16 insertions(+), 11 deletions(-)
target/i386/cpu.c +7 -7
@@ -6254,17 +6254,17 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,case 0 : *eax =apicid_core_offset (&topo_info); *ebx = topo_info.threads_per_core; - *ecx |=CPUID_TOPOLOGY_LEVEL_SMT ; + *ecx |=CPUID_B_ECX_TOPO_LEVEL_SMT <<8 ;break ;case 1 : *eax =apicid_pkg_offset (&topo_info); *ebx = cpus_per_pkg; - *ecx |=CPUID_TOPOLOGY_LEVEL_CORE ; + *ecx |=CPUID_B_ECX_TOPO_LEVEL_CORE <<8 ;break ;default : *eax =0 ; *ebx =0 ; - *ecx |=CPUID_TOPOLOGY_LEVEL_INVALID ; + *ecx |=CPUID_B_ECX_TOPO_LEVEL_INVALID <<8 ; }assert (!(*eax & ~0x1f ));
@@ -6289,22 +6289,22 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,case 0 : *eax =apicid_core_offset (&topo_info); *ebx = topo_info.threads_per_core; - *ecx |=CPUID_TOPOLOGY_LEVEL_SMT ; + *ecx |=CPUID_1F_ECX_TOPO_LEVEL_SMT <<8 ;break ;case 1 : *eax =apicid_die_offset (&topo_info); *ebx = topo_info.cores_per_die * topo_info.threads_per_core; - *ecx |=CPUID_TOPOLOGY_LEVEL_CORE ; + *ecx |=CPUID_1F_ECX_TOPO_LEVEL_CORE <<8 ;break ;case 2 : *eax =apicid_pkg_offset (&topo_info); *ebx = cpus_per_pkg; - *ecx |=CPUID_TOPOLOGY_LEVEL_DIE ; + *ecx |=CPUID_1F_ECX_TOPO_LEVEL_DIE <<8 ;break ;default : *eax =0 ; *ebx =0 ; - *ecx |=CPUID_TOPOLOGY_LEVEL_INVALID ; + *ecx |=CPUID_1F_ECX_TOPO_LEVEL_INVALID <<8 ; }assert (!(*eax & ~0x1f )); *ebx &=0xffff ;/* The count doesn't need to be reliable. */
target/i386/cpu.h +9 -4
@@ -1009,10 +1009,15 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,#define CPUID_MWAIT_EMX (1U << 0)/* enumeration supported */ /* CPUID[0xB].ECX level types */ -#define CPUID_TOPOLOGY_LEVEL_INVALID (0U << 8) -#define CPUID_TOPOLOGY_LEVEL_SMT (1U << 8) -#define CPUID_TOPOLOGY_LEVEL_CORE (2U << 8) -#define CPUID_TOPOLOGY_LEVEL_DIE (5U << 8) +#define CPUID_B_ECX_TOPO_LEVEL_INVALID 0 +#define CPUID_B_ECX_TOPO_LEVEL_SMT 1 +#define CPUID_B_ECX_TOPO_LEVEL_CORE 2 + +/* COUID[0x1F].ECX level types */ +#define CPUID_1F_ECX_TOPO_LEVEL_INVALID CPUID_B_ECX_TOPO_LEVEL_INVALID +#define CPUID_1F_ECX_TOPO_LEVEL_SMT CPUID_B_ECX_TOPO_LEVEL_SMT +#define CPUID_1F_ECX_TOPO_LEVEL_CORE CPUID_B_ECX_TOPO_LEVEL_CORE +#define CPUID_1F_ECX_TOPO_LEVEL_DIE 5/* MSR Feature Bits */ #define MSR_ARCH_CAP_RDCL_NO (1U << 0)
Signature · 1 line
2.34.1
PATCH v5 9/20 i386: Decouple CPUID[0x1F] subleaf with specific topology level
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
At present, the subleaf 0x02 of CPUID[0x1F] is bound to the "die" level.
In fact, the specific topology level exposed in 0x1F depends on the platform's support for extension levels (module, tile and die).
To help expose "module" level in 0x1F, decouple CPUID[0x1F] subleaf with specific topology level.
---
Changes since v3:
* New patch to prepare to expose module level in 0x1F.
* Move the CPUTopoLevel enumeration definition from "i386: Add cache topology info in CPUCacheInfo" to this patch. Note, to align with topology types in SDM, revert the name of CPU_TOPO_LEVEL_UNKNOW to CPU_TOPO_LEVEL_INVALID.
--- target/i386/cpu.c | 136 +++++++++++++++++++++++++++++++++++++--------- target/i386/cpu.h | 15 +++++ 2 files changed, 126 insertions(+), 25 deletions(-)
target/i386/cpu.c +111 -25
@@ -269,6 +269,116 @@ static void encode_cache_cpuid4(CPUCacheInfo *cache, (cache->complex_indexing ?CACHE_COMPLEX_IDX :0 ); } +static uint32_t num_cpus_by_topo_level (X86CPUTopoInfo *topo_info, +enum CPUTopoLevel topo_level) +{ +switch (topo_level) { +case CPU_TOPO_LEVEL_SMT : +return 1 ; +case CPU_TOPO_LEVEL_CORE : +return topo_info->threads_per_core; +case CPU_TOPO_LEVEL_DIE : +return topo_info->threads_per_core * topo_info->cores_per_die; +case CPU_TOPO_LEVEL_PACKAGE : +return topo_info->threads_per_core * topo_info->cores_per_die * + topo_info->dies_per_pkg; +default : +g_assert_not_reached (); + } +return 0 ; +} + +static uint32_t apicid_offset_by_topo_level (X86CPUTopoInfo *topo_info, +enum CPUTopoLevel topo_level) +{ +switch (topo_level) { +case CPU_TOPO_LEVEL_SMT : +return 0 ; +case CPU_TOPO_LEVEL_CORE : +return apicid_core_offset (topo_info); +case CPU_TOPO_LEVEL_DIE : +return apicid_die_offset (topo_info); +case CPU_TOPO_LEVEL_PACKAGE : +return apicid_pkg_offset (topo_info); +default : +g_assert_not_reached (); + } +return 0 ; +} + +static uint32_t cpuid1f_topo_type (enum CPUTopoLevel topo_level) +{ +switch (topo_level) { +case CPU_TOPO_LEVEL_INVALID : +return CPUID_1F_ECX_TOPO_LEVEL_INVALID ; +case CPU_TOPO_LEVEL_SMT : +return CPUID_1F_ECX_TOPO_LEVEL_SMT ; +case CPU_TOPO_LEVEL_CORE : +return CPUID_1F_ECX_TOPO_LEVEL_CORE ; +case CPU_TOPO_LEVEL_DIE : +return CPUID_1F_ECX_TOPO_LEVEL_DIE ; +default : +/* Other types are not supported in QEMU. */ +g_assert_not_reached (); + } +return 0 ; +} + +static void encode_topo_cpuid1f (CPUX86State *env,uint32_t count, +X86CPUTopoInfo *topo_info, +uint32_t *eax,uint32_t *ebx, +uint32_t *ecx,uint32_t *edx) +{ + static DECLARE_BITMAP(topo_bitmap, CPU_TOPO_LEVEL_MAX); +X86CPU *cpu =env_archcpu (env); +unsigned long level, next_level; +uint32_t num_cpus_next_level, offset_next_level; + +/* +* Initialize the bitmap to decide which levels should be +* encoded in 0x1f. +*/ +if (!count) { +/* SMT and core levels are exposed in 0x1f leaf by default. */ +set_bit (CPU_TOPO_LEVEL_SMT , topo_bitmap); +set_bit (CPU_TOPO_LEVEL_CORE , topo_bitmap); + +if (env->nr_dies >1 ) { +set_bit (CPU_TOPO_LEVEL_DIE , topo_bitmap); + } + } + + *ecx = count &0xff ; + *edx = cpu->apic_id; + + level =find_first_bit (topo_bitmap,CPU_TOPO_LEVEL_MAX ); +if (level ==CPU_TOPO_LEVEL_MAX ) { + num_cpus_next_level =0 ; + offset_next_level =0 ; + +/* Encode CPU_TOPO_LEVEL_INVALID into the last subleaf of 0x1f. */ + level =CPU_TOPO_LEVEL_INVALID ; + }else { + next_level =find_next_bit (topo_bitmap,CPU_TOPO_LEVEL_MAX , level +1 ); +if (next_level ==CPU_TOPO_LEVEL_MAX ) { + next_level =CPU_TOPO_LEVEL_PACKAGE ; + } + + num_cpus_next_level =num_cpus_by_topo_level (topo_info, next_level); + offset_next_level =apicid_offset_by_topo_level (topo_info, next_level); + } + + *eax = offset_next_level; + *ebx = num_cpus_next_level; + *ecx |=cpuid1f_topo_type (level) <<8 ; + +assert (!(*eax & ~0x1f )); + *ebx &=0xffff ;/* The count doesn't need to be reliable. */ +if (level !=CPU_TOPO_LEVEL_MAX ) { +clear_bit (level, topo_bitmap); + } +} +/* Encode cache info for CPUID[0x80000005].ECX or CPUID[0x80000005].EDX */ static uint32_t encode_cache_cpuid80000005 (CPUCacheInfo *cache) {
@@ -6283,31 +6393,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,break ; } - *ecx = count &0xff ; - *edx = cpu->apic_id; -switch (count) { -case 0 : - *eax =apicid_core_offset (&topo_info); - *ebx = topo_info.threads_per_core; - *ecx |=CPUID_1F_ECX_TOPO_LEVEL_SMT <<8 ; -break ; -case 1 : - *eax =apicid_die_offset (&topo_info); - *ebx = topo_info.cores_per_die * topo_info.threads_per_core; - *ecx |=CPUID_1F_ECX_TOPO_LEVEL_CORE <<8 ; -break ; -case 2 : - *eax =apicid_pkg_offset (&topo_info); - *ebx = cpus_per_pkg; - *ecx |=CPUID_1F_ECX_TOPO_LEVEL_DIE <<8 ; -break ; -default : - *eax =0 ; - *ebx =0 ; - *ecx |=CPUID_1F_ECX_TOPO_LEVEL_INVALID <<8 ; - } -assert (!(*eax & ~0x1f )); - *ebx &=0xffff ;/* The count doesn't need to be reliable. */ +encode_topo_cpuid1f (env, count, &topo_info, eax, ebx, ecx, edx);break ;case 0xD : {/* Processor Extended State */
target/i386/cpu.h +15 -0
@@ -1008,6 +1008,21 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,#define CPUID_MWAIT_IBE (1U << 1)/* Interrupts can exit capability */ #define CPUID_MWAIT_EMX (1U << 0)/* enumeration supported */ +/* +* CPUTopoLevel is the general i386 topology hierarchical representation, +* ordered by increasing hierarchical relationship. +* Its enumeration value is not bound to the type value of Intel (CPUID[0x1F]) +* or AMD (CPUID[0x80000026]). +*/ +enum CPUTopoLevel { +CPU_TOPO_LEVEL_INVALID , +CPU_TOPO_LEVEL_SMT , +CPU_TOPO_LEVEL_CORE , +CPU_TOPO_LEVEL_DIE , +CPU_TOPO_LEVEL_PACKAGE , +CPU_TOPO_LEVEL_MAX , +}; +/* CPUID[0xB].ECX level types */ #define CPUID_B_ECX_TOPO_LEVEL_INVALID 0#define CPUID_B_ECX_TOPO_LEVEL_SMT 1
Signature · 1 line
2.34.1
PATCH v5 10/20 i386: Introduce module-level cpu topology to CPUX86State
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
smp command has the "clusters" parameter but x86 hasn't supported that level. "cluster" is a CPU topology level concept above cores, in which the cores may share some resources (L2 cache or some others like L3 cache tags, depending on the Archs) [1][2]. For x86, the resource shared by cores at the cluster level is mainly the L2 cache.
However, using cluster to define x86's L2 cache topology will cause the compatibility problem:
Currently, x86 defaults that the L2 cache is shared in one core, which actually implies a default setting "cores per L2 cache is 1" and therefore implicitly defaults to having as many L2 caches as cores.
For example (i386 PC machine):
-smp 16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 (*)
Considering the topology of the L2 cache, this (*) implicitly means "1 core per L2 cache" and "2 L2 caches per die".
If we use cluster to configure L2 cache topology with the new default setting "clusters per L2 cache is 1", the above semantics will change to "2 cores per cluster" and "1 cluster per L2 cache", that is, "2 cores per L2 cache".
So the same command (*) will cause changes in the L2 cache topology, further affecting the performance of the virtual machine.
Therefore, x86 should only treat cluster as a cpu topology level and avoid using it to change L2 cache by default for compatibility.
"cluster" in smp is the CPU topology level which is between "core" and die.
For x86, the "cluster" in smp is corresponding to the module level [2], which is above the core level. So use the "module" other than "cluster" in i386 code.
And please note that x86 already has a cpu topology level also named "cluster" [3], this level is at the upper level of the package. Here, the cluster in x86 cpu topology is completely different from the "clusters" as the smp parameter. After the module level is introduced, the cluster as the smp parameter will actually refer to the module level of x86.
[1]: 864c3b5c32f0 ("hw/core/machine: Introduce CPU cluster topology support") [2]: Yanan's comment about "cluster",
https://lists.gnu.org/archive/html/qemu-devel/2023-02/msg04051.html
[3]: SDM, vol.3, ch.9, 9.9.1 Hierarchical Mapping of Shared Resources.
---
Changes since v1:
* The background of the introduction of the "cluster" parameter and its exact meaning were revised according to Yanan's explanation. (Yanan)
--- hw/i386/x86.c | 1 + target/i386/cpu.c | 1 + target/i386/cpu.h | 5 +++++ 3 files changed, 7 insertions(+)
hw/i386/x86.c +1 -0
@@ -306,6 +306,7 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,init_topo_info (&topo_info, x86ms); env->nr_dies = ms->smp.dies; + env->nr_modules = ms->smp.clusters;/* * If APIC ID is not set,
target/i386/cpu.c +1 -0
@@ -7698,6 +7698,7 @@ static void x86_cpu_initfn(Object *obj)CPUX86State *env = &cpu->env; env->nr_dies =1 ; + env->nr_modules =1 ; object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words,
target/i386/cpu.h +5 -0
@@ -1904,6 +1904,11 @@ typedef struct CPUArchState {/* Number of dies within this CPU package. */ unsigned nr_dies; +/* +* Number of modules within this CPU package. +* Module level in x86 cpu topology is corresponding to smp.clusters. +*/ +unsigned nr_modules; } CPUX86State;struct kvm_msrs ;
Signature · 1 line
2.34.1
PATCH v5 11/20 i386: Support modules_per_die in X86CPUTopoInfo
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
Support module level in i386 cpu topology structure "X86CPUTopoInfo".
Since x86 does not yet support the "clusters" parameter in "-smp", X86CPUTopoInfo.modules_per_die is currently always 1. Therefore, the module level width in APIC ID, which can be calculated by "apicid_bitwidth_for_count(topo_info->modules_per_die)", is always 0 for now, so we can directly add APIC ID related helpers to support module level parsing.
In addition, update topology structure in test-x86-topo.c.
---
Changes since v3:
* Drop the description about not exposing module level in commit message.
* Update topology related calculation in newly added helpers:
num_cpus_by_topo_level() and apicid_offset_by_topo_level().
* Since the code change, drop the "Acked-by" tag.
Changes since v1:
* Include module level related helpers (apicid_module_width() and apicid_module_offset()) in this patch. (Yanan)
--- hw/i386/x86.c | 3 ++- include/hw/i386/topology.h | 22 +++++++++++++++---- target/i386/cpu.c | 17 +++++++++----- tests/unit/test-x86-topo.c | 45 ++++++++++++++++++++------------------ 4 files changed, 55 insertions(+), 32 deletions(-)
hw/i386/x86.c +2 -1
@@ -72,7 +72,8 @@ static void init_topo_info(X86CPUTopoInfo *topo_info,MachineState *ms =MACHINE (x86ms); topo_info->dies_per_pkg = ms->smp.dies; - topo_info->cores_per_die = ms->smp.cores; + topo_info->modules_per_die = ms->smp.clusters; + topo_info->cores_per_module = ms->smp.cores; topo_info->threads_per_core = ms->smp.threads; }
include/hw/i386/topology.h +18 -4
@@ -56,7 +56,8 @@ typedef struct X86CPUTopoIDs {typedef struct X86CPUTopoInfo {unsigned dies_per_pkg; -unsigned cores_per_die; +unsigned modules_per_die; +unsigned cores_per_module;unsigned threads_per_core; }X86CPUTopoInfo ;
@@ -77,7 +78,13 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)/* Bit width of the Core_ID field */ static inline unsigned apicid_core_width (X86CPUTopoInfo *topo_info) { -return apicid_bitwidth_for_count (topo_info->cores_per_die); +return apicid_bitwidth_for_count (topo_info->cores_per_module); +} + +/* Bit width of the Module_ID (cluster ID) field */ +static inline unsigned apicid_module_width (X86CPUTopoInfo *topo_info) +{ +return apicid_bitwidth_for_count (topo_info->modules_per_die); }/* Bit width of the Die_ID field */
@@ -92,10 +99,16 @@ static inline unsigned apicid_core_offset(X86CPUTopoInfo *topo_info)return apicid_smt_width (topo_info); } +/* Bit offset of the Module_ID (cluster ID) field */ +static inline unsigned apicid_module_offset (X86CPUTopoInfo *topo_info) +{ +return apicid_core_offset (topo_info) +apicid_core_width (topo_info); +} +/* Bit offset of the Die_ID field */ static inline unsigned apicid_die_offset (X86CPUTopoInfo *topo_info) { -return apicid_core_offset (topo_info) +apicid_core_width (topo_info); +return apicid_module_offset (topo_info) +apicid_module_width (topo_info); }/* Bit offset of the Pkg_ID (socket ID) field */
@@ -127,7 +140,8 @@ static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info, X86CPUTopoIDs *topo_ids) {unsigned nr_dies = topo_info->dies_per_pkg; -unsigned nr_cores = topo_info->cores_per_die; +unsigned nr_cores = topo_info->cores_per_module * + topo_info->modules_per_die;unsigned nr_threads = topo_info->threads_per_core; topo_ids->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads);
target/i386/cpu.c +11 -6
@@ -278,10 +278,11 @@ static uint32_t num_cpus_by_topo_level(X86CPUTopoInfo *topo_info,case CPU_TOPO_LEVEL_CORE :return topo_info->threads_per_core;case CPU_TOPO_LEVEL_DIE : -return topo_info->threads_per_core * topo_info->cores_per_die; +return topo_info->threads_per_core * topo_info->cores_per_module * + topo_info->modules_per_die;case CPU_TOPO_LEVEL_PACKAGE : -return topo_info->threads_per_core * topo_info->cores_per_die * - topo_info->dies_per_pkg; +return topo_info->threads_per_core * topo_info->cores_per_module * + topo_info->modules_per_die * topo_info->dies_per_pkg;default :g_assert_not_reached (); }
@@ -450,7 +451,9 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *cache,/* L3 is shared among multiple cores */ if (cache->level ==3 ) { - l3_threads = topo_info->cores_per_die * topo_info->threads_per_core; + l3_threads = topo_info->modules_per_die * + topo_info->cores_per_module * + topo_info->threads_per_core; *eax |= (l3_threads -1 ) <<14 ; }else { *eax |= ((topo_info->threads_per_core -1 ) <<14 );
@@ -6130,10 +6133,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,uint32_t cpus_per_pkg; topo_info.dies_per_pkg = env->nr_dies; - topo_info.cores_per_die = cs->nr_cores / env->nr_dies; + topo_info.modules_per_die = env->nr_modules; + topo_info.cores_per_module = cs->nr_cores / env->nr_dies / env->nr_modules; topo_info.threads_per_core = cs->nr_threads; - cores_per_pkg = topo_info.cores_per_die * topo_info.dies_per_pkg; + cores_per_pkg = topo_info.cores_per_module * topo_info.modules_per_die * + topo_info.dies_per_pkg; cpus_per_pkg = cores_per_pkg * topo_info.threads_per_core;/* Calculate & apply limits for different index ranges */
tests/unit/test-x86-topo.c +24 -21
94 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 12/20 i386: Expose module level in CPUID[0x1F]
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
Linux kernel (from v6.4, with commit edc0a2b595765 ("x86/topology: Fix erroneous smp_num_siblings on Intel Hybrid platforms") is able to handle platforms with Module level enumerated via CPUID.1F.
Expose the module level in CPUID[0x1F] if the machine has more than 1 modules.
(Tested CPU topology in CPUID[0x1F] leaf with various die/cluster configurations in "-smp".)
---
Changes since v3:
* New patch to expose module level in 0x1F.
* Add Tested-by tag from Yongwei.
--- target/i386/cpu.c | 12 +++++++++++- target/i386/cpu.h | 2 ++ target/i386/kvm/kvm.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-)
target/i386/cpu.c +11 -1
@@ -277,6 +277,8 @@ static uint32_t num_cpus_by_topo_level(X86CPUTopoInfo *topo_info,return 1 ;case CPU_TOPO_LEVEL_CORE :return topo_info->threads_per_core; +case CPU_TOPO_LEVEL_MODULE : +return topo_info->threads_per_core * topo_info->cores_per_module;case CPU_TOPO_LEVEL_DIE :return topo_info->threads_per_core * topo_info->cores_per_module * topo_info->modules_per_die;
@@ -297,6 +299,8 @@ static uint32_t apicid_offset_by_topo_level(X86CPUTopoInfo *topo_info,return 0 ;case CPU_TOPO_LEVEL_CORE :return apicid_core_offset (topo_info); +case CPU_TOPO_LEVEL_MODULE : +return apicid_module_offset (topo_info);case CPU_TOPO_LEVEL_DIE :return apicid_die_offset (topo_info);case CPU_TOPO_LEVEL_PACKAGE :
@@ -316,6 +320,8 @@ static uint32_t cpuid1f_topo_type(enum CPUTopoLevel topo_level)return CPUID_1F_ECX_TOPO_LEVEL_SMT ;case CPU_TOPO_LEVEL_CORE :return CPUID_1F_ECX_TOPO_LEVEL_CORE ; +case CPU_TOPO_LEVEL_MODULE : +return CPUID_1F_ECX_TOPO_LEVEL_MODULE ;case CPU_TOPO_LEVEL_DIE :return CPUID_1F_ECX_TOPO_LEVEL_DIE ;default :
@@ -347,6 +353,10 @@ static void encode_topo_cpuid1f(CPUX86State *env, uint32_t count,if (env->nr_dies >1 ) {set_bit (CPU_TOPO_LEVEL_DIE , topo_bitmap); } + +if (env->nr_modules >1 ) { +set_bit (CPU_TOPO_LEVEL_MODULE , topo_bitmap); + } } *ecx = count &0xff ;
@@ -6393,7 +6403,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,break ;case 0x1F :/* V2 Extended Topology Enumeration Leaf */ -if (topo_info.dies_per_pkg <2 ) { +if (topo_info.modules_per_die <2 && topo_info.dies_per_pkg <2 ) { *eax = *ebx = *ecx = *edx =0 ;break ; }
target/i386/cpu.h +2 -0
@@ -1018,6 +1018,7 @@ enum CPUTopoLevel {CPU_TOPO_LEVEL_INVALID ,CPU_TOPO_LEVEL_SMT ,CPU_TOPO_LEVEL_CORE , +CPU_TOPO_LEVEL_MODULE ,CPU_TOPO_LEVEL_DIE ,CPU_TOPO_LEVEL_PACKAGE , CPU_TOPO_LEVEL_MAX,
@@ -1032,6 +1033,7 @@ enum CPUTopoLevel {#define CPUID_1F_ECX_TOPO_LEVEL_INVALID CPUID_B_ECX_TOPO_LEVEL_INVALID#define CPUID_1F_ECX_TOPO_LEVEL_SMT CPUID_B_ECX_TOPO_LEVEL_SMT#define CPUID_1F_ECX_TOPO_LEVEL_CORE CPUID_B_ECX_TOPO_LEVEL_CORE +#define CPUID_1F_ECX_TOPO_LEVEL_MODULE 3#define CPUID_1F_ECX_TOPO_LEVEL_DIE 5/* MSR Feature Bits */
target/i386/kvm/kvm.c +1 -1
@@ -1961,7 +1961,7 @@ int kvm_arch_init_vcpu(CPUState *cs)break ; }case 0x1f : -if (env->nr_dies <2 ) { +if (env->nr_modules <2 && env->nr_dies <2 ) {break ; }/* fallthrough */
Signature · 1 line
2.34.1
PATCH v5 13/20 i386: Support module_id in X86CPUTopoIDs
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
Add module_id member in X86CPUTopoIDs.
module_id can be parsed from APIC ID, so also update APIC ID parsing rule to support module level. With this support, the conversions with module level between X86CPUTopoIDs, X86CPUTopoInfo and APIC ID are completed.
module_id can be also generated from cpu topology, and before i386 supports "clusters" in smp, the default "clusters per die" is only 1, thus the module_id generated in this way is 0, so that it will not conflict with the module_id generated by APIC ID.
---
Changes since v1:
* Merge the patch "i386: Update APIC ID parsing rule to support module level" into this one. (Yanan)
* Move the apicid_module_width() and apicid_module_offset() support into the previous modules_per_die related patch. (Yanan)
--- hw/i386/x86.c | 28 +++++++++++++++++++++------- include/hw/i386/topology.h | 17 +++++++++++++---- 2 files changed, 34 insertions(+), 11 deletions(-)
hw/i386/x86.c +21 -7
@@ -311,11 +311,11 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,/* * If APIC ID is not set, -* set it based on socket/die/core/thread properties. +* set it based on socket/die/cluster/core/thread properties. */ if (cpu->apic_id ==UNASSIGNED_APIC_ID ) { -int max_socket = (ms->smp.max_cpus -1 ) / - smp_threads / smp_cores / ms->smp.dies; +int max_socket = (ms->smp.max_cpus -1 ) / smp_threads / smp_cores / + ms->smp.clusters / ms->smp.dies;/* * die-id was optional in QEMU 4.0 and older, so keep it optional
@@ -362,17 +362,27 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, topo_ids.die_id = cpu->die_id; topo_ids.core_id = cpu->core_id; topo_ids.smt_id = cpu->thread_id; + +/* +* TODO: This is the temporary initialization for topo_ids.module_id to +* avoid "maybe-uninitialized" compilation errors. Will remove when +* X86CPU supports cluster_id. +*/ + topo_ids.module_id =0 ; + cpu->apic_id =x86_apicid_from_topo_ids (&topo_info, &topo_ids); } cpu_slot =x86_find_cpu_slot (MACHINE (x86ms), cpu->apic_id, &idx);if (!cpu_slot) {x86_topo_ids_from_apicid (cpu->apic_id, &topo_info, &topo_ids); +error_setg (errp, -"Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with" -" APIC ID %" PRIu32", valid index range 0:%d" , - topo_ids.pkg_id, topo_ids.die_id, topo_ids.core_id, topo_ids.smt_id, - cpu->apic_id, ms->possible_cpus->len -1 ); +"Invalid CPU [socket: %u, die: %u, module: %u, core: %u, thread: %u]" +" with APIC ID %" PRIu32", valid index range 0:%d" , + topo_ids.pkg_id, topo_ids.die_id, topo_ids.module_id, + topo_ids.core_id, topo_ids.smt_id, cpu->apic_id, + ms->possible_cpus->len -1 );return ; }
@@ -493,6 +503,10 @@ const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms) ms->possible_cpus->cpus[i].props.has_die_id = true; ms->possible_cpus->cpus[i].props.die_id = topo_ids.die_id; } +if (ms->smp.clusters >1 ) { + ms->possible_cpus->cpus[i].props.has_cluster_id = true; + ms->possible_cpus->cpus[i].props.cluster_id = topo_ids.module_id; + } ms->possible_cpus->cpus[i].props.has_core_id = true; ms->possible_cpus->cpus[i].props.core_id = topo_ids.core_id; ms->possible_cpus->cpus[i].props.has_thread_id = true;
include/hw/i386/topology.h +13 -4
@@ -50,6 +50,7 @@ typedef uint32_t apic_id_t;typedef struct X86CPUTopoIDs {unsigned pkg_id;unsigned die_id; +unsigned module_id;unsigned core_id;unsigned smt_id; }X86CPUTopoIDs ;
@@ -127,6 +128,7 @@ static inline apic_id_t x86_apicid_from_topo_ids(X86CPUTopoInfo *topo_info, {return (topo_ids->pkg_id <<apicid_pkg_offset (topo_info)) | (topo_ids->die_id <<apicid_die_offset (topo_info)) | + (topo_ids->module_id <<apicid_module_offset (topo_info)) | (topo_ids->core_id <<apicid_core_offset (topo_info)) | topo_ids->smt_id; }
@@ -140,12 +142,16 @@ static inline void x86_topo_ids_from_idx(X86CPUTopoInfo *topo_info, X86CPUTopoIDs *topo_ids) {unsigned nr_dies = topo_info->dies_per_pkg; -unsigned nr_cores = topo_info->cores_per_module * - topo_info->modules_per_die; +unsigned nr_modules = topo_info->modules_per_die; +unsigned nr_cores = topo_info->cores_per_module;unsigned nr_threads = topo_info->threads_per_core; - topo_ids->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads); - topo_ids->die_id = cpu_index / (nr_cores * nr_threads) % nr_dies; + topo_ids->pkg_id = cpu_index / (nr_dies * nr_modules * + nr_cores * nr_threads); + topo_ids->die_id = cpu_index / (nr_modules * nr_cores * + nr_threads) % nr_dies; + topo_ids->module_id = cpu_index / (nr_cores * nr_threads) % + nr_modules; topo_ids->core_id = cpu_index / nr_threads % nr_cores; topo_ids->smt_id = cpu_index % nr_threads; }
@@ -163,6 +169,9 @@ static inline void x86_topo_ids_from_apicid(apic_id_t apicid, topo_ids->core_id = (apicid >>apicid_core_offset (topo_info)) & ~(0xFFFFFFFFUL <<apicid_core_width (topo_info)); + topo_ids->module_id = + (apicid >>apicid_module_offset (topo_info)) & + ~(0xFFFFFFFFUL <<apicid_module_width (topo_info)); topo_ids->die_id = (apicid >>apicid_die_offset (topo_info)) & ~(0xFFFFFFFFUL <<apicid_die_width (topo_info));
Signature · 1 line
2.34.1
PATCH v5 14/20 i386/cpu: Introduce cluster-id to X86CPU
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
Introduce cluster-id other than module-id to be consistent with CpuInstanceProperties.cluster-id, and this avoids the confusion of parameter names when hotplugging.
Following the legacy smp check rules, also add the cluster_id validity into x86_cpu_pre_plug().
---
Changes since v3:
* Use the imperative in the commit message. (Babu)
--- hw/i386/x86.c | 33 +++++++++++++++++++++++++-------- target/i386/cpu.c | 2 ++ target/i386/cpu.h | 1 + 3 files changed, 28 insertions(+), 8 deletions(-)
hw/i386/x86.c +25 -8
@@ -325,6 +325,14 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, cpu->die_id =0 ; } +/* +* cluster-id was optional in QEMU 8.0 and older, so keep it optional +* if there's only one cluster per die. +*/ +if (cpu->cluster_id <0 && ms->smp.clusters ==1 ) { + cpu->cluster_id =0 ; + } +if (cpu->socket_id <0 ) {error_setg (errp,"CPU socket-id is not set" );return ;
@@ -341,6 +349,14 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, cpu->die_id, ms->smp.dies - 1);return ; } +if (cpu->cluster_id <0 ) { +error_setg (errp,"CPU cluster-id is not set" ); +return ; + }else if (cpu->cluster_id > ms->smp.clusters -1 ) { +error_setg (errp,"Invalid CPU cluster-id: %u must be in range 0:%u" , + cpu->cluster_id, ms->smp.clusters -1 ); +return ; + }if (cpu->core_id <0 ) {error_setg (errp,"CPU core-id is not set" );return ;
@@ -360,16 +376,9 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, topo_ids.pkg_id = cpu->socket_id; topo_ids.die_id = cpu->die_id; + topo_ids.module_id = cpu->cluster_id; topo_ids.core_id = cpu->core_id; topo_ids.smt_id = cpu->thread_id; - -/* -* TODO: This is the temporary initialization for topo_ids.module_id to -* avoid "maybe-uninitialized" compilation errors. Will remove when -* X86CPU supports cluster_id. -*/ - topo_ids.module_id =0 ; - cpu->apic_id =x86_apicid_from_topo_ids (&topo_info, &topo_ids); }
@@ -414,6 +423,14 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, } cpu->die_id = topo_ids.die_id; +if (cpu->cluster_id !=-1 && cpu->cluster_id != topo_ids.module_id) { +error_setg (errp,"property cluster-id: %u doesn't match set apic-id:" +" 0x%x (cluster-id: %u)" , cpu->cluster_id, cpu->apic_id, + topo_ids.module_id); +return ; + } + cpu->cluster_id = topo_ids.module_id; +if (cpu->core_id !=-1 && cpu->core_id != topo_ids.core_id) { error_setg(errp, "property core-id: %u doesn't match set apic-id:" " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id,
target/i386/cpu.c +2 -0
@@ -7908,12 +7908,14 @@ static Property x86_cpu_properties[] = {DEFINE_PROP_UINT32 ("apic-id" ,X86CPU , apic_id,0 ),DEFINE_PROP_INT32 ("thread-id" ,X86CPU , thread_id,0 ),DEFINE_PROP_INT32 ("core-id" ,X86CPU , core_id,0 ), +DEFINE_PROP_INT32 ("cluster-id" ,X86CPU , cluster_id,0 ),DEFINE_PROP_INT32 ("die-id" ,X86CPU , die_id,0 ),DEFINE_PROP_INT32 ("socket-id" ,X86CPU , socket_id,0 ), #elseDEFINE_PROP_UINT32 ("apic-id" ,X86CPU , apic_id,UNASSIGNED_APIC_ID ),DEFINE_PROP_INT32 ("thread-id" ,X86CPU , thread_id,-1 ),DEFINE_PROP_INT32 ("core-id" ,X86CPU , core_id,-1 ), +DEFINE_PROP_INT32 ("cluster-id" ,X86CPU , cluster_id,-1 ),DEFINE_PROP_INT32 ("die-id" ,X86CPU , die_id,-1 ), DEFINE_PROP_INT32("socket-id", X86CPU, socket_id, -1), #endif
target/i386/cpu.h +1 -0
@@ -2059,6 +2059,7 @@ struct ArchCPU {int32_t node_id;/* NUMA node this CPU belongs to */ int32_t socket_id;int32_t die_id; +int32_t cluster_id;int32_t core_id;int32_t thread_id;
Signature · 1 line
2.34.1
PATCH v5 15/20 tests: Add test case of APIC ID for module level parsing
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
After i386 supports module level, it's time to add the test for module level's parsing.
--- tests/unit/test-x86-topo.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
tests/unit/test-x86-topo.c +15 -4
@@ -37,6 +37,7 @@ static void test_topo_bits(void) topo_info = (X86CPUTopoInfo ) {1 ,1 ,1 ,1 }; g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 0); g_assert_cmpuint(apicid_core_width(&topo_info), ==, 0); + g_assert_cmpuint(apicid_module_width(&topo_info), ==, 0); g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0); topo_info = (X86CPUTopoInfo ) {1 ,1 ,1 ,1 };
@@ -74,13 +75,22 @@ static void test_topo_bits(void) topo_info = (X86CPUTopoInfo ) {1 ,1 ,33 ,2 }; g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6); - topo_info = (X86CPUTopoInfo ) {1 ,1 ,30 ,2 }; + topo_info = (X86CPUTopoInfo ) {1 ,6 ,30 ,2 }; + g_assert_cmpuint(apicid_module_width(&topo_info), ==, 3); + topo_info = (X86CPUTopoInfo ) {1 ,7 ,30 ,2 }; + g_assert_cmpuint(apicid_module_width(&topo_info), ==, 3); + topo_info = (X86CPUTopoInfo ) {1 ,8 ,30 ,2 }; + g_assert_cmpuint(apicid_module_width(&topo_info), ==, 3); + topo_info = (X86CPUTopoInfo ) {1 ,9 ,30 ,2 }; + g_assert_cmpuint(apicid_module_width(&topo_info), ==, 4); + + topo_info = (X86CPUTopoInfo ) {1 ,6 ,30 ,2 }; g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0); - topo_info = (X86CPUTopoInfo ) {2 ,1 ,30 ,2 }; + topo_info = (X86CPUTopoInfo ) {2 ,6 ,30 ,2 }; g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1); - topo_info = (X86CPUTopoInfo ) {3 ,1 ,30 ,2 }; + topo_info = (X86CPUTopoInfo ) {3 ,6 ,30 ,2 }; g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2); - topo_info = (X86CPUTopoInfo ) {4 ,1 ,30 ,2 }; + topo_info = (X86CPUTopoInfo ) {4 ,6 ,30 ,2 }; g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);/* build a weird topology and see if IDs are calculated correctly
@@ -91,6 +101,7 @@ static void test_topo_bits(void) topo_info = (X86CPUTopoInfo ) {1 ,1 ,6 ,3 }; g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2); g_assert_cmpuint(apicid_core_offset(&topo_info), ==, 2); + g_assert_cmpuint(apicid_module_offset(&topo_info), ==, 5); g_assert_cmpuint(apicid_die_offset(&topo_info), ==, 5); g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
Signature · 1 line
2.34.1
PATCH v5 16/20 hw/i386/pc: Support smp.clusters for x86 PC machine
In reply to Zhao LiuFrom: Zhuocheng Ding <[email protected]>
As module-level topology support is added to X86CPU, now we can enable the support for the cluster parameter on PC machines. With this support, we can define a 5-level x86 CPU topology with "-smp":
-smp cpus=*,maxcpus=*,sockets=*,dies=*,clusters=*,cores=*,threads=*.
Additionally, add the 5-level topology example in description of "-smp".
--- hw/i386/pc.c | 1 + qemu-options.hx | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-)
hw/i386/pc.c +1 -0
@@ -1822,6 +1822,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; mc->nvdimm_supported = true; mc->smp_props.dies_supported = true; + mc->smp_props.clusters_supported = true; mc->default_ram_id ="pc.ram" ; pcmc->default_smbios_ep_type =SMBIOS_ENTRY_POINT_TYPE_64 ;
qemu-options.hx +5 -5
@@ -337,14 +337,14 @@ SRST -smp 8,sockets=2,cores=2,threads=2,maxcpus=8 The following sub-option defines a CPU topology hierarchy (2 sockets - totally on the machine, 2 dies per socket, 2 cores per die, 2 threads - per core) for PC machines which support sockets/dies/cores/threads. - Some members of the option can be omitted but their values will be - automatically computed: + totally on the machine, 2 dies per socket, 2 clusters per die, 2 cores per + cluster, 2 threads per core) for PC machines which support sockets/dies + /clusters/cores/threads. Some members of the option can be omitted but + their values will be automatically computed: :: - -smp 16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 + -smp 32,sockets=2,dies=2,clusters=2,cores=2,threads=2,maxcpus=32 The following sub-option defines a CPU topology hierarchy (2 sockets totally on the machine, 2 clusters per socket, 2 cores per cluster,
Signature · 1 line
2.34.1
PATCH v5 17/20 i386: Add cache topology info in CPUCacheInfo
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
Currently, by default, the cache topology is encoded as:
1. i/d cache is shared in one core.
2. L2 cache is shared in one core.
3. L3 cache is shared in one die.
This default general setting has caused a misunderstanding, that is, the cache topology is completely equated with a specific cpu topology, such as the connection between L2 cache and core level, and the connection between L3 cache and die level.
In fact, the settings of these topologies depend on the specific platform and are not static. For example, on Alder Lake-P, every four Atom cores share the same L2 cache.
Thus, we should explicitly define the corresponding cache topology for different cache models to increase scalability.
Except legacy_l2_cache_cpuid2 (its default topo level is CPU_TOPO_LEVEL_UNKNOW), explicitly set the corresponding topology level for all other cache models. In order to be compatible with the existing cache topology, set the CPU_TOPO_LEVEL_CORE level for the i/d cache, set the CPU_TOPO_LEVEL_CORE level for L2 cache, and set the CPU_TOPO_LEVEL_DIE level for L3 cache.
The field for CPUID[4].EAX[bits 25:14] or CPUID[0x8000001D].EAX[bits 25:14] will be set based on CPUCacheInfo.share_level.
---
Changes since v3:
* Fix cache topology uninitialization bugs for some AMD CPUs. (Babu)
* Move the CPUTopoLevel enumeration definition to the previous 0x1f rework patch.
Changes since v1:
* Add the prefix "CPU_TOPO_LEVEL_*" for CPU topology level names. (Yanan)
* (Revert, pls refer "i386: Decouple CPUID[0x1F] subleaf with specific topology level") Rename the "INVALID" level to CPU_TOPO_LEVEL_UNKNOW. (Yanan)
--- target/i386/cpu.c | 36 ++++++++++++++++++++++++++++++++++++ target/i386/cpu.h | 7 +++++++ 2 files changed, 43 insertions(+)
target/i386/cpu.c +36 -0
@@ -558,6 +558,7 @@ static CPUCacheInfo legacy_l1d_cache = { .sets = 64, .partitions = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, };/*FIXME: CPUID leaf 0x80000005 is inconsistent with leaves 2 & 4 */
@@ -572,6 +573,7 @@ static CPUCacheInfo legacy_l1d_cache_amd = { .partitions = 1, .lines_per_tag = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, };/* L1 instruction cache: */
@@ -585,6 +587,7 @@ static CPUCacheInfo legacy_l1i_cache = { .sets = 64, .partitions = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, };/*FIXME: CPUID leaf 0x80000005 is inconsistent with leaves 2 & 4 */
@@ -599,6 +602,7 @@ static CPUCacheInfo legacy_l1i_cache_amd = { .partitions = 1, .lines_per_tag = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, };/* Level 2 unified cache: */
@@ -612,6 +616,7 @@ static CPUCacheInfo legacy_l2_cache = { .sets = 4096, .partitions = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, };/*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */
@@ -621,6 +626,7 @@ static CPUCacheInfo legacy_l2_cache_cpuid2 = { .size = 2 * MiB, .line_size = 64, .associativity = 8, + .share_level = CPU_TOPO_LEVEL_INVALID, };
@@ -634,6 +640,7 @@ static CPUCacheInfo legacy_l2_cache_amd = { .associativity = 16, .sets = 512, .partitions = 1, + .share_level = CPU_TOPO_LEVEL_CORE, };/* Level 3 unified cache: */
@@ -649,6 +656,7 @@ static CPUCacheInfo legacy_l3_cache = { .self_init = true, .inclusive = true, .complex_indexing = true, + .share_level = CPU_TOPO_LEVEL_DIE, };/* TLB definitions: */
@@ -1947,6 +1955,7 @@ static const CPUCaches epyc_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -1959,6 +1968,7 @@ static const CPUCaches epyc_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -1969,6 +1979,7 @@ static const CPUCaches epyc_cache_info = { .partitions = 1, .sets = 1024, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -1982,6 +1993,7 @@ static const CPUCaches epyc_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = true, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
@@ -1997,6 +2009,7 @@ static CPUCaches epyc_v4_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -2009,6 +2022,7 @@ static CPUCaches epyc_v4_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2019,6 +2033,7 @@ static CPUCaches epyc_v4_cache_info = { .partitions = 1, .sets = 1024, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2032,6 +2047,7 @@ static CPUCaches epyc_v4_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = false, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
@@ -2047,6 +2063,7 @@ static const CPUCaches epyc_rome_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -2059,6 +2076,7 @@ static const CPUCaches epyc_rome_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2069,6 +2087,7 @@ static const CPUCaches epyc_rome_cache_info = { .partitions = 1, .sets = 1024, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2082,6 +2101,7 @@ static const CPUCaches epyc_rome_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = true, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
@@ -2097,6 +2117,7 @@ static const CPUCaches epyc_rome_v3_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -2109,6 +2130,7 @@ static const CPUCaches epyc_rome_v3_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2119,6 +2141,7 @@ static const CPUCaches epyc_rome_v3_cache_info = { .partitions = 1, .sets = 1024, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2132,6 +2155,7 @@ static const CPUCaches epyc_rome_v3_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = false, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
@@ -2147,6 +2171,7 @@ static const CPUCaches epyc_milan_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -2159,6 +2184,7 @@ static const CPUCaches epyc_milan_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2169,6 +2195,7 @@ static const CPUCaches epyc_milan_cache_info = { .partitions = 1, .sets = 1024, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2182,6 +2209,7 @@ static const CPUCaches epyc_milan_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = true, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
@@ -2197,6 +2225,7 @@ static const CPUCaches epyc_milan_v2_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -2209,6 +2238,7 @@ static const CPUCaches epyc_milan_v2_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2219,6 +2249,7 @@ static const CPUCaches epyc_milan_v2_cache_info = { .partitions = 1, .sets = 1024, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2232,6 +2263,7 @@ static const CPUCaches epyc_milan_v2_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = false, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
@@ -2247,6 +2279,7 @@ static const CPUCaches epyc_genoa_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l1i_cache = &(CPUCacheInfo ) { .type =INSTRUCTION_CACHE ,
@@ -2259,6 +2292,7 @@ static const CPUCaches epyc_genoa_cache_info = { .lines_per_tag = 1, .self_init = 1, .no_invd_sharing = true, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l2_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2269,6 +2303,7 @@ static const CPUCaches epyc_genoa_cache_info = { .partitions = 1, .sets = 2048, .lines_per_tag = 1, + .share_level = CPU_TOPO_LEVEL_CORE, }, .l3_cache = &(CPUCacheInfo ) { .type =UNIFIED_CACHE ,
@@ -2282,6 +2317,7 @@ static const CPUCaches epyc_genoa_cache_info = { .self_init = true, .inclusive = true, .complex_indexing = false, + .share_level = CPU_TOPO_LEVEL_DIE, }, };
target/i386/cpu.h +7 -0
@@ -1597,6 +1597,13 @@ typedef struct CPUCacheInfo {* address bits. CPUID[4].EDX[bit 2]. */ bool complex_indexing; + +/* +* Cache Topology. The level that cache is shared in. +* Used to encode CPUID[4].EAX[bits 25:14] or +* CPUID[0x8000001D].EAX[bits 25:14]. +*/ +enum CPUTopoLevel share_level; } CPUCacheInfo;
Signature · 1 line
2.34.1
PATCH v5 18/20 i386: Use CPUCacheInfo.share_level to encode CPUID[4]
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
CPUID[4].EAX[bits 25:14] is used to represent the cache topology for Intel CPUs.
After cache models have topology information, we can use CPUCacheInfo.share_level to decide which topology level to be encoded into CPUID[4].EAX[bits 25:14].
And since maximum_processor_id (original "num_apic_ids") is parsed based on cpu topology levels, which are verified when parsing smp, it's no need to check this value by "assert(num_apic_ids > 0)" again, so remove this assert.
Additionally, wrap the encoding of CPUID[4].EAX[bits 31:26] into a helper to make the code cleaner.
---
Changes since v1:
* Use "enum CPUTopoLevel share_level" as the parameter in max_processor_ids_for_cache().
* Make cache_into_passthrough case also use max_processor_ids_for_cache() and max_core_ids_in_package() to encode CPUID[4]. (Yanan)
* Rename the title of this patch (the original is "i386: Use CPUCacheInfo.share_level to encode CPUID[4].EAX[bits 25:14]").
--- target/i386/cpu.c | 70 +++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 27 deletions(-)
target/i386/cpu.c +43 -27
@@ -235,22 +235,53 @@ static uint8_t cpuid2_cache_descriptor(CPUCacheInfo *cache) ((t) == UNIFIED_CACHE) ? CACHE_TYPE_UNIFIED : \ 0 /* Invalid value */) +static uint32_t max_processor_ids_for_cache (X86CPUTopoInfo *topo_info, +enum CPUTopoLevel share_level) +{ +uint32_t num_ids =0 ; + +switch (share_level) { +case CPU_TOPO_LEVEL_CORE : + num_ids =1 <<apicid_core_offset (topo_info); +break ; +case CPU_TOPO_LEVEL_DIE : + num_ids =1 <<apicid_die_offset (topo_info); +break ; +case CPU_TOPO_LEVEL_PACKAGE : + num_ids =1 <<apicid_pkg_offset (topo_info); +break ; +default : +/* +* Currently there is no use case for SMT and MODULE, so use +* assert directly to facilitate debugging. +*/ +g_assert_not_reached (); + } + +return num_ids -1 ; +} + +static uint32_t max_core_ids_in_package (X86CPUTopoInfo *topo_info) +{ +uint32_t num_cores =1 << (apicid_pkg_offset (topo_info) - +apicid_core_offset (topo_info)); +return num_cores -1 ; +}/* Encode cache info for CPUID[4] */ static void encode_cache_cpuid4 (CPUCacheInfo *cache, -int num_apic_ids,int num_cores, +X86CPUTopoInfo *topo_info,uint32_t *eax,uint32_t *ebx,uint32_t *ecx,uint32_t *edx) {assert (cache->size == cache->line_size * cache->associativity * cache->partitions * cache->sets); -assert (num_apic_ids >0 ); *eax =CACHE_TYPE (cache->type) |CACHE_LEVEL (cache->level) | (cache->self_init ?CACHE_SELF_INIT_LEVEL :0 ) | - ((num_cores -1 ) <<26 ) | - ((num_apic_ids -1 ) <<14 ); + (max_core_ids_in_package (topo_info) <<26 ) | + (max_processor_ids_for_cache (topo_info, cache->share_level) <<14 );assert (cache->line_size >0 );assert (cache->partitions >0 );
@@ -6262,56 +6293,41 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,int host_vcpus_per_cache =1 + ((*eax &0x3FFC000 ) >>14 );if (cores_per_pkg >1 ) { -int addressable_cores_offset = -apicid_pkg_offset (&topo_info) - -apicid_core_offset (&topo_info); - *eax &= ~0xFC000000 ; - *eax |= (1 << (addressable_cores_offset -1 )) <<26 ; + *eax |=max_core_ids_in_package (&topo_info) <<26 ; }if (host_vcpus_per_cache > cpus_per_pkg) { -int pkg_offset =apicid_pkg_offset (&topo_info); - *eax &= ~0x3FFC000 ; - *eax |= (1 << (pkg_offset -1 )) <<14 ; + *eax |= +max_processor_ids_for_cache (&topo_info, +CPU_TOPO_LEVEL_PACKAGE ) <<14 ; } } }else if (cpu->vendor_cpuid_only &&IS_AMD_CPU (env)) { *eax = *ebx = *ecx = *edx =0 ; }else { *eax =0 ; -int addressable_cores_offset =apicid_pkg_offset (&topo_info) - -apicid_core_offset (&topo_info); -int core_offset, die_offset;switch (count) {case 0 :/* L1 dcache info */ - core_offset =apicid_core_offset (&topo_info);encode_cache_cpuid4 (env->cache_info_cpuid4.l1d_cache, - (1 << core_offset), - (1 << addressable_cores_offset), + &topo_info, eax, ebx, ecx, edx);break ;case 1 :/* L1 icache info */ - core_offset =apicid_core_offset (&topo_info);encode_cache_cpuid4 (env->cache_info_cpuid4.l1i_cache, - (1 << core_offset), - (1 << addressable_cores_offset), + &topo_info, eax, ebx, ecx, edx);break ;case 2 :/* L2 cache info */ - core_offset =apicid_core_offset (&topo_info);encode_cache_cpuid4 (env->cache_info_cpuid4.l2_cache, - (1 << core_offset), - (1 << addressable_cores_offset), + &topo_info, eax, ebx, ecx, edx);break ;case 3 :/* L3 cache info */ - die_offset =apicid_die_offset (&topo_info);if (cpu->enable_l3_cache) {encode_cache_cpuid4 (env->cache_info_cpuid4.l3_cache, - (1 << die_offset), - (1 << addressable_cores_offset), + &topo_info, eax, ebx, ecx, edx);break ; }
Signature · 1 line
2.34.1
PATCH v5 19/20 i386: Use offsets get NumSharingCache for CPUID[0x8000001D].EAX[bits 25:14]
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
The commit 8f4202fb1080 ("i386: Populate AMD Processor Cache Information for cpuid 0x8000001D") adds the cache topology for AMD CPU by encoding the number of sharing threads directly.
From AMD's APM, NumSharingCache (CPUID[0x8000001D].EAX[bits 25:14]) means [1]:
The number of logical processors sharing this cache is the value of this field incremented by 1. To determine which logical processors are sharing a cache, determine a Share Id for each processor as follows:
ShareId = LocalApicId >> log2(NumSharingCache+1)
Logical processors with the same ShareId then share a cache. If NumSharingCache+1 is not a power of two, round it up to the next power of two.
From the description above, the calculation of this field should be same as CPUID[4].EAX[bits 25:14] for Intel CPUs. So also use the offsets of APIC ID to calculate this field.
[1]: APM, vol.3, appendix.E.4.15 Function 8000_001Dh--Cache Topology
Information
---
Changes since v3:
* Rewrite the subject. (Babu)
* Delete the original "comment/help" expression, as this behavior is confirmed for AMD CPUs. (Babu)
* Rename "num_apic_ids" (v3) to "num_sharing_cache" to match spec definition. (Babu)
Changes since v1:
* Rename "l3_threads" to "num_apic_ids" in encode_cache_cpuid8000001d(). (Yanan)
* Add the description of the original commit and add Cc.
--- target/i386/cpu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
target/i386/cpu.c +4 -6
@@ -483,7 +483,7 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - uint32_t l3_threads; + uint32_t num_sharing_cache;assert (cache->size == cache->line_size * cache->associativity * cache->partitions * cache->sets);
@@ -492,13 +492,11 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *cache,/* L3 is shared among multiple cores */ if (cache->level ==3 ) { - l3_threads = topo_info->modules_per_die * - topo_info->cores_per_module * - topo_info->threads_per_core; - *eax |= (l3_threads -1 ) <<14 ; + num_sharing_cache =1 <<apicid_die_offset (topo_info); }else { - *eax |= ((topo_info->threads_per_core -1 ) <<14 ); + num_sharing_cache =1 <<apicid_core_offset (topo_info); } + *eax |= (num_sharing_cache -1 ) <<14 ;assert (cache->line_size >0 );assert (cache->partitions >0 );
Signature · 1 line
2.34.1
PATCH v5 20/20 i386: Use CPUCacheInfo.share_level to encode CPUID[0x8000001D].EAX[bits 25:14]
In reply to Zhao LiuFrom: Zhao Liu <[email protected]>
CPUID[0x8000001D].EAX[bits 25:14] NumSharingCache: number of logical processors sharing cache.
The number of logical processors sharing this cache is NumSharingCache + 1.
After cache models have topology information, we can use CPUCacheInfo.share_level to decide which topology level to be encoded into CPUID[0x8000001D].EAX[bits 25:14].
---
Changes since v3:
* Explain what "CPUID[0x8000001D].EAX[bits 25:14]" means in the commit message. (Babu)
Changes since v1:
* Use cache->share_level as the parameter in max_processor_ids_for_cache().
--- target/i386/cpu.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
target/i386/cpu.c +1 -9
@@ -483,20 +483,12 @@ static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - uint32_t num_sharing_cache; assert(cache->size == cache->line_size * cache->associativity * cache->partitions * cache->sets); *eax =CACHE_TYPE (cache->type) |CACHE_LEVEL (cache->level) | (cache->self_init ?CACHE_SELF_INIT_LEVEL :0 ); - -/* L3 is shared among multiple cores */ -if (cache->level ==3 ) { - num_sharing_cache =1 <<apicid_die_offset (topo_info); - }else { - num_sharing_cache =1 <<apicid_core_offset (topo_info); - } - *eax |= (num_sharing_cache -1 ) <<14 ; + *eax |=max_processor_ids_for_cache (topo_info, cache->share_level) <<14 ;assert (cache->line_size >0 );assert (cache->partitions >0 );
Signature · 1 line
2.34.1
Hi Zhao,
Quoted 7 lines · Zhao Liu
From: Zhao Liu <[email protected]>
Hi list,
This is the our v5 patch series, rebased on the master branch at the commit
384dbdda94c0("Merge tag 'migration-20231020-pull-request' of
https://gitlab.com/juan.quintela/qemu into staging").
Since the 4 first patches are not x86-specific (and are Acked by Michael), I'll queue them to shorten your series. I'll let Paolo look at the rest.
Regards,
Phil.
Quoted 11 lines · Philippe Mathieu-Daudé
Date: Wed, 25 Oct 2023 12:04:12 +0200
From: Philippe Mathieu-Daudé <[email protected]>
Subject: Re: [PATCH v5 00/20] Support smp.clusters for x86 in QEMUHi Zhao,
Quoted 4 lines · Zhao Liu
From: Zhao Liu <[email protected]>
Hi list,
Quoted 7 lines
Quoted 3 lines
This is the our v5 patch series, rebased on the master branch at the commit
384dbdda94c0("Merge tag 'migration-20231020-pull-request' of
https://gitlab.com/juan.quintela/qemu into staging").Since the 4 first patches are not x86-specific (and are Acked by Michael), I'll queue them to shorten your series. I'll let Paolo look at the rest.
Thanks Philippe!
-Zhao