Re: [Qemu-devel] [PATCH v2 08/24] virt-arm: add node-id property to CPU

[Andrew Jones]

On Wed, May 03, 2017 at 02:57:02PM +0200, Igor Mammedov wrote:
> it will allow switching from cpu_index to property based
> numa mapping in follow up patches.
> 
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
>  hw/arm/virt.c    | 15 +++++++++++++++
>  target/arm/cpu.c |  1 +
>  2 files changed, 16 insertions(+)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 3e19b5f..05a2822 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1350,6 +1350,7 @@ static void machvirt_init(MachineState *machine)
>      for (n = 0; n < possible_cpus->len; n++) {
>          Object *cpuobj;
>          CPUState *cs;
> +        int node_id;
>  
>          if (n >= smp_cpus) {
>              break;
> @@ -1362,6 +1363,20 @@ static void machvirt_init(MachineState *machine)
>          cs = CPU(cpuobj);
>          cs->cpu_index = n;
>  
> +        node_id = numa_get_node_for_cpu(cs->cpu_index);
> +        if (node_id == nb_numa_nodes) {
> +            /* by default CPUState::numa_node was 0 if it's not set via CLI
> +             * keep it this way for now but in future we probably should
> +             * refuse to start up with incomplete numa mapping */
> +             node_id = 0;
> +        }
> +        if (cs->numa_node == CPU_UNSET_NUMA_NODE_ID) {
> +            cs->numa_node = node_id;
> +        } else {
> +            /* CPU isn't device_add compatible yet, this shouldn't happen */
> +            error_setg(&error_abort, "user set node-id not implemented");
> +        }
> +
>          if (!vms->secure) {
>              object_property_set_bool(cpuobj, false, "has_el3", NULL);
>          }
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index ee1406d..c185eb1 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -1573,6 +1573,7 @@ static Property arm_cpu_properties[] = {
>      DEFINE_PROP_UINT32("midr", ARMCPU, midr, 0),
>      DEFINE_PROP_UINT64("mp-affinity", ARMCPU,
>                          mp_affinity, ARM64_AFFINITY_INVALID),
> +    DEFINE_PROP_INT32("node-id", CPUState, numa_node, 
> CPU_UNSET_NUMA_NODE_ID),
>      DEFINE_PROP_END_OF_LIST()
>  };
>  
> -- 
> 2.7.4
>

Reviewed-by: Andrew Jones <address@hidden>