haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node

Browse source 
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>
Message-Id: <20190905083238.1799-1-tao3.xu@intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Tao Xu 2019-09-05 16:32:38 +08:00 committed by Eduardo Habkost
parent 021a007efc
commit 0533ef5f20
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hw/core/numa.c
View file

@ -378,11 +378,17 @@ void numa_complete_configuration(MachineState *ms)
* guest tries to use it with that drivers. * guest tries to use it with that drivers.
* *
* Enable NUMA implicitly by adding a new NUMA node automatically. * 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 && if (ms->numa_state->num_nodes == 0 &&
mc->auto_enable_numa_with_memhp) { ((ms->ram_slots > 0 &&
mc->auto_enable_numa_with_memhp) ||
mc->auto_enable_numa)) {
NumaNodeOptions node = { }; NumaNodeOptions node = { };
parse_numa_node(ms, &node, &error_abort); parse_numa_node(ms, &node, &error_abort);
numa_info[0].node_mem = ram_size;
} }
assert(max_numa_nodeid <= MAX_NODES); assert(max_numa_nodeid <= MAX_NODES);

9
hw/ppc/spapr.c
View file

@ -346,14 +346,6 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
hwaddr mem_start, node_size; hwaddr mem_start, node_size;
int i, nb_nodes = machine->numa_state->num_nodes; int i, nb_nodes = machine->numa_state->num_nodes;
NodeInfo *nodes = machine->numa_state->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) { for (i = 0, mem_start = 0; i < nb_nodes; ++i) {
if (!nodes[i].node_mem) { if (!nodes[i].node_mem) {
@ -4430,6 +4422,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
*/ */
mc->numa_mem_align_shift = 28; mc->numa_mem_align_shift = 28;
mc->numa_mem_supported = true; 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_HTM] = SPAPR_CAP_OFF;
smc->default_caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_ON; smc->default_caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_ON;

1
include/hw/boards.h
View file

@ -228,6 +228,7 @@ struct MachineClass {
bool smbus_no_migration_support; bool smbus_no_migration_support;
bool nvdimm_supported; bool nvdimm_supported;
bool numa_mem_supported; bool numa_mem_supported;
bool auto_enable_numa;
HotplugHandler *(*get_hotplug_handler)(MachineState *machine, HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
DeviceState *dev); DeviceState *dev);