numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node
PATCH v2 1/1 numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node
Add MachineClass::auto_enable_numa field. When it is true, a NUMA node is expected to be created implicitly.
---
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(-)
hw/core/numa.c +8 -2
@@ -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 );
hw/ppc/spapr.c +1 -8
@@ -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 ;
include/hw/boards.h +1 -0
@@ -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);
Signature · 1 line
2.20.1
Gentle ping.
Quoted 86 lines · On 9/5/2019 4:32 PM, Xu, Tao3 wrote:
Add
MachineClass::auto_enable_numafield. When it is true, a NUMA node is expected to be created implicitly.Acked-by David Gibson <[email protected]>Suggested-by Igor Mammedov <[email protected]>Suggested-by Eduardo Habkost <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Signed-off-by Tao Xu <[email protected]>---
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 usingnuma_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(-)hw/core/numa.c +8
-2@@ -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 );hw/ppc/spapr.c +1
-8@@ -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 ;include/hw/boards.h +1
-0@@ -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);
Hi Eduardo,
How about this version of patch? Last month this patch is reverted from pull request. And I submitted this version.
Tao
Quoted 86 lines · On 9/5/2019 4:32 PM, Xu, Tao3 wrote:
Add
MachineClass::auto_enable_numafield. When it is true, a NUMA node is expected to be created implicitly.Acked-by David Gibson <[email protected]>Suggested-by Igor Mammedov <[email protected]>Suggested-by Eduardo Habkost <[email protected]>Reviewed-by Igor Mammedov <[email protected]>Signed-off-by Tao Xu <[email protected]>---
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 usingnuma_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(-)hw/core/numa.c +8
-2@@ -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 );hw/ppc/spapr.c +1
-8@@ -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 ;include/hw/boards.h +1
-0@@ -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);
Quoted 4 lines · Tao Xu
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.
Signature · 1 line
Eduardo