Re: [PATCH v5 06/16] hw/i386: Update structures to save the number of nodes per package

[Igor Mammedov]

On Tue, 03 Mar 2020 13:57:30 -0600
Babu Moger <address@hidden> wrote:

> Update structures X86CPUTopoIDs and CPUX86State to hold the number of
> nodes per package. This is required to build EPYC mode topology.
> 
> Signed-off-by: Babu Moger <address@hidden>

Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  hw/i386/pc.c               |    1 +
>  hw/i386/x86.c              |    1 +
>  include/hw/i386/topology.h |    1 +
>  target/i386/cpu.c          |    1 +
>  target/i386/cpu.h          |    1 +
>  5 files changed, 5 insertions(+)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 68bf08f285..3d13cd46d6 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1526,6 +1526,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
>      init_topo_info(&topo_info, x86ms);
>  
>      env->nr_dies = x86ms->smp_dies;
> +    env->nr_nodes = topo_info.nodes_per_pkg;
>  
>      /*
>       * If APIC ID is not set,
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 79badcc4ec..929b80c9c7 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -62,6 +62,7 @@ inline void init_topo_info(X86CPUTopoInfo *topo_info,
>  {
>      MachineState *ms = MACHINE(x86ms);
>  
> +    topo_info->nodes_per_pkg = ms->numa_state->num_nodes / ms->smp.sockets;
>      topo_info->dies_per_pkg = x86ms->smp_dies;
>      topo_info->cores_per_die = 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 ba52d49079..04f01e2a09 100644
> --- a/include/hw/i386/topology.h
> +++ b/include/hw/i386/topology.h
> @@ -53,6 +53,7 @@ typedef struct X86CPUTopoIDs {
>  } X86CPUTopoIDs;
>  
>  typedef struct X86CPUTopoInfo {
> +    unsigned nodes_per_pkg;
>      unsigned dies_per_pkg;
>      unsigned cores_per_die;
>      unsigned threads_per_core;
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 1263271edd..40670f8aca 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -6829,6 +6829,7 @@ static void x86_cpu_initfn(Object *obj)
>      FeatureWord w;
>  
>      env->nr_dies = 1;
> +    env->nr_nodes = 1;
>      cpu_set_cpustate_pointers(cpu);
>  
>      object_property_add(obj, "family", "int",
> diff --git a/target/i386/cpu.h b/target/i386/cpu.h
> index 576f309bbf..20abbda647 100644
> --- a/target/i386/cpu.h
> +++ b/target/i386/cpu.h
> @@ -1607,6 +1607,7 @@ typedef struct CPUX86State {
>      TPRAccess tpr_access_type;
>  
>      unsigned nr_dies;
> +    unsigned nr_nodes;
>  } CPUX86State;
>  
>  struct kvm_msrs;
>