| Message ID | 20200924195058.362984-4-danielhb413@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pseries NUMA distance calculation | expand |
On Thu, Sep 24, 2020 at 04:50:55PM -0300, Daniel Henrique Barboza wrote: > QEMU allows the user to set NUMA distances in the command line. > For ACPI architectures like x86, this means that user input is > used to populate the SLIT table, and the guest perceives the > distances as the user chooses to. > > PPC64 does not work that way. In the PAPR concept of NUMA, > associativity relations between the NUMA nodes are provided by > the device tree, and the guest kernel is free to calculate the > distances as it sees fit. Given how ACPI architectures works, > this puts the pSeries machine in a strange spot - users expect > to define NUMA distances like in the ACPI case, but QEMU does > not have control over it. To give pSeries users a similar > experience, we'll need to bring kernel specifics to QEMU > to approximate the NUMA distances. > > The pSeries kernel works with the NUMA distance range 10, > 20, 40, 80 and 160. The code starts at 10 (local distance) and > searches for a match in the first NUMA level between the > resources. If there is no match, the distance is doubled and > then it proceeds to try to match in the next NUMA level. Rinse > and repeat for MAX_DISTANCE_REF_POINTS levels. > > This patch introduces a spapr_numa_PAPRify_distances() helper > that translates the user distances to kernel distance, which > we're going to use to determine the associativity domains for > the NUMA nodes. > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> The idea of rounding the distances like this seems pretty good to me. Since each level is a multiple of a distance from the preivous one it might be more theoretically correct to place the thresholds at the geometric mean between each level, rather than the arithmetic mean. I very much doubt it makes much different in practice though, and this is simpler. There is one nit, I'm less happy with though.. > --- > hw/ppc/spapr_numa.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c > index fe395e80a3..990a5fce08 100644 > --- a/hw/ppc/spapr_numa.c > +++ b/hw/ppc/spapr_numa.c > @@ -37,6 +37,49 @@ static bool spapr_numa_is_symmetrical(MachineState *ms) > return true; > } > > +/* > + * This function will translate the user distances into > + * what the kernel understand as possible values: 10 > + * (local distance), 20, 40, 80 and 160. Current heuristic > + * is: > + * > + * - distances between 11 and 30 inclusive -> rounded to 20 > + * - distances between 31 and 60 inclusive -> rounded to 40 > + * - distances between 61 and 120 inclusive -> rounded to 80 > + * - everything above 120 -> 160 > + * > + * This step can also be done in the same time as the NUMA > + * associativity domains calculation, at the cost of extra > + * complexity. We chose to keep it simpler. > + * > + * Note: this will overwrite the distance values in > + * ms->numa_state->nodes. > + */ > +static void spapr_numa_PAPRify_distances(MachineState *ms) > +{ > + int src, dst; > + int nb_numa_nodes = ms->numa_state->num_nodes; > + NodeInfo *numa_info = ms->numa_state->nodes; > + > + for (src = 0; src < nb_numa_nodes; src++) { > + for (dst = src; dst < nb_numa_nodes; dst++) { > + uint8_t distance = numa_info[src].distance[dst]; > + uint8_t rounded_distance = 160; > + > + if (distance > 11 && distance <= 30) { > + rounded_distance = 20; > + } else if (distance > 31 && distance <= 60) { > + rounded_distance = 40; > + } else if (distance > 61 && distance <= 120) { > + rounded_distance = 80; > + } > + > + numa_info[src].distance[dst] = rounded_distance; > + numa_info[dst].distance[src] = rounded_distance; ..I don't love the fact that we alter the distance table in place. Even though it was never exposed to the guest, I'd prefer not to destroy the information the user passed in. It could lead to surprising results with QMP introspection, and it may make future extensions more difficult. So I'd prefer to either (a) just leave the table as is and round on-demand with a paprify_distance(NN) -> {20,40,80,..} type function, or (b) create a parallel, spapr local, table with the rounded distances > + } > + } > +} > + > void spapr_numa_associativity_init(SpaprMachineState *spapr, > MachineState *machine) > { > @@ -95,6 +138,7 @@ void spapr_numa_associativity_init(SpaprMachineState *spapr, > exit(EXIT_FAILURE); > } > > + spapr_numa_PAPRify_distances(machine); > } > > void spapr_numa_write_associativity_dt(SpaprMachineState *spapr, void *fdt, -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c index fe395e80a3..990a5fce08 100644 --- a/hw/ppc/spapr_numa.c +++ b/hw/ppc/spapr_numa.c @@ -37,6 +37,49 @@ static bool spapr_numa_is_symmetrical(MachineState *ms) return true; } +/* + * This function will translate the user distances into + * what the kernel understand as possible values: 10 + * (local distance), 20, 40, 80 and 160. Current heuristic + * is: + * + * - distances between 11 and 30 inclusive -> rounded to 20 + * - distances between 31 and 60 inclusive -> rounded to 40 + * - distances between 61 and 120 inclusive -> rounded to 80 + * - everything above 120 -> 160 + * + * This step can also be done in the same time as the NUMA + * associativity domains calculation, at the cost of extra + * complexity. We chose to keep it simpler. + * + * Note: this will overwrite the distance values in + * ms->numa_state->nodes. + */ +static void spapr_numa_PAPRify_distances(MachineState *ms) +{ + int src, dst; + int nb_numa_nodes = ms->numa_state->num_nodes; + NodeInfo *numa_info = ms->numa_state->nodes; + + for (src = 0; src < nb_numa_nodes; src++) { + for (dst = src; dst < nb_numa_nodes; dst++) { + uint8_t distance = numa_info[src].distance[dst]; + uint8_t rounded_distance = 160; + + if (distance > 11 && distance <= 30) { + rounded_distance = 20; + } else if (distance > 31 && distance <= 60) { + rounded_distance = 40; + } else if (distance > 61 && distance <= 120) { + rounded_distance = 80; + } + + numa_info[src].distance[dst] = rounded_distance; + numa_info[dst].distance[src] = rounded_distance; + } + } +} + void spapr_numa_associativity_init(SpaprMachineState *spapr, MachineState *machine) { @@ -95,6 +138,7 @@ void spapr_numa_associativity_init(SpaprMachineState *spapr, exit(EXIT_FAILURE); } + spapr_numa_PAPRify_distances(machine); } void spapr_numa_write_associativity_dt(SpaprMachineState *spapr, void *fdt,
QEMU allows the user to set NUMA distances in the command line. For ACPI architectures like x86, this means that user input is used to populate the SLIT table, and the guest perceives the distances as the user chooses to. PPC64 does not work that way. In the PAPR concept of NUMA, associativity relations between the NUMA nodes are provided by the device tree, and the guest kernel is free to calculate the distances as it sees fit. Given how ACPI architectures works, this puts the pSeries machine in a strange spot - users expect to define NUMA distances like in the ACPI case, but QEMU does not have control over it. To give pSeries users a similar experience, we'll need to bring kernel specifics to QEMU to approximate the NUMA distances. The pSeries kernel works with the NUMA distance range 10, 20, 40, 80 and 160. The code starts at 10 (local distance) and searches for a match in the first NUMA level between the resources. If there is no match, the distance is doubled and then it proceeds to try to match in the next NUMA level. Rinse and repeat for MAX_DISTANCE_REF_POINTS levels. This patch introduces a spapr_numa_PAPRify_distances() helper that translates the user distances to kernel distance, which we're going to use to determine the associativity domains for the NUMA nodes. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/ppc/spapr_numa.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)