[Qemu-devel] [PATCH v2] numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node

[Qemu-devel] [PATCH v2] numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node

[Tao Xu]

Add MachineClass::auto_enable_numa field. When it is true, a NUMA node
is expected to be created implicitly.

Acked-by: David Gibson <david@gibson.dropbear.id.au>
Suggested-by: Igor Mammedov <imammedo@redhat.com>
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tao Xu <tao3.xu@intel.com>
---

Note: Parameter -numa node,mem is deprecated too. So I set
"numa_info[0].node_mem = ram_size" instead of
"NumaNodeOptions node = { .mem = ram_size }".

Changes in v2:
    - Fix the qtest error, avoid using numa_auto_assign_ram.
---
 hw/core/numa.c      | 10 ++++++++--
 hw/ppc/spapr.c      |  9 +--------
 include/hw/boards.h |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hw/core/numa.c b/hw/core/numa.c
index 4dfec5c95b..038c96d4ab 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -378,11 +378,17 @@ void numa_complete_configuration(MachineState *ms)
      *   guest tries to use it with that drivers.
      *
      * Enable NUMA implicitly by adding a new NUMA node automatically.
+     *
+     * Or if MachineClass::auto_enable_numa is true and no NUMA nodes,
+     * assume there is just one node with whole RAM.
      */
-    if (ms->ram_slots > 0 && ms->numa_state->num_nodes == 0 &&
-        mc->auto_enable_numa_with_memhp) {
+    if (ms->numa_state->num_nodes == 0 &&
+        ((ms->ram_slots > 0 &&
+        mc->auto_enable_numa_with_memhp) ||
+        mc->auto_enable_numa)) {
             NumaNodeOptions node = { };
             parse_numa_node(ms, &node, &error_abort);
+            numa_info[0].node_mem = ram_size;
     }
 
     assert(max_numa_nodeid <= MAX_NODES);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 222a325056..f760e0f5d7 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -405,14 +405,6 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
     hwaddr mem_start, node_size;
     int i, nb_nodes = machine->numa_state->num_nodes;
     NodeInfo *nodes = machine->numa_state->nodes;
-    NodeInfo ramnode;
-
-    /* No NUMA nodes, assume there is just one node with whole RAM */
-    if (!nb_nodes) {
-        nb_nodes = 1;
-        ramnode.node_mem = machine->ram_size;
-        nodes = &ramnode;
-    }
 
     for (i = 0, mem_start = 0; i < nb_nodes; ++i) {
         if (!nodes[i].node_mem) {
@@ -4477,6 +4469,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
      */
     mc->numa_mem_align_shift = 28;
     mc->numa_mem_supported = true;
+    mc->auto_enable_numa = true;
 
     smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;
     smc->default_caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_ON;
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 2289536e48..481e69388e 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -221,6 +221,7 @@ struct MachineClass {
     bool smbus_no_migration_support;
     bool nvdimm_supported;
     bool numa_mem_supported;
+    bool auto_enable_numa;
 
     HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
                                            DeviceState *dev);
-- 
2.20.1

Re: [Qemu-devel] [PATCH v2] numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node

[Tao Xu]

Gentle ping.

On 9/5/2019 4:32 PM, Xu, Tao3 wrote:
> Add MachineClass::auto_enable_numa field. When it is true, a NUMA node
> is expected to be created implicitly.
> 
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Suggested-by: Igor Mammedov <imammedo@redhat.com>
> Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Tao Xu <tao3.xu@intel.com>
> ---
> 
> Note: Parameter -numa node,mem is deprecated too. So I set
> "numa_info[0].node_mem = ram_size" instead of
> "NumaNodeOptions node = { .mem = ram_size }".
> 
> Changes in v2:
>      - Fix the qtest error, avoid using numa_auto_assign_ram.
> ---
>   hw/core/numa.c      | 10 ++++++++--
>   hw/ppc/spapr.c      |  9 +--------
>   include/hw/boards.h |  1 +
>   3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/core/numa.c b/hw/core/numa.c
> index 4dfec5c95b..038c96d4ab 100644
> --- a/hw/core/numa.c
> +++ b/hw/core/numa.c
> @@ -378,11 +378,17 @@ void numa_complete_configuration(MachineState *ms)
>        *   guest tries to use it with that drivers.
>        *
>        * Enable NUMA implicitly by adding a new NUMA node automatically.
> +     *
> +     * Or if MachineClass::auto_enable_numa is true and no NUMA nodes,
> +     * assume there is just one node with whole RAM.
>        */
> -    if (ms->ram_slots > 0 && ms->numa_state->num_nodes == 0 &&
> -        mc->auto_enable_numa_with_memhp) {
> +    if (ms->numa_state->num_nodes == 0 &&
> +        ((ms->ram_slots > 0 &&
> +        mc->auto_enable_numa_with_memhp) ||
> +        mc->auto_enable_numa)) {
>               NumaNodeOptions node = { };
>               parse_numa_node(ms, &node, &error_abort);
> +            numa_info[0].node_mem = ram_size;
>       }
>   
>       assert(max_numa_nodeid <= MAX_NODES);
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 222a325056..f760e0f5d7 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -405,14 +405,6 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
>       hwaddr mem_start, node_size;
>       int i, nb_nodes = machine->numa_state->num_nodes;
>       NodeInfo *nodes = machine->numa_state->nodes;
> -    NodeInfo ramnode;
> -
> -    /* No NUMA nodes, assume there is just one node with whole RAM */
> -    if (!nb_nodes) {
> -        nb_nodes = 1;
> -        ramnode.node_mem = machine->ram_size;
> -        nodes = &ramnode;
> -    }
>   
>       for (i = 0, mem_start = 0; i < nb_nodes; ++i) {
>           if (!nodes[i].node_mem) {
> @@ -4477,6 +4469,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
>        */
>       mc->numa_mem_align_shift = 28;
>       mc->numa_mem_supported = true;
> +    mc->auto_enable_numa = true;
>   
>       smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;
>       smc->default_caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_ON;
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 2289536e48..481e69388e 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -221,6 +221,7 @@ struct MachineClass {
>       bool smbus_no_migration_support;
>       bool nvdimm_supported;
>       bool numa_mem_supported;
> +    bool auto_enable_numa;
>   
>       HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
>                                              DeviceState *dev);
> 

Re: [PATCH v2] numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node

[Tao Xu]

Hi Eduardo,

How about this version of patch? Last month this patch is reverted from 
pull request. And I submitted this version.

Tao

On 9/5/2019 4:32 PM, Xu, Tao3 wrote:
> Add MachineClass::auto_enable_numa field. When it is true, a NUMA node
> is expected to be created implicitly.
> 
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Suggested-by: Igor Mammedov <imammedo@redhat.com>
> Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Tao Xu <tao3.xu@intel.com>
> ---
> 
> Note: Parameter -numa node,mem is deprecated too. So I set
> "numa_info[0].node_mem = ram_size" instead of
> "NumaNodeOptions node = { .mem = ram_size }".
> 
> Changes in v2:
>      - Fix the qtest error, avoid using numa_auto_assign_ram.
> ---
>   hw/core/numa.c      | 10 ++++++++--
>   hw/ppc/spapr.c      |  9 +--------
>   include/hw/boards.h |  1 +
>   3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/core/numa.c b/hw/core/numa.c
> index 4dfec5c95b..038c96d4ab 100644
> --- a/hw/core/numa.c
> +++ b/hw/core/numa.c
> @@ -378,11 +378,17 @@ void numa_complete_configuration(MachineState *ms)
>        *   guest tries to use it with that drivers.
>        *
>        * Enable NUMA implicitly by adding a new NUMA node automatically.
> +     *
> +     * Or if MachineClass::auto_enable_numa is true and no NUMA nodes,
> +     * assume there is just one node with whole RAM.
>        */
> -    if (ms->ram_slots > 0 && ms->numa_state->num_nodes == 0 &&
> -        mc->auto_enable_numa_with_memhp) {
> +    if (ms->numa_state->num_nodes == 0 &&
> +        ((ms->ram_slots > 0 &&
> +        mc->auto_enable_numa_with_memhp) ||
> +        mc->auto_enable_numa)) {
>               NumaNodeOptions node = { };
>               parse_numa_node(ms, &node, &error_abort);
> +            numa_info[0].node_mem = ram_size;
>       }
>   
>       assert(max_numa_nodeid <= MAX_NODES);
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 222a325056..f760e0f5d7 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -405,14 +405,6 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
>       hwaddr mem_start, node_size;
>       int i, nb_nodes = machine->numa_state->num_nodes;
>       NodeInfo *nodes = machine->numa_state->nodes;
> -    NodeInfo ramnode;
> -
> -    /* No NUMA nodes, assume there is just one node with whole RAM */
> -    if (!nb_nodes) {
> -        nb_nodes = 1;
> -        ramnode.node_mem = machine->ram_size;
> -        nodes = &ramnode;
> -    }
>   
>       for (i = 0, mem_start = 0; i < nb_nodes; ++i) {
>           if (!nodes[i].node_mem) {
> @@ -4477,6 +4469,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
>        */
>       mc->numa_mem_align_shift = 28;
>       mc->numa_mem_supported = true;
> +    mc->auto_enable_numa = true;
>   
>       smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;
>       smc->default_caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_ON;
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 2289536e48..481e69388e 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -221,6 +221,7 @@ struct MachineClass {
>       bool smbus_no_migration_support;
>       bool nvdimm_supported;
>       bool numa_mem_supported;
> +    bool auto_enable_numa;
>   
>       HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
>                                              DeviceState *dev);
> 

Re: [PATCH v2] numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node

[Eduardo Habkost]

On Tue, Sep 24, 2019 at 11:34:40AM +0800, Tao Xu wrote:
> Hi Eduardo,
> 
> How about this version of patch? Last month this patch is reverted from pull
> request. And I submitted this version.

Sorry for taking so long to reply.  I will queue it this week.

-- 
Eduardo