OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

numa: move default mapping init to machine

Browse Source 
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 <imammedo@redhat.com>
Message-Id: <1496161442-96665-3-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-05-30 18:23:57 +02:00 committed by Eduardo Habkost
parent a0ceb640d0
commit 60bed6a30a
2 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/core/machine.c
View File

@ -701,26 +701,39 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
return g_string_free(s, false); return g_string_free(s, false);
} }
static void machine_numa_validate(MachineState *machine) static void machine_numa_finish_init(MachineState *machine)
{ {
int i; int i;
bool default_mapping;
GString *s = g_string_new(NULL); GString *s = g_string_new(NULL);
MachineClass *mc = MACHINE_GET_CLASS(machine); MachineClass *mc = MACHINE_GET_CLASS(machine);
const CPUArchIdList *possible_cpus = mc->possible_cpu_arch_ids(machine); const CPUArchIdList *possible_cpus = mc->possible_cpu_arch_ids(machine);
assert(nb_numa_nodes); 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++) { for (i = 0; i < possible_cpus->len; i++) {
const CPUArchId *cpu_slot = &possible_cpus->cpus[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) { if (!cpu_slot->props.has_node_id) {
char *cpu_str = cpu_slot_to_string(cpu_slot); if (default_mapping) {
g_string_append_printf(s, "%sCPU %d [%s]", s->len ? ", " : "", i, /* fetch default mapping from board and enable it */
cpu_str); CpuInstanceProperties props = cpu_slot->props;
g_free(cpu_str); 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()) { if (s->len && !qtest_enabled()) {
@ -738,7 +751,7 @@ void machine_run_board_init(MachineState *machine)
MachineClass *machine_class = MACHINE_GET_CLASS(machine); MachineClass *machine_class = MACHINE_GET_CLASS(machine);
if (nb_numa_nodes) { if (nb_numa_nodes) {
machine_numa_validate(machine); machine_numa_finish_init(machine);
} }
machine_class->init(machine); machine_class->init(machine);
} }

26
numa.c
View File

@ -426,7 +426,6 @@ void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,
void parse_numa_opts(MachineState *ms) void parse_numa_opts(MachineState *ms)
{ {
int i; int i;
const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) { 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(); 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 /* QEMU needs at least all unique node pair distances to build
* the whole NUMA distance table. QEMU treats the distance table * the whole NUMA distance table. QEMU treats the distance table
* as symmetric by default, i.e. distance A->B == distance B->A. * as symmetric by default, i.e. distance A->B == distance B->A.