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

spapr_numa.c: FORM2 table handle nodes with no distance info 

A configuration that specifies multiple nodes without distance info
results in the non-local points in the FORM2 matrix having a distance of
0. This causes Linux to complain "Invalid distance value range" because
a node distance is smaller than the local distance.

Fix this by building a simple local / remote fallback for points where
distance information is missing.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20211105135137.1584840-1-npiggin@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Nicholas Piggin 2021-11-05 23:51:37 +10:00 committed by David Gibson
parent 14fe3222e5
commit 71e6fae3a9
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/ppc/spapr_numa.c
View File

@ -546,12 +546,24 @@ static void spapr_numa_FORM2_write_rtas_tables(SpaprMachineState *spapr,
* NUMA nodes, but QEMU adds the default NUMA node without * NUMA nodes, but QEMU adds the default NUMA node without
* adding the numa_info to retrieve distance info from. * adding the numa_info to retrieve distance info from.
*/ */
if (src == dst) { distance_table[i] = numa_info[src].distance[dst];
distance_table[i++] = NUMA_DISTANCE_MIN; if (distance_table[i] == 0) {
continue; /*
* In case QEMU adds a default NUMA single node when the user
* did not add any, or where the user did not supply distances,
* the value will be 0 here. Populate the table with a fallback
* simple local / remote distance.
*/
if (src == dst) {
distance_table[i] = NUMA_DISTANCE_MIN;
} else {
distance_table[i] = numa_info[src].distance[dst];
if (distance_table[i] < NUMA_DISTANCE_MIN) {
distance_table[i] = NUMA_DISTANCE_DEFAULT;
}
}
} }
i++;
distance_table[i++] = numa_info[src].distance[dst];
} }
} }