spapr: ensure that all threads within core are on the same NUMA node
Threads within a core shouldn't be on different
NUMA nodes, so if user has misconfgured command
line, fail QEMU at start up to force user fix it.
For now use the first thread on the core as source
of core's node-id. Later when cpu-numa refactoring
lands it will be switched to core's node-id from
possible_cpus[].
This prevents the same problems as commit 20bb648d
"spapr: Fix default NUMA node allocation for threads",
but for the case of manually configured NUMA node
mappings, instead of just the default case.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
7ea6e06717
commit
17b7c39e27
|
@ -63,8 +63,6 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
CPUPPCState *env = &cpu->env;
|
CPUPPCState *env = &cpu->env;
|
||||||
CPUState *cs = CPU(cpu);
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* Set time-base frequency to 512 MHz */
|
/* Set time-base frequency to 512 MHz */
|
||||||
cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
|
cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
|
||||||
|
@ -82,12 +80,6 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set NUMA node for the added CPUs */
|
|
||||||
i = numa_get_node_for_cpu(cs->cpu_index);
|
|
||||||
if (i < nb_numa_nodes) {
|
|
||||||
cs->numa_node = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
xics_cpu_setup(XICS_FABRIC(spapr), cpu);
|
xics_cpu_setup(XICS_FABRIC(spapr), cpu);
|
||||||
|
|
||||||
qemu_register_reset(spapr_cpu_reset, cpu);
|
qemu_register_reset(spapr_cpu_reset, cpu);
|
||||||
|
@ -171,11 +163,13 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
||||||
const char *typename = object_class_get_name(scc->cpu_class);
|
const char *typename = object_class_get_name(scc->cpu_class);
|
||||||
size_t size = object_type_get_instance_size(typename);
|
size_t size = object_type_get_instance_size(typename);
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
int core_node_id = numa_get_node_for_cpu(cc->core_id);;
|
||||||
void *obj;
|
void *obj;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
sc->threads = g_malloc0(size * cc->nr_threads);
|
sc->threads = g_malloc0(size * cc->nr_threads);
|
||||||
for (i = 0; i < cc->nr_threads; i++) {
|
for (i = 0; i < cc->nr_threads; i++) {
|
||||||
|
int node_id;
|
||||||
char id[32];
|
char id[32];
|
||||||
CPUState *cs;
|
CPUState *cs;
|
||||||
|
|
||||||
|
@ -184,6 +178,19 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
||||||
object_initialize(obj, size, typename);
|
object_initialize(obj, size, typename);
|
||||||
cs = CPU(obj);
|
cs = CPU(obj);
|
||||||
cs->cpu_index = cc->core_id + i;
|
cs->cpu_index = cc->core_id + i;
|
||||||
|
|
||||||
|
/* Set NUMA node for the added CPUs */
|
||||||
|
node_id = numa_get_node_for_cpu(cs->cpu_index);
|
||||||
|
if (node_id != core_node_id) {
|
||||||
|
error_setg(&local_err, "Invalid node-id=%d of thread[cpu-index: %d]"
|
||||||
|
" on CPU[core-id: %d, node-id: %d], node-id must be the same",
|
||||||
|
node_id, cs->cpu_index, cc->core_id, core_node_id);
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
if (node_id < nb_numa_nodes) {
|
||||||
|
cs->numa_node = node_id;
|
||||||
|
}
|
||||||
|
|
||||||
snprintf(id, sizeof(id), "thread[%d]", i);
|
snprintf(id, sizeof(id), "thread[%d]", i);
|
||||||
object_property_add_child(OBJECT(sc), id, obj, &local_err);
|
object_property_add_child(OBJECT(sc), id, obj, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
|
|
Loading…
Reference in a new issue