[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/10] numa: move default mapping init to machine
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 03/10] numa: move default mapping init to machine |
Date: |
Mon, 5 Jun 2017 15:59:20 -0300 |
From: Igor Mammedov <address@hidden>
there is no need use cpu_index_to_instance_props() for setting
default cpu -> node mapping. Generic machine code can do it
without cpu_index by just enabling already preset defaults
in possible_cpus.
PS:
as bonus it makes one less user of cpu_index_to_instance_props()
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/core/machine.c | 33 +++++++++++++++++++++++----------
numa.c | 26 --------------------------
2 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 3adebf14c4..c1434e6a69 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -701,26 +701,39 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
return g_string_free(s, false);
}
-static void machine_numa_validate(MachineState *machine)
+static void machine_numa_finish_init(MachineState *machine)
{
int i;
+ bool default_mapping;
GString *s = g_string_new(NULL);
MachineClass *mc = MACHINE_GET_CLASS(machine);
const CPUArchIdList *possible_cpus = mc->possible_cpu_arch_ids(machine);
assert(nb_numa_nodes);
for (i = 0; i < possible_cpus->len; i++) {
+ if (possible_cpus->cpus[i].props.has_node_id) {
+ break;
+ }
+ }
+ default_mapping = (i == possible_cpus->len);
+
+ for (i = 0; i < possible_cpus->len; i++) {
const CPUArchId *cpu_slot = &possible_cpus->cpus[i];
- /* at this point numa mappings are initilized by CLI options
- * or with default mappings so it's sufficient to list
- * all not yet mapped CPUs here */
- /* TODO: make it hard error in future */
if (!cpu_slot->props.has_node_id) {
- char *cpu_str = cpu_slot_to_string(cpu_slot);
- g_string_append_printf(s, "%sCPU %d [%s]", s->len ? ", " : "", i,
- cpu_str);
- g_free(cpu_str);
+ if (default_mapping) {
+ /* fetch default mapping from board and enable it */
+ CpuInstanceProperties props = cpu_slot->props;
+ props.has_node_id = true;
+ machine_set_cpu_numa_node(machine, &props, &error_fatal);
+ } else {
+ /* record slots with not set mapping,
+ * TODO: make it hard error in future */
+ char *cpu_str = cpu_slot_to_string(cpu_slot);
+ g_string_append_printf(s, "%sCPU %d [%s]",
+ s->len ? ", " : "", i, cpu_str);
+ g_free(cpu_str);
+ }
}
}
if (s->len && !qtest_enabled()) {
@@ -738,7 +751,7 @@ void machine_run_board_init(MachineState *machine)
MachineClass *machine_class = MACHINE_GET_CLASS(machine);
if (nb_numa_nodes) {
- machine_numa_validate(machine);
+ machine_numa_finish_init(machine);
}
machine_class->init(machine);
}
diff --git a/numa.c b/numa.c
index 1c35a79b57..4ec3eaf687 100644
--- a/numa.c
+++ b/numa.c
@@ -426,7 +426,6 @@ void numa_default_auto_assign_ram(MachineClass *mc,
NodeInfo *nodes,
void parse_numa_opts(MachineState *ms)
{
int i;
- const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(ms);
if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
@@ -484,31 +483,6 @@ void parse_numa_opts(MachineState *ms)
numa_set_mem_ranges();
- /* assign CPUs to nodes using board provided default mapping */
- if (!mc->cpu_index_to_instance_props || !mc->possible_cpu_arch_ids) {
- error_report("default CPUs to NUMA node mapping isn't supported");
- exit(1);
- }
-
- possible_cpus = mc->possible_cpu_arch_ids(ms);
- for (i = 0; i < possible_cpus->len; i++) {
- if (possible_cpus->cpus[i].props.has_node_id) {
- break;
- }
- }
-
- /* no CPUs are assigned to NUMA nodes */
- if (i == possible_cpus->len) {
- for (i = 0; i < max_cpus; i++) {
- CpuInstanceProperties props;
- /* fetch default mapping from board and enable it */
- props = mc->cpu_index_to_instance_props(ms, i);
- props.has_node_id = true;
-
- machine_set_cpu_numa_node(ms, &props, &error_fatal);
- }
- }
-
/* QEMU needs at least all unique node pair distances to build
* the whole NUMA distance table. QEMU treats the distance table
* as symmetric by default, i.e. distance A->B == distance B->A.
--
2.11.0.259.g40922b1
- [Qemu-devel] [PULL 00/10] x86 and machine queue, 2017-06-05, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 01/10] pc: Use "min-[x]level" on compat_props, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 02/10] numa: consolidate cpu_preplug fixups/checks for pc/arm/spapr, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 03/10] numa: move default mapping init to machine,
Eduardo Habkost <=
- [Qemu-devel] [PULL 04/10] numa: make sure that all cpus have has_node_id set if numa is enabled, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 05/10] numa: make hmp 'info numa' fetch numa nodes from qmp_query_cpus() result, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 06/10] numa: move numa_node from CPUState into target specific classes, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 07/10] spapr: cleanup spapr_fixup_cpu_numa_dt() usage, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 09/10] qemu.py: Add QEMUMachine.exitcode() method, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 08/10] qemu.py: Don't set _popen=None on error/shutdown, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 10/10] scripts: Test script to look for -device crashes, Eduardo Habkost, 2017/06/05
- Re: [Qemu-devel] [PULL 00/10] x86 and machine queue, 2017-06-05, Peter Maydell, 2017/06/06