Hi Salil,
On 10/1/25 11:01 AM, salil.mehta@opnsrc.net wrote:
> From: Salil Mehta <salil.mehta@huawei.com>
>
> Store the user-specified topology (socket/cluster/core/thread) and derive a
> unique 'vcpu-id'. The 'vcpu-id' is used as the slot index in the possible vCPUs
> list when administratively enabling or disabling a vCPU.
>
> Co-developed-by: Keqian Zhu <zhukeqian1@huawei.com>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
> Reviewed-by: Miguel Luis <miguel.luis@oracle.com>
> ---
> hw/arm/virt.c | 10 ++++++++++
> include/hw/arm/virt.h | 36 ++++++++++++++++++++++++++++++++++++
> target/arm/cpu.c | 4 ++++
> target/arm/cpu.h | 4 ++++
> 4 files changed, 54 insertions(+)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 76f21bd56a..4ded19dc69 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2334,6 +2334,14 @@ static void machvirt_init(MachineState *machine)
> &error_fatal);
>
> aarch64 &= object_property_get_bool(cpuobj, "aarch64", NULL);
> + object_property_set_int(cpuobj, "socket-id", virt_get_socket_id(n),
> + NULL);
> + object_property_set_int(cpuobj, "cluster-id", virt_get_cluster_id(n),
> + NULL);
> + object_property_set_int(cpuobj, "core-id", virt_get_core_id(n),
> + NULL);
> + object_property_set_int(cpuobj, "thread-id", virt_get_thread_id(n),
> + NULL);
>
> if (!vms->secure) {
> object_property_set_bool(cpuobj, "has_el3", false, NULL);
> @@ -2902,6 +2910,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
> {
> int n;
> unsigned int max_cpus = ms->smp.max_cpus;
> + unsigned int smp_threads = ms->smp.threads;
> VirtMachineState *vms = VIRT_MACHINE(ms);
> MachineClass *mc = MACHINE_GET_CLASS(vms);
>
> @@ -2915,6 +2924,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)
> ms->possible_cpus->len = max_cpus;
> for (n = 0; n < ms->possible_cpus->len; n++) {
> ms->possible_cpus->cpus[n].type = ms->cpu_type;
> + ms->possible_cpus->cpus[n].vcpus_count = smp_threads;
> ms->possible_cpus->cpus[n].arch_id =
> virt_cpu_mp_affinity(vms, n);
>
> diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> index 365a28b082..683e4b965a 100644
> --- a/include/hw/arm/virt.h
> +++ b/include/hw/arm/virt.h
> @@ -213,4 +213,40 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms)
> vms->highmem_redists) ? 2 : 1;
> }
>
> +static inline int virt_get_socket_id(int cpu_index)
> +{
> + MachineState *ms = MACHINE(qdev_get_machine());
> +
> + assert(cpu_index >= 0 && cpu_index < ms->possible_cpus->len);
> +
> + return ms->possible_cpus->cpus[cpu_index].props.socket_id;
> +}
> +
> +static inline int virt_get_cluster_id(int cpu_index)
> +{
> + MachineState *ms = MACHINE(qdev_get_machine());
> +
> + assert(cpu_index >= 0 && cpu_index < ms->possible_cpus->len);
> +
> + return ms->possible_cpus->cpus[cpu_index].props.cluster_id;
> +}
> +
> +static inline int virt_get_core_id(int cpu_index)
> +{
> + MachineState *ms = MACHINE(qdev_get_machine());
> +
> + assert(cpu_index >= 0 && cpu_index < ms->possible_cpus->len);
> +
> + return ms->possible_cpus->cpus[cpu_index].props.core_id;
> +}
> +
> +static inline int virt_get_thread_id(int cpu_index)
> +{
> + MachineState *ms = MACHINE(qdev_get_machine());
> +
> + assert(cpu_index >= 0 && cpu_index < ms->possible_cpus->len);
> +
> + return ms->possible_cpus->cpus[cpu_index].props.thread_id;
> +}
> +
> #endif /* QEMU_ARM_VIRT_H */
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index 0c9a2e7ea4..7e0d5b2ed8 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -2607,6 +2607,10 @@ static const Property arm_cpu_properties[] = {
> DEFINE_PROP_UINT64("mp-affinity", ARMCPU,
> mp_affinity, ARM64_AFFINITY_INVALID),
> DEFINE_PROP_INT32("node-id", ARMCPU, node_id, CPU_UNSET_NUMA_NODE_ID),
> + DEFINE_PROP_INT32("socket-id", ARMCPU, socket_id, 0),
> + DEFINE_PROP_INT32("cluster-id", ARMCPU, cluster_id, 0),
> + DEFINE_PROP_INT32("core-id", ARMCPU, core_id, 0),
> + DEFINE_PROP_INT32("thread-id", ARMCPU, thread_id, 0),
> DEFINE_PROP_INT32("core-count", ARMCPU, core_count, -1),
> /* True to default to the backward-compat old CNTFRQ rather than 1Ghz */
> DEFINE_PROP_BOOL("backcompat-cntfrq", ARMCPU, backcompat_cntfrq, false),
SMPCompatProps::clusters_supported isn't always true on ARM platforms. Is it safe
to add "cluster-id" property to ARM CPU, which is available to all ARM platforms?
Thanks,
Gavin
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index dc9b6dce4c..cd5982d362 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -1126,6 +1126,10 @@ struct ArchCPU {
> QLIST_HEAD(, ARMELChangeHook) el_change_hooks;
>
> int32_t node_id; /* NUMA node this CPU belongs to */
> + int32_t socket_id;
> + int32_t cluster_id;
> + int32_t core_id;
> + int32_t thread_id;
>
> /* Used to synchronize KVM and QEMU in-kernel device levels */
> uint8_t device_irq_level;