[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 6/7] spapr_numa: create a vcpu associativity helper
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v3 6/7] spapr_numa: create a vcpu associativity helper |
Date: |
Thu, 3 Sep 2020 19:06:38 -0300 |
The work to be done in h_home_node_associativity() intersects
with what is already done in spapr_numa_fixup_cpu_dt(). This
patch creates a new helper, spapr_numa_get_vcpu_assoc(), to
be used for both spapr_numa_fixup_cpu_dt() and
h_home_node_associativity().
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_numa.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index d4dca57321..abc7361921 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -71,14 +71,17 @@ void spapr_numa_write_associativity_dt(SpaprMachineState
*spapr, void *fdt,
sizeof(spapr->numa_assoc_array[nodeid]))));
}
-int spapr_numa_fixup_cpu_dt(SpaprMachineState *spapr, void *fdt,
- int offset, PowerPCCPU *cpu)
+static uint32_t *spapr_numa_get_vcpu_assoc(SpaprMachineState *spapr,
+ PowerPCCPU *cpu,
+ uint *vcpu_assoc_size)
{
- uint vcpu_assoc_size = NUMA_ASSOC_SIZE + 1;
- uint32_t vcpu_assoc[vcpu_assoc_size];
+ uint32_t *vcpu_assoc = NULL;
int index = spapr_get_vcpu_id(cpu);
int i;
+ *vcpu_assoc_size = (NUMA_ASSOC_SIZE + 1) * sizeof(uint32_t);
+ vcpu_assoc = g_malloc(*vcpu_assoc_size);
+
/*
* VCPUs have an extra 'cpu_id' value in ibm,associativity
* compared to other resources. Increment the size at index
@@ -91,11 +94,22 @@ int spapr_numa_fixup_cpu_dt(SpaprMachineState *spapr, void
*fdt,
vcpu_assoc[i] = spapr->numa_assoc_array[cpu->node_id][i];
}
- vcpu_assoc[vcpu_assoc_size - 1] = cpu_to_be32(index);
+ vcpu_assoc[MAX_DISTANCE_REF_POINTS + 1] = cpu_to_be32(index);
+
+ return vcpu_assoc;
+}
+
+int spapr_numa_fixup_cpu_dt(SpaprMachineState *spapr, void *fdt,
+ int offset, PowerPCCPU *cpu)
+{
+ g_autofree uint32_t *vcpu_assoc = NULL;
+ uint vcpu_assoc_size;
+
+ vcpu_assoc = spapr_numa_get_vcpu_assoc(spapr, cpu, &vcpu_assoc_size);
/* Advertise NUMA via ibm,associativity */
return fdt_setprop(fdt, offset, "ibm,associativity",
- vcpu_assoc, sizeof(vcpu_assoc));
+ vcpu_assoc, vcpu_assoc_size);
}
--
2.26.2
- [PATCH v3 1/7] spapr: introduce SpaprMachineState::numa_assoc_array, (continued)
- [PATCH v3 1/7] spapr: introduce SpaprMachineState::numa_assoc_array, Daniel Henrique Barboza, 2020/09/03
- [PATCH v3 2/7] spapr, spapr_numa: handle vcpu ibm,associativity, Daniel Henrique Barboza, 2020/09/03
- [PATCH v3 3/7] spapr, spapr_numa: move lookup-arrays handling to spapr_numa.c, Daniel Henrique Barboza, 2020/09/03
- [PATCH v3 4/7] spapr_numa: move NVLink2 associativity handling to spapr_numa.c, Daniel Henrique Barboza, 2020/09/03
- [PATCH v3 7/7] spapr_numa: use spapr_numa_get_vcpu_assoc() in home_node hcall, Daniel Henrique Barboza, 2020/09/03
- [PATCH v3 5/7] spapr: move h_home_node_associativity to spapr_numa.c, Daniel Henrique Barboza, 2020/09/03
- [PATCH v3 6/7] spapr_numa: create a vcpu associativity helper,
Daniel Henrique Barboza <=
- Re: [PATCH v3 0/7] pseries NUMA distance rework, David Gibson, 2020/09/03