[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/18] i386/cpu: Introduce cluster-id to X86CPU
From: |
Zhao Liu |
Subject: |
[PATCH 11/18] i386/cpu: Introduce cluster-id to X86CPU |
Date: |
Thu, 2 Feb 2023 17:49:22 +0800 |
From: Zhuocheng Ding <zhuocheng.ding@intel.com>
We 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().
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 | 33 +++++++++++++++++++++++++--------
target/i386/cpu.c | 2 ++
target/i386/cpu.h | 1 +
3 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 68fce87d18ac..57d646bf360f 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -324,6 +324,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;
@@ -340,6 +348,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;
@@ -359,16 +375,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);
}
@@ -415,6 +424,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,
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 6f3d114c7d12..27bbbc36b11c 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6980,12 +6980,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),
#else
DEFINE_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
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index f3afea765982..8668e74e0c87 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1966,6 +1966,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;
--
2.34.1
- [PATCH 01/18] machine: Fix comment of machine_parse_smp_config(), (continued)
- [PATCH 01/18] machine: Fix comment of machine_parse_smp_config(), Zhao Liu, 2023/02/02
- [PATCH 03/18] softmmu: Fix CPUSTATE.nr_cores' calculation, Zhao Liu, 2023/02/02
- [PATCH 02/18] tests: Rename test-x86-cpuid.c to test-x86-apicid.c, Zhao Liu, 2023/02/02
- [PATCH 04/18] i386/cpu: Fix number of addressable IDs in CPUID.04H, Zhao Liu, 2023/02/02
- [PATCH 05/18] i386/cpu: Consolidate the use of topo_info in cpu_x86_cpuid(), Zhao Liu, 2023/02/02
- [PATCH 06/18] i386: Introduce module-level cpu topology to CPUX86State, Zhao Liu, 2023/02/02
- [PATCH 07/18] i386: Support modules_per_die in X86CPUTopoInfo, Zhao Liu, 2023/02/02
- [PATCH 09/18] i386: Fix comment style in topology.h, Zhao Liu, 2023/02/02
- [PATCH 10/18] i386: Update APIC ID parsing rule to support module level, Zhao Liu, 2023/02/02
- [PATCH 08/18] i386: Support module_id in X86CPUTopoIDs, Zhao Liu, 2023/02/02
- [PATCH 11/18] i386/cpu: Introduce cluster-id to X86CPU,
Zhao Liu <=
- [PATCH 12/18] tests: Add test case of APIC ID for module level parsing, Zhao Liu, 2023/02/02
- [PATCH 13/18] hw/i386/pc: Support smp.clusters for x86 PC machine, Zhao Liu, 2023/02/02
- [PATCH 15/18] i386: Use CPUCacheInfo.share_level to encode CPUID[4].EAX[bits 25:14], Zhao Liu, 2023/02/02
- [PATCH 16/18] i386: Fix NumSharingCache for CPUID[0x8000001D].EAX[bits 25:14], Zhao Liu, 2023/02/02
- [PATCH 14/18] i386: Add cache topology info in CPUCacheInfo, Zhao Liu, 2023/02/02
- [PATCH 17/18] i386: Use CPUCacheInfo.share_level to encode CPUID[0x8000001D].EAX[bits 25:14], Zhao Liu, 2023/02/02
- [PATCH 18/18] i386: Add new property to control L2 cache topo in CPUID.04H, Zhao Liu, 2023/02/02