* [RFC PATCH v3 1/5] spapr_numa.c: split FORM1 code into helpers
2021-07-13 19:40 [RFC PATCH v3 0/5] pSeries FORM2 affinity support Daniel Henrique Barboza
@ 2021-07-13 19:40 ` Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 2/5] spapr: move NUMA data init to post-CAS Daniel Henrique Barboza
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Henrique Barboza @ 2021-07-13 19:40 UTC (permalink / raw)
To: qemu-devel; +Cc: aneesh.kumar, Daniel Henrique Barboza, qemu-ppc, groug, david
The upcoming FORM2 NUMA affinity will support asymmetric NUMA topologies
and doesn't need be concerned with all the legacy support for older
pseries FORM1 guests.
We're also not going to calculate associativity domains based on numa
distance (via spapr_numa_define_associativity_domains) since the
distances will be written directly into new DT properties.
Let's split FORM1 code into its own functions to allow for easier
insertion of FORM2 logic later on.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_numa.c | 61 +++++++++++++++++++++++++++++----------------
1 file changed, 39 insertions(+), 22 deletions(-)
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index 779f18b994..04a86f9b5b 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -155,6 +155,32 @@ static void spapr_numa_define_associativity_domains(SpaprMachineState *spapr)
}
+/*
+ * Set NUMA machine state data based on FORM1 affinity semantics.
+ */
+static void spapr_numa_FORM1_affinity_init(SpaprMachineState *spapr,
+ MachineState *machine)
+{
+ bool using_legacy_numa = spapr_machine_using_legacy_numa(spapr);
+
+ /*
+ * Legacy NUMA guests (pseries-5.1 and older, or guests with only
+ * 1 NUMA node) will not benefit from anything we're going to do
+ * after this point.
+ */
+ if (using_legacy_numa) {
+ return;
+ }
+
+ if (!spapr_numa_is_symmetrical(machine)) {
+ error_report("Asymmetrical NUMA topologies aren't supported "
+ "in the pSeries machine");
+ exit(EXIT_FAILURE);
+ }
+
+ spapr_numa_define_associativity_domains(spapr);
+}
+
void spapr_numa_associativity_init(SpaprMachineState *spapr,
MachineState *machine)
{
@@ -210,22 +236,7 @@ void spapr_numa_associativity_init(SpaprMachineState *spapr,
spapr->numa_assoc_array[i][MAX_DISTANCE_REF_POINTS] = cpu_to_be32(i);
}
- /*
- * Legacy NUMA guests (pseries-5.1 and older, or guests with only
- * 1 NUMA node) will not benefit from anything we're going to do
- * after this point.
- */
- if (using_legacy_numa) {
- return;
- }
-
- if (!spapr_numa_is_symmetrical(machine)) {
- error_report("Asymmetrical NUMA topologies aren't supported "
- "in the pSeries machine");
- exit(EXIT_FAILURE);
- }
-
- spapr_numa_define_associativity_domains(spapr);
+ spapr_numa_FORM1_affinity_init(spapr, machine);
}
void spapr_numa_write_associativity_dt(SpaprMachineState *spapr, void *fdt,
@@ -302,12 +313,8 @@ int spapr_numa_write_assoc_lookup_arrays(SpaprMachineState *spapr, void *fdt,
return ret;
}
-/*
- * Helper that writes ibm,associativity-reference-points and
- * max-associativity-domains in the RTAS pointed by @rtas
- * in the DT @fdt.
- */
-void spapr_numa_write_rtas_dt(SpaprMachineState *spapr, void *fdt, int rtas)
+static void spapr_numa_FORM1_write_rtas_dt(SpaprMachineState *spapr,
+ void *fdt, int rtas)
{
MachineState *ms = MACHINE(spapr);
SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
@@ -365,6 +372,16 @@ void spapr_numa_write_rtas_dt(SpaprMachineState *spapr, void *fdt, int rtas)
maxdomains, sizeof(maxdomains)));
}
+/*
+ * Helper that writes ibm,associativity-reference-points and
+ * max-associativity-domains in the RTAS pointed by @rtas
+ * in the DT @fdt.
+ */
+void spapr_numa_write_rtas_dt(SpaprMachineState *spapr, void *fdt, int rtas)
+{
+ spapr_numa_FORM1_write_rtas_dt(spapr, fdt, rtas);
+}
+
static target_ulong h_home_node_associativity(PowerPCCPU *cpu,
SpaprMachineState *spapr,
target_ulong opcode,
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH v3 2/5] spapr: move NUMA data init to post-CAS
2021-07-13 19:40 [RFC PATCH v3 0/5] pSeries FORM2 affinity support Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 1/5] spapr_numa.c: split FORM1 code into helpers Daniel Henrique Barboza
@ 2021-07-13 19:40 ` Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 3/5] spapr_numa.c: base FORM2 NUMA affinity support Daniel Henrique Barboza
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Henrique Barboza @ 2021-07-13 19:40 UTC (permalink / raw)
To: qemu-devel; +Cc: aneesh.kumar, Daniel Henrique Barboza, qemu-ppc, groug, david
The pSeries machine will support a new NUMA affinity form, FORM2.
This new FORM will be negotiated via ibm,architecture-vec5 during
CAS. All artifacts and assumptions that are currently on use for
FORM1 affinity will be deprecated in a guest that chooses to use
FORM2. This means that we're going to wait until CAS to determine
whether we're going to use FORM1 and FORM2.
This patch does that by moving all NUMA data init functions to post-CAS
time. spapr_numa_associativity_init() is moved from spapr_machine_init()
to do_client_architecture_support(). Straightforward change since the
initialization of spapr->numa_assoc_array is transparent to the guest.
spapr_numa_write_rtas_dt() is more complex. The function is called from
spapr_dt_rtas(), which in turned is called by spapr_build_fdt().
spapr_build_fdt() is called in two places: spapr_machine_reset() and
do_client_architecture_support(). This means that we're writing RTAS
nodes with NUMA artifacts without going through CAS first, and then
writing it again post CAS. This is not an issue because, at this moment,
we always write the same FORM1 NUMA affinity properties in the DT.
With the upcoming FORM2 support, we're now reliant on guest choice to
decide what to write.
The proposed solution is to change spapr_numa_write_rtas_dt() to not
write the DT until we're post-CAS. This is a benign guest visible change
(a well behaved guest wouldn't bother to read NUMA properties before CAs),
but to be on the safe side, let's wrap it with a machine class flag to skip
this logic unless we're running with the latest machine type. This also
means that FORM2 support will not be available for older machine types.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr.c | 6 +++---
hw/ppc/spapr_hcall.c | 4 ++++
hw/ppc/spapr_numa.c | 11 +++++++++++
include/hw/ppc/spapr.h | 1 +
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 81699d4f8b..725d0f3c6e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2808,9 +2808,6 @@ static void spapr_machine_init(MachineState *machine)
spapr->gpu_numa_id = spapr_numa_initial_nvgpu_numa_id(machine);
- /* Init numa_assoc_array */
- spapr_numa_associativity_init(spapr, machine);
-
if ((!kvm_enabled() || kvmppc_has_cap_mmu_radix()) &&
ppc_type_check_compat(machine->cpu_type, CPU_POWERPC_LOGICAL_3_00, 0,
spapr->max_compat_pvr)) {
@@ -4700,8 +4697,11 @@ DEFINE_SPAPR_MACHINE(6_1, "6.1", true);
*/
static void spapr_machine_6_0_class_options(MachineClass *mc)
{
+ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
+
spapr_machine_6_1_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len);
+ smc->pre_6_1_numa_affinity = true;
}
DEFINE_SPAPR_MACHINE(6_0, "6.0", false);
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 0e9a5b2e40..1cc88716c1 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -11,6 +11,7 @@
#include "helper_regs.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_cpu_core.h"
+#include "hw/ppc/spapr_numa.h"
#include "mmu-hash64.h"
#include "cpu-models.h"
#include "trace.h"
@@ -1197,6 +1198,9 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu,
spapr->cas_pre_isa3_guest = !spapr_ovec_test(ov1_guest, OV1_PPC_3_00);
spapr_ovec_cleanup(ov1_guest);
+ /* Init numa_assoc_array */
+ spapr_numa_associativity_init(spapr, MACHINE(spapr));
+
/*
* Ensure the guest asks for an interrupt mode we support;
* otherwise terminate the boot.
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index 04a86f9b5b..b0bd056546 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -379,6 +379,17 @@ static void spapr_numa_FORM1_write_rtas_dt(SpaprMachineState *spapr,
*/
void spapr_numa_write_rtas_dt(SpaprMachineState *spapr, void *fdt, int rtas)
{
+ SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
+
+ /*
+ * pre-6.1 machine types were writing RTAS information before
+ * CAS. Check if that's case before changing their existing
+ * behavior.
+ */
+ if (spapr_ovec_empty(spapr->ov5_cas) && !smc->pre_6_1_numa_affinity) {
+ return;
+ }
+
spapr_numa_FORM1_write_rtas_dt(spapr, fdt, rtas);
}
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 637652ad16..068a29535a 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -145,6 +145,7 @@ struct SpaprMachineClass {
hwaddr rma_limit; /* clamp the RMA to this size */
bool pre_5_1_assoc_refpoints;
bool pre_5_2_numa_associativity;
+ bool pre_6_1_numa_affinity;
bool (*phb_placement)(SpaprMachineState *spapr, uint32_t index,
uint64_t *buid, hwaddr *pio,
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH v3 3/5] spapr_numa.c: base FORM2 NUMA affinity support
2021-07-13 19:40 [RFC PATCH v3 0/5] pSeries FORM2 affinity support Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 1/5] spapr_numa.c: split FORM1 code into helpers Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 2/5] spapr: move NUMA data init to post-CAS Daniel Henrique Barboza
@ 2021-07-13 19:40 ` Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 4/5] spapr: simplify spapr_numa_associativity_init params Daniel Henrique Barboza
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Henrique Barboza @ 2021-07-13 19:40 UTC (permalink / raw)
To: qemu-devel; +Cc: aneesh.kumar, Daniel Henrique Barboza, qemu-ppc, groug, david
The main feature of FORM2 affinity support is the separation of NUMA
distances from ibm,associativity information. This allows for a more
flexible and straightforward NUMA distance assignment without relying on
complex associations between several levels of NUMA via
ibm,associativity matches. Another feature is its extensibility. This base
support contains the facilities for NUMA distance assignment, but in the
future more facilities will be added for latency, performance, bandwidth
and so on.
This patch implements the base FORM2 affinity support as follows:
- the use of FORM2 associativity is indicated by using bit 2 of byte 5
of ibm,architecture-vec-5. A FORM2 aware guest can choose to use FORM1
or FORM2 affinity. Setting both forms will default to FORM2. We rely on
CAS to decide what to write in the DT, so all writing is postponed until
client architecture support is done. This also mean that we're not
advertising FORM2 for pseries-6.0 and older machine versions to prevent
guest visible changes;
- ibm,associativity-reference-points has a new semantic. Instead of
being used to calculate distances via NUMA levels, it's now used to
indicate the primary domain index in the ibm,associativity domain of
each resource. In our case it's set to {0x4}, matching the position
where we already place logical_domain_id;
- two new RTAS DT artifacts are introduced: ibm,numa-lookup-index-table
and ibm,numa-distance-table. The index table is used to list all the
NUMA logical domains of the platform, in ascending order, and allows for
spartial NUMA configurations (although QEMU ATM doesn't support that).
ibm,numa-distance-table is an array that contains all the distances from
the first NUMA node to all other nodes, then the second NUMA node
distances to all other nodes and so on;
- spapr_post_load changes: since we're adding a new NUMA affinity that
isn't compatible with the existing one, migration must be handled
accordingly because we can't be certain of whether the guest went
through CAS in the source. The solution chosen is to initiate the NUMA
associativity data in spapr_post_load() unconditionally. The worst case
would be to write the DT twice if the guest is in pre-CAS stage.
Otherwise, we're making sure that a FORM1 guest will have the
spapr->numa_assoc_array initialized with the proper information based on
user distance, something that we're not doing with FORM2.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr.c | 21 ++++++
hw/ppc/spapr_numa.c | 127 +++++++++++++++++++++++++++++++++++-
include/hw/ppc/spapr_ovec.h | 1 +
3 files changed, 148 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 725d0f3c6e..1b7f706996 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1786,6 +1786,22 @@ static int spapr_post_load(void *opaque, int version_id)
return err;
}
+ /*
+ * NUMA data init is made in CAS time. There is no reliable
+ * way of telling whether the guest already went through CAS
+ * in the source due to how spapr_ov5_cas_needed works: a
+ * FORM1 guest can be migrated with ov5_cas empty regardless
+ * of going through CAS first.
+ *
+ * One solution is to always call numa_associativity_init. The
+ * downside is that a guest migrated before CAS will run
+ * numa_associativity_init again when going through it, but
+ * at least we're making sure spapr->numa_assoc_array will be
+ * initialized and hotplug operations won't fail in both before
+ * and after CAS migration cases.
+ */
+ spapr_numa_associativity_init(spapr, MACHINE(spapr));
+
return err;
}
@@ -2752,6 +2768,11 @@ static void spapr_machine_init(MachineState *machine)
spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY);
+ /* Do not advertise FORM2 support for pseries-6.0 and older */
+ if (!smc->pre_6_1_numa_affinity) {
+ spapr_ovec_set(spapr->ov5, OV5_FORM2_AFFINITY);
+ }
+
/* advertise support for dedicated HP event source to guests */
if (spapr->use_hotplug_event_source) {
spapr_ovec_set(spapr->ov5, OV5_HP_EVT);
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index b0bd056546..1c894bf877 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -202,6 +202,16 @@ void spapr_numa_associativity_init(SpaprMachineState *spapr,
spapr->numa_assoc_array[i][0] = cpu_to_be32(MAX_DISTANCE_REF_POINTS);
spapr->numa_assoc_array[i][MAX_DISTANCE_REF_POINTS] = cpu_to_be32(i);
+ /*
+ * For FORM2 affinity the initialization above is enough. No
+ * need to fill non-zero NUMA nodes with node_id because
+ * there is no associativity domain match to calculate
+ * NUMA distances in FORM2.
+ */
+ if (spapr_ovec_test(spapr->ov5_cas, OV5_FORM2_AFFINITY)) {
+ continue;
+ }
+
/*
* Fill all associativity domains of non-zero NUMA nodes with
* node_id. This is required because the default value (0) is
@@ -236,7 +246,16 @@ void spapr_numa_associativity_init(SpaprMachineState *spapr,
spapr->numa_assoc_array[i][MAX_DISTANCE_REF_POINTS] = cpu_to_be32(i);
}
- spapr_numa_FORM1_affinity_init(spapr, machine);
+ /*
+ * We test for !FORM2 instead of testing for FORM1 because,
+ * as per spapr_ov5_cas_needed, setting FORM1 is not enough
+ * to get ov5_cas migrated, but setting FORM2 is. Since we're
+ * dealing with either FORM1 or FORM2, test for the option
+ * that is guaranteed to be set after a migration.
+ */
+ if (!spapr_ovec_test(spapr->ov5_cas, OV5_FORM2_AFFINITY)) {
+ spapr_numa_FORM1_affinity_init(spapr, machine);
+ }
}
void spapr_numa_write_associativity_dt(SpaprMachineState *spapr, void *fdt,
@@ -313,6 +332,107 @@ int spapr_numa_write_assoc_lookup_arrays(SpaprMachineState *spapr, void *fdt,
return ret;
}
+static void spapr_numa_FORM2_write_rtas_tables(SpaprMachineState *spapr,
+ void *fdt, int rtas)
+{
+ MachineState *ms = MACHINE(spapr);
+ NodeInfo *numa_info = ms->numa_state->nodes;
+ int nb_numa_nodes = ms->numa_state->num_nodes;
+ int distance_table_entries = nb_numa_nodes * nb_numa_nodes;
+ g_autofree uint32_t *lookup_index_table = NULL;
+ g_autofree uint32_t *distance_table = NULL;
+ int src, dst, i, distance_table_size;
+ uint8_t *node_distances;
+
+ /*
+ * ibm,numa-lookup-index-table: array with length and a
+ * list of NUMA ids present in the guest.
+ */
+ lookup_index_table = g_new0(uint32_t, nb_numa_nodes + 1);
+ lookup_index_table[0] = cpu_to_be32(nb_numa_nodes);
+
+ for (i = 0; i < nb_numa_nodes; i++) {
+ lookup_index_table[i + 1] = cpu_to_be32(i);
+ }
+
+ _FDT(fdt_setprop(fdt, rtas, "ibm,numa-lookup-index-table",
+ lookup_index_table,
+ (nb_numa_nodes + 1) * sizeof(uint32_t)));
+
+ /*
+ * ibm,numa-distance-table: contains all node distances. First
+ * element is the size of the table as uint32, followed up
+ * by all the uint8 distances from the first NUMA node, then all
+ * distances from the second NUMA node and so on.
+ *
+ * ibm,numa-lookup-index-table is used by guest to navigate this
+ * array because NUMA ids can be sparse (node 0 is the first,
+ * node 8 is the second ...).
+ */
+ distance_table = g_new0(uint32_t, distance_table_entries + 1);
+ distance_table[0] = cpu_to_be32(distance_table_entries);
+
+ node_distances = (uint8_t *)&distance_table[1];
+ i = 0;
+
+ for (src = 0; src < nb_numa_nodes; src++) {
+ for (dst = 0; dst < nb_numa_nodes; dst++) {
+ node_distances[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",
+ distance_table, distance_table_size));
+}
+
+/*
+ * This helper could be compressed in a single function with
+ * FORM1 logic since we're setting the same DT values, with the
+ * difference being a call to spapr_numa_FORM2_write_rtas_tables()
+ * in the end. The separation was made to avoid clogging FORM1 code
+ * which already has to deal with compat modes from previous
+ * QEMU machine types.
+ */
+static void spapr_numa_FORM2_write_rtas_dt(SpaprMachineState *spapr,
+ void *fdt, int rtas)
+{
+ MachineState *ms = MACHINE(spapr);
+ uint32_t number_nvgpus_nodes = spapr->gpu_numa_id -
+ spapr_numa_initial_nvgpu_numa_id(ms);
+
+ /*
+ * In FORM2, ibm,associativity-reference-points will point to
+ * the element in the ibm,associativity array that contains the
+ * primary domain index. This value (in our case, the numa-id) is
+ * then used as an index to retrieve all other attributes of the
+ * node (distance, bandwidth, latency) via ibm,numa-lookup-index-table
+ * and other ibm,numa-*-table properties.
+ */
+ uint32_t refpoints[] = {
+ cpu_to_be32(0x4),
+ };
+
+ uint32_t nr_refpoints = ARRAY_SIZE(refpoints);
+ uint32_t maxdomain = ms->numa_state->num_nodes + number_nvgpus_nodes;
+ uint32_t maxdomains[] = {
+ cpu_to_be32(4),
+ cpu_to_be32(maxdomain),
+ cpu_to_be32(maxdomain),
+ cpu_to_be32(maxdomain),
+ cpu_to_be32(maxdomain)
+ };
+
+ _FDT(fdt_setprop(fdt, rtas, "ibm,associativity-reference-points",
+ refpoints, nr_refpoints * sizeof(refpoints[0])));
+
+ _FDT(fdt_setprop(fdt, rtas, "ibm,max-associativity-domains",
+ maxdomains, sizeof(maxdomains)));
+
+ spapr_numa_FORM2_write_rtas_tables(spapr, fdt, rtas);
+}
+
static void spapr_numa_FORM1_write_rtas_dt(SpaprMachineState *spapr,
void *fdt, int rtas)
{
@@ -390,6 +510,11 @@ void spapr_numa_write_rtas_dt(SpaprMachineState *spapr, void *fdt, int rtas)
return;
}
+ if (spapr_ovec_test(spapr->ov5_cas, OV5_FORM2_AFFINITY)) {
+ spapr_numa_FORM2_write_rtas_dt(spapr, fdt, rtas);
+ return;
+ }
+
spapr_numa_FORM1_write_rtas_dt(spapr, fdt, rtas);
}
diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h
index 48b716a060..c3e8b98e7e 100644
--- a/include/hw/ppc/spapr_ovec.h
+++ b/include/hw/ppc/spapr_ovec.h
@@ -49,6 +49,7 @@ typedef struct SpaprOptionVector SpaprOptionVector;
/* option vector 5 */
#define OV5_DRCONF_MEMORY OV_BIT(2, 2)
#define OV5_FORM1_AFFINITY OV_BIT(5, 0)
+#define OV5_FORM2_AFFINITY OV_BIT(5, 2)
#define OV5_HP_EVT OV_BIT(6, 5)
#define OV5_HPT_RESIZE OV_BIT(6, 7)
#define OV5_DRMEM_V2 OV_BIT(22, 0)
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH v3 4/5] spapr: simplify spapr_numa_associativity_init params
2021-07-13 19:40 [RFC PATCH v3 0/5] pSeries FORM2 affinity support Daniel Henrique Barboza
` (2 preceding siblings ...)
2021-07-13 19:40 ` [RFC PATCH v3 3/5] spapr_numa.c: base FORM2 NUMA affinity support Daniel Henrique Barboza
@ 2021-07-13 19:40 ` Daniel Henrique Barboza
2021-07-13 19:40 ` [RFC PATCH v3 5/5] spapr: move memory/cpu less check to spapr_numa_FORM1_affinity_init() Daniel Henrique Barboza
2021-07-22 2:39 ` [RFC PATCH v3 0/5] pSeries FORM2 affinity support David Gibson
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Henrique Barboza @ 2021-07-13 19:40 UTC (permalink / raw)
To: qemu-devel; +Cc: aneesh.kumar, Daniel Henrique Barboza, qemu-ppc, groug, david
When spapr_numa_associativity_init() was introduced it was being
called from spapr_machine_init(), where we have pointers to a
SpaprMachineState and a MachineState. Having both being passed
as params spared us from calling a macro to get the MachineState.
Previous patches moved the function away from spapr_machine_init(),
and the new locations doesn't have a pointer to MachineState ready.
This resulted in MACHINE(spapr) macro calls as the second parameter
in both callers.
Simplify the function by folding the 'MACHINE(spapr)' macro into the
function body, which can now receive only a pointer to
SpaprMachineState.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_hcall.c | 2 +-
hw/ppc/spapr_numa.c | 4 ++--
include/hw/ppc/spapr_numa.h | 3 +--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 1b7f706996..76f1637959 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1800,7 +1800,7 @@ static int spapr_post_load(void *opaque, int version_id)
* initialized and hotplug operations won't fail in both before
* and after CAS migration cases.
*/
- spapr_numa_associativity_init(spapr, MACHINE(spapr));
+ spapr_numa_associativity_init(spapr);
return err;
}
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 1cc88716c1..a721d3edce 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1199,7 +1199,7 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu,
spapr_ovec_cleanup(ov1_guest);
/* Init numa_assoc_array */
- spapr_numa_associativity_init(spapr, MACHINE(spapr));
+ spapr_numa_associativity_init(spapr);
/*
* Ensure the guest asks for an interrupt mode we support;
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index 1c894bf877..bba5a984e4 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -181,9 +181,9 @@ static void spapr_numa_FORM1_affinity_init(SpaprMachineState *spapr,
spapr_numa_define_associativity_domains(spapr);
}
-void spapr_numa_associativity_init(SpaprMachineState *spapr,
- MachineState *machine)
+void spapr_numa_associativity_init(SpaprMachineState *spapr)
{
+ MachineState *machine = MACHINE(spapr);
SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
int nb_numa_nodes = machine->numa_state->num_nodes;
int i, j, max_nodes_with_gpus;
diff --git a/include/hw/ppc/spapr_numa.h b/include/hw/ppc/spapr_numa.h
index 6f9f02d3de..adaec8e163 100644
--- a/include/hw/ppc/spapr_numa.h
+++ b/include/hw/ppc/spapr_numa.h
@@ -22,8 +22,7 @@
* function. spapr_machine_init() is the only caller for it, and
* it has both pointers resolved already.
*/
-void spapr_numa_associativity_init(SpaprMachineState *spapr,
- MachineState *machine);
+void spapr_numa_associativity_init(SpaprMachineState *spapr);
void spapr_numa_write_rtas_dt(SpaprMachineState *spapr, void *fdt, int rtas);
void spapr_numa_write_associativity_dt(SpaprMachineState *spapr, void *fdt,
int offset, int nodeid);
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH v3 5/5] spapr: move memory/cpu less check to spapr_numa_FORM1_affinity_init()
2021-07-13 19:40 [RFC PATCH v3 0/5] pSeries FORM2 affinity support Daniel Henrique Barboza
` (3 preceding siblings ...)
2021-07-13 19:40 ` [RFC PATCH v3 4/5] spapr: simplify spapr_numa_associativity_init params Daniel Henrique Barboza
@ 2021-07-13 19:40 ` Daniel Henrique Barboza
2021-07-22 2:39 ` [RFC PATCH v3 0/5] pSeries FORM2 affinity support David Gibson
5 siblings, 0 replies; 7+ messages in thread
From: Daniel Henrique Barboza @ 2021-07-13 19:40 UTC (permalink / raw)
To: qemu-devel; +Cc: aneesh.kumar, Daniel Henrique Barboza, qemu-ppc, groug, david
FORM2 NUMA affinity is prepared to deal with memory/cpu less
NUMA nodes. This is used by the DAX KMEM driver to locate a
PAPR SCM device that has a different latency than the original
NUMA node from the regular memory.
Move this verification to FORM1 affinity code.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr.c | 33 ---------------------------------
hw/ppc/spapr_numa.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 76f1637959..538c5bcd94 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2794,39 +2794,6 @@ static void spapr_machine_init(MachineState *machine)
/* init CPUs */
spapr_init_cpus(spapr);
- /*
- * check we don't have a memory-less/cpu-less NUMA node
- * Firmware relies on the existing memory/cpu topology to provide the
- * NUMA topology to the kernel.
- * And the linux kernel needs to know the NUMA topology at start
- * to be able to hotplug CPUs later.
- */
- if (machine->numa_state->num_nodes) {
- for (i = 0; i < machine->numa_state->num_nodes; ++i) {
- /* check for memory-less node */
- if (machine->numa_state->nodes[i].node_mem == 0) {
- CPUState *cs;
- int found = 0;
- /* check for cpu-less node */
- CPU_FOREACH(cs) {
- PowerPCCPU *cpu = POWERPC_CPU(cs);
- if (cpu->node_id == i) {
- found = 1;
- break;
- }
- }
- /* memory-less and cpu-less node */
- if (!found) {
- error_report(
- "Memory-less/cpu-less nodes are not supported (node %d)",
- i);
- exit(1);
- }
- }
- }
-
- }
-
spapr->gpu_numa_id = spapr_numa_initial_nvgpu_numa_id(machine);
if ((!kvm_enabled() || kvmppc_has_cap_mmu_radix()) &&
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index bba5a984e4..98740c732d 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -162,6 +162,39 @@ static void spapr_numa_FORM1_affinity_init(SpaprMachineState *spapr,
MachineState *machine)
{
bool using_legacy_numa = spapr_machine_using_legacy_numa(spapr);
+ int i;
+
+ /*
+ * check we don't have a memory-less/cpu-less NUMA node
+ * Firmware relies on the existing memory/cpu topology to provide the
+ * NUMA topology to the kernel.
+ * And the linux kernel needs to know the NUMA topology at start
+ * to be able to hotplug CPUs later.
+ */
+ if (machine->numa_state->num_nodes) {
+ for (i = 0; i < machine->numa_state->num_nodes; ++i) {
+ /* check for memory-less node */
+ if (machine->numa_state->nodes[i].node_mem == 0) {
+ CPUState *cs;
+ int found = 0;
+ /* check for cpu-less node */
+ CPU_FOREACH(cs) {
+ PowerPCCPU *cpu = POWERPC_CPU(cs);
+ if (cpu->node_id == i) {
+ found = 1;
+ break;
+ }
+ }
+ /* memory-less and cpu-less node */
+ if (!found) {
+ error_report(
+ "Memory-less/cpu-less nodes are not supported (node %d)",
+ i);
+ exit(1);
+ }
+ }
+ }
+ }
/*
* Legacy NUMA guests (pseries-5.1 and older, or guests with only
--
2.31.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [RFC PATCH v3 0/5] pSeries FORM2 affinity support
2021-07-13 19:40 [RFC PATCH v3 0/5] pSeries FORM2 affinity support Daniel Henrique Barboza
` (4 preceding siblings ...)
2021-07-13 19:40 ` [RFC PATCH v3 5/5] spapr: move memory/cpu less check to spapr_numa_FORM1_affinity_init() Daniel Henrique Barboza
@ 2021-07-22 2:39 ` David Gibson
5 siblings, 0 replies; 7+ messages in thread
From: David Gibson @ 2021-07-22 2:39 UTC (permalink / raw)
To: Daniel Henrique Barboza; +Cc: aneesh.kumar, qemu-ppc, qemu-devel, groug
[-- Attachment #1: Type: text/plain, Size: 2232 bytes --]
On Tue, Jul 13, 2021 at 04:40:40PM -0300, Daniel Henrique Barboza wrote:
> Hi,
>
> This new version drops all the NVDIMM related changes from the
> previous iteraction after the reviews done in the kernel mailing
> list [1]. FORM2 will not use ibm,associativity-reference-points to
> determine a second NUMA mode for different operation modes of
> PAPR-SCM.
>
> [1]
> https://lore.kernel.org/linuxppc-dev/20210628151117.545935-1-aneesh.kumar@linux.ibm.com/
Sorry, I'm going to punt on reviewing this again, until the kernel
side patches are sorted out.
>
>
> changes from v2:
> - patch 3:
> * reworded commit msg and comments to reflect the current state of
> the specification
> - patches 5 and 6: removed
> - v2 link: https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg04056.html
>
>
> changes from v1:
> - patches 1 and 2: switched places
> - patch 3: folded into patch 2
> - patch 2:
> * only make CAS related changes when using the newest
> machine version
> - patch 3 (former 4):
> * only advertise FORM2 support for the newest machine version
> - patches 5 and 6 (former 6 and 7):
> * detect if 'device-node' was set in the command line, and if not,
> use the 'node' value when writing in the device tree
>
> v1 link: https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg03617.html
>
>
> Daniel Henrique Barboza (5):
> spapr_numa.c: split FORM1 code into helpers
> spapr: move NUMA data init to post-CAS
> spapr_numa.c: base FORM2 NUMA affinity support
> spapr: simplify spapr_numa_associativity_init params
> spapr: move memory/cpu less check to spapr_numa_FORM1_affinity_init()
>
> hw/ppc/spapr.c | 60 ++++------
> hw/ppc/spapr_hcall.c | 4 +
> hw/ppc/spapr_numa.c | 224 +++++++++++++++++++++++++++++++++---
> include/hw/ppc/spapr.h | 1 +
> include/hw/ppc/spapr_numa.h | 3 +-
> include/hw/ppc/spapr_ovec.h | 1 +
> 6 files changed, 236 insertions(+), 57 deletions(-)
>
--
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread