Hi Zhao,
On 8/1/23 05:35, Zhao Liu wrote:
> From: Zhuocheng Ding <zhuocheng.d...@intel.com>
>
> We introduce cluster-id other than module-id to be consistent with
s/We introduce/Introduce/
Thanks
Babu
> 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.d...@intel.com>
> Co-developed-by: Zhao Liu <zhao1....@intel.com>
> Signed-off-by: Zhao Liu <zhao1....@intel.com>
> Acked-by: Michael S. Tsirkin <m...@redhat.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 0b460fd6074d..8154b86f95c7 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -328,6 +328,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;
> @@ -344,6 +352,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;
> @@ -363,16 +379,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);
> }
>
> @@ -419,6 +428,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 d6969813ee02..ffa282219078 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -7806,12 +7806,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 5e97d0b76574..d9577938ae04 100644
> --- a/target/i386/cpu.h
> +++ b/target/i386/cpu.h
> @@ -2034,6 +2034,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;
>
--
Thanks
Babu Moger
