From: Zhuocheng Ding <zhuocheng.ding@intel.com>
Support module level in i386 cpu topology structure "X86CPUTopoInfo".
Before updating APIC ID parsing rule with module level, the
apicid_core_width() temporarily combines the core and module levels
together.
At present, we don't expose module level in CPUID.1FH because currently
linux (v6.2-rc6) doesn't support module level. And exposing module and
die levels at the same time in CPUID.1FH will cause linux to calculate
the wrong die_id. The module level should be exposed until the real
machine has the module level in CPUID.1FH.
In addition, update topology structure in test-x86-apicid.c.
Signed-off-by: Zhuocheng Ding <zhuocheng.ding@intel.com>
Co-developed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
hw/i386/x86.c | 3 ++-
include/hw/i386/topology.h | 13 ++++++++---
target/i386/cpu.c | 17 ++++++++------
tests/unit/test-x86-apicid.c | 45 +++++++++++++++++++-----------------
4 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index ae1bb562d6e2..1c069ff56ae7 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -71,7 +71,8 @@ inline 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;
}
diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
index 81573f6cfde0..bbb00dc4aad8 100644
--- a/include/hw/i386/topology.h
+++ b/include/hw/i386/topology.h
@@ -54,7 +54,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;
@@ -78,7 +79,12 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)
*/
static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info)
{
- return apicid_bitwidth_for_count(topo_info->cores_per_die);
+ /*
+ * TODO: Will separate module info from core_width when update
+ * APIC ID with module level.
+ */
+ return apicid_bitwidth_for_count(topo_info->cores_per_module *
+ topo_info->modules_per_die);
}
/* Bit width of the Die_ID field */
@@ -128,7 +134,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);
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 61ec9a7499b8..6f3d114c7d12 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -336,7 +336,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);
@@ -5218,11 +5220,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;
- cpus_per_pkg = topo_info.dies_per_pkg * topo_info.cores_per_die *
- topo_info.threads_per_core;
+ cpus_per_pkg = topo_info.dies_per_pkg * topo_info.modules_per_die *
+ topo_info.cores_per_module * topo_info.threads_per_core;
/* Calculate & apply limits for different index ranges */
if (index >= 0xC0000000) {
@@ -5298,8 +5301,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 = cpus_per_pkg;
- int cores_per_socket = topo_info.cores_per_die *
- topo_info.dies_per_pkg;
+ int cores_per_socket = cpus_per_pkg /
+ topo_info.threads_per_core;
if (cores_per_socket > 1) {
*eax &= ~0xFC000000;
*eax |= (pow2ceil(cores_per_socket) - 1) << 26;
@@ -5483,7 +5486,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break;
case 1:
*eax = apicid_die_offset(&topo_info);
- *ebx = topo_info.cores_per_die * topo_info.threads_per_core;
+ *ebx = cpus_per_pkg / topo_info.dies_per_pkg;
*ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
break;
case 2:
diff --git a/tests/unit/test-x86-apicid.c b/tests/unit/test-x86-apicid.c
index 2b104f86d7c2..f21b8a5d95c2 100644
--- a/tests/unit/test-x86-apicid.c
+++ b/tests/unit/test-x86-apicid.c
@@ -30,13 +30,16 @@ static void test_topo_bits(void)
{
X86CPUTopoInfo topo_info = {0};
- /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
- topo_info = (X86CPUTopoInfo) {1, 1, 1};
+ /*
+ * simple tests for 1 thread per core, 1 core per module,
+ * 1 module per die, 1 die per package
+ */
+ 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_die_width(&topo_info), ==, 0);
- topo_info = (X86CPUTopoInfo) {1, 1, 1};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 1};
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
@@ -45,39 +48,39 @@ static void test_topo_bits(void)
/* Test field width calculation for multiple values
*/
- topo_info = (X86CPUTopoInfo) {1, 1, 2};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 2};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 1);
- topo_info = (X86CPUTopoInfo) {1, 1, 3};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 3};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
- topo_info = (X86CPUTopoInfo) {1, 1, 4};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 4};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
- topo_info = (X86CPUTopoInfo) {1, 1, 14};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 14};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
- topo_info = (X86CPUTopoInfo) {1, 1, 15};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 15};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
- topo_info = (X86CPUTopoInfo) {1, 1, 16};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 16};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
- topo_info = (X86CPUTopoInfo) {1, 1, 17};
+ topo_info = (X86CPUTopoInfo) {1, 1, 1, 17};
g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 5);
- topo_info = (X86CPUTopoInfo) {1, 30, 2};
+ topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
- topo_info = (X86CPUTopoInfo) {1, 31, 2};
+ topo_info = (X86CPUTopoInfo) {1, 1, 31, 2};
g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
- topo_info = (X86CPUTopoInfo) {1, 32, 2};
+ topo_info = (X86CPUTopoInfo) {1, 1, 32, 2};
g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
- topo_info = (X86CPUTopoInfo) {1, 33, 2};
+ topo_info = (X86CPUTopoInfo) {1, 1, 33, 2};
g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6);
- topo_info = (X86CPUTopoInfo) {1, 30, 2};
+ topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
- topo_info = (X86CPUTopoInfo) {2, 30, 2};
+ topo_info = (X86CPUTopoInfo) {2, 1, 30, 2};
g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1);
- topo_info = (X86CPUTopoInfo) {3, 30, 2};
+ topo_info = (X86CPUTopoInfo) {3, 1, 30, 2};
g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
- topo_info = (X86CPUTopoInfo) {4, 30, 2};
+ topo_info = (X86CPUTopoInfo) {4, 1, 30, 2};
g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
/* build a weird topology and see if IDs are calculated correctly
@@ -85,18 +88,18 @@ static void test_topo_bits(void)
/* This will use 2 bits for thread ID and 3 bits for core ID
*/
- topo_info = (X86CPUTopoInfo) {1, 6, 3};
+ 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_die_offset(&topo_info), ==, 5);
g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
- topo_info = (X86CPUTopoInfo) {1, 6, 3};
+ topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
- topo_info = (X86CPUTopoInfo) {1, 6, 3};
+ topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
(1 << 2) | 0);
g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
--
2.34.1Hi Zhao,
在 2023/2/13 17:36, Zhao Liu 写道:
> From: Zhuocheng Ding <zhuocheng.ding@intel.com>
>
> Support module level in i386 cpu topology structure "X86CPUTopoInfo".
>
> Before updating APIC ID parsing rule with module level, the
> apicid_core_width() temporarily combines the core and module levels
> together.
If we dont merge this one with the followed patches, then nits below
may be meaningful.
> At present, we don't expose module level in CPUID.1FH because currently
> linux (v6.2-rc6) doesn't support module level. And exposing module and
> die levels at the same time in CPUID.1FH will cause linux to calculate
> the wrong die_id. The module level should be exposed until the real
> machine has the module level in CPUID.1FH.
>
> In addition, update topology structure in test-x86-apicid.c.
>
> Signed-off-by: Zhuocheng Ding <zhuocheng.ding@intel.com>
> Co-developed-by: Zhao Liu <zhao1.liu@intel.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> hw/i386/x86.c | 3 ++-
> include/hw/i386/topology.h | 13 ++++++++---
> target/i386/cpu.c | 17 ++++++++------
> tests/unit/test-x86-apicid.c | 45 +++++++++++++++++++-----------------
> 4 files changed, 46 insertions(+), 32 deletions(-)
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index ae1bb562d6e2..1c069ff56ae7 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -71,7 +71,8 @@ inline 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;
Here we can ensure that topo_info->modules_per_die is always 1, so...
> topo_info->threads_per_core = ms->smp.threads;
> }
>
> diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> index 81573f6cfde0..bbb00dc4aad8 100644
> --- a/include/hw/i386/topology.h
> +++ b/include/hw/i386/topology.h
> @@ -54,7 +54,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;
>
> @@ -78,7 +79,12 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)
> */
> static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info)
> {
> - return apicid_bitwidth_for_count(topo_info->cores_per_die);
> + /*
> + * TODO: Will separate module info from core_width when update
> + * APIC ID with module level.
> + */
> + return apicid_bitwidth_for_count(topo_info->cores_per_module *
> + topo_info->modules_per_die);
> }
...We can directly add apicid_module_width (which returns 0 so far)
and apicid_module_offset here which don't rely on the APIC ID rule
change, and avoid the "TODO..".
Then patch 8 and 10 are about module_id, so can be merged.
Is this good?
Thanks,
Yanan
> /* Bit width of the Die_ID field */
> @@ -128,7 +134,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);
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 61ec9a7499b8..6f3d114c7d12 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -336,7 +336,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);
> @@ -5218,11 +5220,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;
>
> - cpus_per_pkg = topo_info.dies_per_pkg * topo_info.cores_per_die *
> - topo_info.threads_per_core;
> + cpus_per_pkg = topo_info.dies_per_pkg * topo_info.modules_per_die *
> + topo_info.cores_per_module * topo_info.threads_per_core;
>
> /* Calculate & apply limits for different index ranges */
> if (index >= 0xC0000000) {
> @@ -5298,8 +5301,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 = cpus_per_pkg;
> - int cores_per_socket = topo_info.cores_per_die *
> - topo_info.dies_per_pkg;
> + int cores_per_socket = cpus_per_pkg /
> + topo_info.threads_per_core;
> if (cores_per_socket > 1) {
> *eax &= ~0xFC000000;
> *eax |= (pow2ceil(cores_per_socket) - 1) << 26;
> @@ -5483,7 +5486,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
> break;
> case 1:
> *eax = apicid_die_offset(&topo_info);
> - *ebx = topo_info.cores_per_die * topo_info.threads_per_core;
> + *ebx = cpus_per_pkg / topo_info.dies_per_pkg;
> *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
> break;
> case 2:
> diff --git a/tests/unit/test-x86-apicid.c b/tests/unit/test-x86-apicid.c
> index 2b104f86d7c2..f21b8a5d95c2 100644
> --- a/tests/unit/test-x86-apicid.c
> +++ b/tests/unit/test-x86-apicid.c
> @@ -30,13 +30,16 @@ static void test_topo_bits(void)
> {
> X86CPUTopoInfo topo_info = {0};
>
> - /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
> - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> + /*
> + * simple tests for 1 thread per core, 1 core per module,
> + * 1 module per die, 1 die per package
> + */
> + 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_die_width(&topo_info), ==, 0);
>
> - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 1};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> @@ -45,39 +48,39 @@ static void test_topo_bits(void)
>
> /* Test field width calculation for multiple values
> */
> - topo_info = (X86CPUTopoInfo) {1, 1, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 2};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 1);
> - topo_info = (X86CPUTopoInfo) {1, 1, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 3};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> - topo_info = (X86CPUTopoInfo) {1, 1, 4};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 4};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
>
> - topo_info = (X86CPUTopoInfo) {1, 1, 14};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 14};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {1, 1, 15};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 15};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {1, 1, 16};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 16};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {1, 1, 17};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 17};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 5);
>
>
> - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {1, 31, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 31, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {1, 32, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 32, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {1, 33, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 33, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6);
>
> - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
> - topo_info = (X86CPUTopoInfo) {2, 30, 2};
> + topo_info = (X86CPUTopoInfo) {2, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1);
> - topo_info = (X86CPUTopoInfo) {3, 30, 2};
> + topo_info = (X86CPUTopoInfo) {3, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> - topo_info = (X86CPUTopoInfo) {4, 30, 2};
> + topo_info = (X86CPUTopoInfo) {4, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
>
> /* build a weird topology and see if IDs are calculated correctly
> @@ -85,18 +88,18 @@ static void test_topo_bits(void)
>
> /* This will use 2 bits for thread ID and 3 bits for core ID
> */
> - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> + 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_die_offset(&topo_info), ==, 5);
> g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
>
> - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
>
> - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
> (1 << 2) | 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
On Thu, Feb 16, 2023 at 10:34:24AM +0800, wangyanan (Y) wrote:
> Date: Thu, 16 Feb 2023 10:34:24 +0800
> From: "wangyanan (Y)" <wangyanan55@huawei.com>
> Subject: Re: [PATCH RESEND 07/18] i386: Support modules_per_die in
> X86CPUTopoInfo
>
> Hi Zhao,
>
> 在 2023/2/13 17:36, Zhao Liu 写道:
> > From: Zhuocheng Ding <zhuocheng.ding@intel.com>
> >
> > Support module level in i386 cpu topology structure "X86CPUTopoInfo".
> >
> > Before updating APIC ID parsing rule with module level, the
> > apicid_core_width() temporarily combines the core and module levels
> > together.
> If we dont merge this one with the followed patches, then nits below
> may be meaningful.
> > At present, we don't expose module level in CPUID.1FH because currently
> > linux (v6.2-rc6) doesn't support module level. And exposing module and
> > die levels at the same time in CPUID.1FH will cause linux to calculate
> > the wrong die_id. The module level should be exposed until the real
> > machine has the module level in CPUID.1FH.
> >
> > In addition, update topology structure in test-x86-apicid.c.
> >
> > Signed-off-by: Zhuocheng Ding <zhuocheng.ding@intel.com>
> > Co-developed-by: Zhao Liu <zhao1.liu@intel.com>
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> > hw/i386/x86.c | 3 ++-
> > include/hw/i386/topology.h | 13 ++++++++---
> > target/i386/cpu.c | 17 ++++++++------
> > tests/unit/test-x86-apicid.c | 45 +++++++++++++++++++-----------------
> > 4 files changed, 46 insertions(+), 32 deletions(-)
> >
> > diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> > index ae1bb562d6e2..1c069ff56ae7 100644
> > --- a/hw/i386/x86.c
> > +++ b/hw/i386/x86.c
> > @@ -71,7 +71,8 @@ inline 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;
> Here we can ensure that topo_info->modules_per_die is always 1, so...
> > topo_info->threads_per_core = ms->smp.threads;
> > }
> > diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> > index 81573f6cfde0..bbb00dc4aad8 100644
> > --- a/include/hw/i386/topology.h
> > +++ b/include/hw/i386/topology.h
> > @@ -54,7 +54,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;
> > @@ -78,7 +79,12 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)
> > */
> > static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info)
> > {
> > - return apicid_bitwidth_for_count(topo_info->cores_per_die);
> > + /*
> > + * TODO: Will separate module info from core_width when update
> > + * APIC ID with module level.
> > + */
> > + return apicid_bitwidth_for_count(topo_info->cores_per_module *
> > + topo_info->modules_per_die);
> > }
> ...We can directly add apicid_module_width (which returns 0 so far)
> and apicid_module_offset here which don't rely on the APIC ID rule
> change, and avoid the "TODO..".
>
> Then patch 8 and 10 are about module_id, so can be merged.
> Is this good?
Thanks Yanan, this makes sense. I'll do it.
Zhao
>
> Thanks,
> Yanan
> > /* Bit width of the Die_ID field */
> > @@ -128,7 +134,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);
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index 61ec9a7499b8..6f3d114c7d12 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -336,7 +336,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);
> > @@ -5218,11 +5220,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;
> > - cpus_per_pkg = topo_info.dies_per_pkg * topo_info.cores_per_die *
> > - topo_info.threads_per_core;
> > + cpus_per_pkg = topo_info.dies_per_pkg * topo_info.modules_per_die *
> > + topo_info.cores_per_module * topo_info.threads_per_core;
> > /* Calculate & apply limits for different index ranges */
> > if (index >= 0xC0000000) {
> > @@ -5298,8 +5301,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 = cpus_per_pkg;
> > - int cores_per_socket = topo_info.cores_per_die *
> > - topo_info.dies_per_pkg;
> > + int cores_per_socket = cpus_per_pkg /
> > + topo_info.threads_per_core;
> > if (cores_per_socket > 1) {
> > *eax &= ~0xFC000000;
> > *eax |= (pow2ceil(cores_per_socket) - 1) << 26;
> > @@ -5483,7 +5486,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
> > break;
> > case 1:
> > *eax = apicid_die_offset(&topo_info);
> > - *ebx = topo_info.cores_per_die * topo_info.threads_per_core;
> > + *ebx = cpus_per_pkg / topo_info.dies_per_pkg;
> > *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
> > break;
> > case 2:
> > diff --git a/tests/unit/test-x86-apicid.c b/tests/unit/test-x86-apicid.c
> > index 2b104f86d7c2..f21b8a5d95c2 100644
> > --- a/tests/unit/test-x86-apicid.c
> > +++ b/tests/unit/test-x86-apicid.c
> > @@ -30,13 +30,16 @@ static void test_topo_bits(void)
> > {
> > X86CPUTopoInfo topo_info = {0};
> > - /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
> > - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> > + /*
> > + * simple tests for 1 thread per core, 1 core per module,
> > + * 1 module per die, 1 die per package
> > + */
> > + 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_die_width(&topo_info), ==, 0);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 1};
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> > @@ -45,39 +48,39 @@ static void test_topo_bits(void)
> > /* Test field width calculation for multiple values
> > */
> > - topo_info = (X86CPUTopoInfo) {1, 1, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 2};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 1);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 3};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 3};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 4};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 4};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 14};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 14};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 15};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 15};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 16};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 16};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 17};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 17};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 31, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 31, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 32, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 32, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 33, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 33, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6);
> > - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
> > - topo_info = (X86CPUTopoInfo) {2, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {2, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1);
> > - topo_info = (X86CPUTopoInfo) {3, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {3, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {4, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {4, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> > /* build a weird topology and see if IDs are calculated correctly
> > @@ -85,18 +88,18 @@ static void test_topo_bits(void)
> > /* This will use 2 bits for thread ID and 3 bits for core ID
> > */
> > - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> > + 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_die_offset(&topo_info), ==, 5);
> > g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
> > (1 << 2) | 0);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
>
在 2023/2/13 17:36, Zhao Liu 写道:
> From: Zhuocheng Ding <zhuocheng.ding@intel.com>
>
> Support module level in i386 cpu topology structure "X86CPUTopoInfo".
>
> Before updating APIC ID parsing rule with module level, the
> apicid_core_width() temporarily combines the core and module levels
> together.
>
> At present, we don't expose module level in CPUID.1FH because currently
> linux (v6.2-rc6) doesn't support module level. And exposing module and
> die levels at the same time in CPUID.1FH will cause linux to calculate
> the wrong die_id. The module level should be exposed until the real
> machine has the module level in CPUID.1FH.
>
> In addition, update topology structure in test-x86-apicid.c.
>
> Signed-off-by: Zhuocheng Ding <zhuocheng.ding@intel.com>
> Co-developed-by: Zhao Liu <zhao1.liu@intel.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> hw/i386/x86.c | 3 ++-
> include/hw/i386/topology.h | 13 ++++++++---
> target/i386/cpu.c | 17 ++++++++------
> tests/unit/test-x86-apicid.c | 45 +++++++++++++++++++-----------------
> 4 files changed, 46 insertions(+), 32 deletions(-)
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index ae1bb562d6e2..1c069ff56ae7 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -71,7 +71,8 @@ inline 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;
> }
>
> diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> index 81573f6cfde0..bbb00dc4aad8 100644
> --- a/include/hw/i386/topology.h
> +++ b/include/hw/i386/topology.h
> @@ -54,7 +54,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;
>
> @@ -78,7 +79,12 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)
> */
> static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info)
> {
> - return apicid_bitwidth_for_count(topo_info->cores_per_die);
> + /*
> + * TODO: Will separate module info from core_width when update
> + * APIC ID with module level.
> + */
> + return apicid_bitwidth_for_count(topo_info->cores_per_module *
> + topo_info->modules_per_die);
> }
>
> /* Bit width of the Die_ID field */
> @@ -128,7 +134,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);
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 61ec9a7499b8..6f3d114c7d12 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -336,7 +336,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);
> @@ -5218,11 +5220,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;
>
> - cpus_per_pkg = topo_info.dies_per_pkg * topo_info.cores_per_die *
> - topo_info.threads_per_core;
> + cpus_per_pkg = topo_info.dies_per_pkg * topo_info.modules_per_die *
> + topo_info.cores_per_module * topo_info.threads_per_core;
>
> /* Calculate & apply limits for different index ranges */
> if (index >= 0xC0000000) {
> @@ -5298,8 +5301,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 = cpus_per_pkg;
> - int cores_per_socket = topo_info.cores_per_die *
> - topo_info.dies_per_pkg;
> + int cores_per_socket = cpus_per_pkg /
> + topo_info.threads_per_core;
As mentioned in patch 5, cores_per_socket can be function-global.
> if (cores_per_socket > 1) {
> *eax &= ~0xFC000000;
> *eax |= (pow2ceil(cores_per_socket) - 1) << 26;
> @@ -5483,7 +5486,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
> break;
> case 1:
> *eax = apicid_die_offset(&topo_info);
> - *ebx = topo_info.cores_per_die * topo_info.threads_per_core;
> + *ebx = cpus_per_pkg / topo_info.dies_per_pkg;
> *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
> break;
> case 2:
> diff --git a/tests/unit/test-x86-apicid.c b/tests/unit/test-x86-apicid.c
> index 2b104f86d7c2..f21b8a5d95c2 100644
> --- a/tests/unit/test-x86-apicid.c
> +++ b/tests/unit/test-x86-apicid.c
> @@ -30,13 +30,16 @@ static void test_topo_bits(void)
> {
> X86CPUTopoInfo topo_info = {0};
>
> - /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
> - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> + /*
> + * simple tests for 1 thread per core, 1 core per module,
> + * 1 module per die, 1 die per package
> + */
> + 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_die_width(&topo_info), ==, 0);
>
> - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 1};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> @@ -45,39 +48,39 @@ static void test_topo_bits(void)
>
> /* Test field width calculation for multiple values
> */
> - topo_info = (X86CPUTopoInfo) {1, 1, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 2};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 1);
> - topo_info = (X86CPUTopoInfo) {1, 1, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 3};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> - topo_info = (X86CPUTopoInfo) {1, 1, 4};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 4};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
>
> - topo_info = (X86CPUTopoInfo) {1, 1, 14};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 14};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {1, 1, 15};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 15};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {1, 1, 16};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 16};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> - topo_info = (X86CPUTopoInfo) {1, 1, 17};
> + topo_info = (X86CPUTopoInfo) {1, 1, 1, 17};
> g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 5);
>
>
> - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {1, 31, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 31, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {1, 32, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 32, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> - topo_info = (X86CPUTopoInfo) {1, 33, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 33, 2};
> g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6);
>
> - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
> - topo_info = (X86CPUTopoInfo) {2, 30, 2};
> + topo_info = (X86CPUTopoInfo) {2, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1);
> - topo_info = (X86CPUTopoInfo) {3, 30, 2};
> + topo_info = (X86CPUTopoInfo) {3, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> - topo_info = (X86CPUTopoInfo) {4, 30, 2};
> + topo_info = (X86CPUTopoInfo) {4, 1, 30, 2};
> g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
>
> /* build a weird topology and see if IDs are calculated correctly
> @@ -85,18 +88,18 @@ static void test_topo_bits(void)
>
> /* This will use 2 bits for thread ID and 3 bits for core ID
> */
> - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> + 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_die_offset(&topo_info), ==, 5);
> g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
>
> - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
>
> - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
> (1 << 2) | 0);
> g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
On Wed, Feb 15, 2023 at 06:38:31PM +0800, wangyanan (Y) wrote:
> Date: Wed, 15 Feb 2023 18:38:31 +0800
> From: "wangyanan (Y)" <wangyanan55@huawei.com>
> Subject: Re: [PATCH RESEND 07/18] i386: Support modules_per_die in
> X86CPUTopoInfo
>
> 在 2023/2/13 17:36, Zhao Liu 写道:
> > From: Zhuocheng Ding <zhuocheng.ding@intel.com>
> >
> > Support module level in i386 cpu topology structure "X86CPUTopoInfo".
> >
> > Before updating APIC ID parsing rule with module level, the
> > apicid_core_width() temporarily combines the core and module levels
> > together.
> >
> > At present, we don't expose module level in CPUID.1FH because currently
> > linux (v6.2-rc6) doesn't support module level. And exposing module and
> > die levels at the same time in CPUID.1FH will cause linux to calculate
> > the wrong die_id. The module level should be exposed until the real
> > machine has the module level in CPUID.1FH.
> >
> > In addition, update topology structure in test-x86-apicid.c.
> >
> > Signed-off-by: Zhuocheng Ding <zhuocheng.ding@intel.com>
> > Co-developed-by: Zhao Liu <zhao1.liu@intel.com>
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> > hw/i386/x86.c | 3 ++-
> > include/hw/i386/topology.h | 13 ++++++++---
> > target/i386/cpu.c | 17 ++++++++------
> > tests/unit/test-x86-apicid.c | 45 +++++++++++++++++++-----------------
> > 4 files changed, 46 insertions(+), 32 deletions(-)
> >
> > diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> > index ae1bb562d6e2..1c069ff56ae7 100644
> > --- a/hw/i386/x86.c
> > +++ b/hw/i386/x86.c
> > @@ -71,7 +71,8 @@ inline 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;
> > }
> > diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> > index 81573f6cfde0..bbb00dc4aad8 100644
> > --- a/include/hw/i386/topology.h
> > +++ b/include/hw/i386/topology.h
> > @@ -54,7 +54,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;
> > @@ -78,7 +79,12 @@ static inline unsigned apicid_smt_width(X86CPUTopoInfo *topo_info)
> > */
> > static inline unsigned apicid_core_width(X86CPUTopoInfo *topo_info)
> > {
> > - return apicid_bitwidth_for_count(topo_info->cores_per_die);
> > + /*
> > + * TODO: Will separate module info from core_width when update
> > + * APIC ID with module level.
> > + */
> > + return apicid_bitwidth_for_count(topo_info->cores_per_module *
> > + topo_info->modules_per_die);
> > }
> > /* Bit width of the Die_ID field */
> > @@ -128,7 +134,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);
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index 61ec9a7499b8..6f3d114c7d12 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -336,7 +336,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);
> > @@ -5218,11 +5220,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;
> > - cpus_per_pkg = topo_info.dies_per_pkg * topo_info.cores_per_die *
> > - topo_info.threads_per_core;
> > + cpus_per_pkg = topo_info.dies_per_pkg * topo_info.modules_per_die *
> > + topo_info.cores_per_module * topo_info.threads_per_core;
> > /* Calculate & apply limits for different index ranges */
> > if (index >= 0xC0000000) {
> > @@ -5298,8 +5301,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 = cpus_per_pkg;
> > - int cores_per_socket = topo_info.cores_per_die *
> > - topo_info.dies_per_pkg;
> > + int cores_per_socket = cpus_per_pkg /
> > + topo_info.threads_per_core;
> As mentioned in patch 5, cores_per_socket can be function-global.
Yeah, got it.
> > if (cores_per_socket > 1) {
> > *eax &= ~0xFC000000;
> > *eax |= (pow2ceil(cores_per_socket) - 1) << 26;
> > @@ -5483,7 +5486,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
> > break;
> > case 1:
> > *eax = apicid_die_offset(&topo_info);
> > - *ebx = topo_info.cores_per_die * topo_info.threads_per_core;
> > + *ebx = cpus_per_pkg / topo_info.dies_per_pkg;
> > *ecx |= CPUID_TOPOLOGY_LEVEL_CORE;
> > break;
> > case 2:
> > diff --git a/tests/unit/test-x86-apicid.c b/tests/unit/test-x86-apicid.c
> > index 2b104f86d7c2..f21b8a5d95c2 100644
> > --- a/tests/unit/test-x86-apicid.c
> > +++ b/tests/unit/test-x86-apicid.c
> > @@ -30,13 +30,16 @@ static void test_topo_bits(void)
> > {
> > X86CPUTopoInfo topo_info = {0};
> > - /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
> > - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> > + /*
> > + * simple tests for 1 thread per core, 1 core per module,
> > + * 1 module per die, 1 die per package
> > + */
> > + 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_die_width(&topo_info), ==, 0);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 1};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 1};
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> > @@ -45,39 +48,39 @@ static void test_topo_bits(void)
> > /* Test field width calculation for multiple values
> > */
> > - topo_info = (X86CPUTopoInfo) {1, 1, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 2};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 1);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 3};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 3};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 4};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 4};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 14};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 14};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 15};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 15};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 16};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 16};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 4);
> > - topo_info = (X86CPUTopoInfo) {1, 1, 17};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 1, 17};
> > g_assert_cmpuint(apicid_smt_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 31, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 31, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 32, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 32, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 33, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 33, 2};
> > g_assert_cmpuint(apicid_core_width(&topo_info), ==, 6);
> > - topo_info = (X86CPUTopoInfo) {1, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 0);
> > - topo_info = (X86CPUTopoInfo) {2, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {2, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 1);
> > - topo_info = (X86CPUTopoInfo) {3, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {3, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {4, 30, 2};
> > + topo_info = (X86CPUTopoInfo) {4, 1, 30, 2};
> > g_assert_cmpuint(apicid_die_width(&topo_info), ==, 2);
> > /* build a weird topology and see if IDs are calculated correctly
> > @@ -85,18 +88,18 @@ static void test_topo_bits(void)
> > /* This will use 2 bits for thread ID and 3 bits for core ID
> > */
> > - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> > + 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_die_offset(&topo_info), ==, 5);
> > g_assert_cmpuint(apicid_pkg_offset(&topo_info), ==, 5);
> > - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 0), ==, 0);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1), ==, 1);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 2), ==, 2);
> > - topo_info = (X86CPUTopoInfo) {1, 6, 3};
> > + topo_info = (X86CPUTopoInfo) {1, 1, 6, 3};
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 0), ==,
> > (1 << 2) | 0);
> > g_assert_cmpuint(x86_apicid_from_cpu_idx(&topo_info, 1 * 3 + 1), ==,
>
© 2016 - 2026 Red Hat, Inc.