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

spapr_numa.c: fixes in spapr_numa_FORM2_write_rtas_tables() 

This patch has a handful of modifications for the recent added
FORM2 support:

- to not allocate more than the necessary size in 'distance_table'.
At this moment the array is oversized due to allocating uint32_t for
all elements, when most of them fits in an uint8_t. Fix it by
changing the array to uint8_t and allocating the exact size;

- use stl_be_p() to store the uint32_t at the start of 'distance_table';

- use sizeof(uint32_t) to skip the uint32_t length when populating the
distances;

- use the NUMA_DISTANCE_MIN macro from sysemu/numa.h to avoid hardcoding
the local distance value.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20210922122852.130054-2-danielhb413@gmail.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Daniel Henrique Barboza 2021-09-22 09:28:52 -03:00 committed by David Gibson
parent 06caae8af0
commit 28d86252fc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/ppc/spapr_numa.c
View File

@ -502,9 +502,8 @@ static void spapr_numa_FORM2_write_rtas_tables(SpaprMachineState *spapr,
int nb_numa_nodes = ms->numa_state->num_nodes; int nb_numa_nodes = ms->numa_state->num_nodes;
int distance_table_entries = nb_numa_nodes * nb_numa_nodes; int distance_table_entries = nb_numa_nodes * nb_numa_nodes;
g_autofree uint32_t *lookup_index_table = NULL; g_autofree uint32_t *lookup_index_table = NULL;
g_autofree uint32_t *distance_table = NULL; g_autofree uint8_t *distance_table = NULL;
int src, dst, i, distance_table_size; int src, dst, i, distance_table_size;
uint8_t *node_distances;
/* /*
* ibm,numa-lookup-index-table: array with length and a * ibm,numa-lookup-index-table: array with length and a
@ -531,11 +530,13 @@ static void spapr_numa_FORM2_write_rtas_tables(SpaprMachineState *spapr,
* array because NUMA ids can be sparse (node 0 is the first, * array because NUMA ids can be sparse (node 0 is the first,
* node 8 is the second ...). * node 8 is the second ...).
*/ */
distance_table = g_new0(uint32_t, distance_table_entries + 1); distance_table_size = distance_table_entries * sizeof(uint8_t) +
distance_table[0] = cpu_to_be32(distance_table_entries); sizeof(uint32_t);
distance_table = g_new0(uint8_t, distance_table_size);
stl_be_p(distance_table, distance_table_entries);
node_distances = (uint8_t *)&distance_table[1]; /* Skip the uint32_t array length at the start */
i = 0; i = sizeof(uint32_t);
for (src = 0; src < nb_numa_nodes; src++) { for (src = 0; src < nb_numa_nodes; src++) {
for (dst = 0; dst < nb_numa_nodes; dst++) { for (dst = 0; dst < nb_numa_nodes; dst++) {
@ -546,16 +547,14 @@ static void spapr_numa_FORM2_write_rtas_tables(SpaprMachineState *spapr,
* adding the numa_info to retrieve distance info from. * adding the numa_info to retrieve distance info from.
*/ */
if (src == dst) { if (src == dst) {
node_distances[i++] = 10; distance_table[i++] = NUMA_DISTANCE_MIN;
continue; continue;
} }
node_distances[i++] = numa_info[src].distance[dst]; distance_table[i++] = numa_info[src].distance[dst];
} }
} }
distance_table_size = distance_table_entries * sizeof(uint8_t) +
sizeof(uint32_t);
_FDT(fdt_setprop(fdt, rtas, "ibm,numa-distance-table", _FDT(fdt_setprop(fdt, rtas, "ibm,numa-distance-table",
distance_table, distance_table_size)); distance_table, distance_table_size));
} }