| Message ID | 1402905233-26510-6-git-send-email-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
On 16.06.2014 [17:53:51 +1000], Alexey Kardashevskiy wrote: > In multiple places there is a node0_size variable calculation > which assumes that NUMA node #0 and memory node #0 are the same > things which they are not. Since we are going to change it and > do not want to change it in multiple places, let's make a helper. > > This adds a spapr_node0_size() helper and makes use of it. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > hw/ppc/spapr.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 10202e2..00ef7a1 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -351,6 +351,20 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop, > return (p - prop) * sizeof(uint32_t); > } > > +static hwaddr spapr_node0_size(void) > +{ > + if (nb_numa_nodes > 1) { > + int i; > + for (i = 0; i < nb_numa_nodes; ++i) { > + if (node_mem[i]) { > + return MIN(pow2floor(node_mem[i]), ram_size); > + } > + } > + return ram_size; Can't this just fall-through as well to the below return? > + } > + return ram_size; > +} > + > #define _FDT(exp) \ > do { \ > int ret = (exp); \ > @@ -851,8 +865,8 @@ static void spapr_reset_htab(sPAPREnvironment *spapr) > > /* Update the RMA size if necessary */ > if (spapr->vrma_adjust) { > - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; > - spapr->rma_size = kvmppc_rma_size(node0_size, spapr->htab_shift); > + spapr->rma_size = kvmppc_rma_size(spapr_node0_size(), > + spapr->htab_shift); > } > } > > @@ -1284,7 +1298,7 @@ static void ppc_spapr_init(MachineState *machine) > MemoryRegion *sysmem = get_system_memory(); > MemoryRegion *ram = g_new(MemoryRegion, 1); > hwaddr rma_alloc_size; > - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; > + hwaddr node0_size = spapr_node0_size(); > uint32_t initrd_base = 0; > long kernel_size = 0, initrd_size = 0; > long load_limit, rtas_limit, fw_size; > -- > 2.0.0 >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 10202e2..00ef7a1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -351,6 +351,20 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop, return (p - prop) * sizeof(uint32_t); } +static hwaddr spapr_node0_size(void) +{ + if (nb_numa_nodes > 1) { + int i; + for (i = 0; i < nb_numa_nodes; ++i) { + if (node_mem[i]) { + return MIN(pow2floor(node_mem[i]), ram_size); + } + } + return ram_size; + } + return ram_size; +} + #define _FDT(exp) \ do { \ int ret = (exp); \ @@ -851,8 +865,8 @@ static void spapr_reset_htab(sPAPREnvironment *spapr) /* Update the RMA size if necessary */ if (spapr->vrma_adjust) { - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; - spapr->rma_size = kvmppc_rma_size(node0_size, spapr->htab_shift); + spapr->rma_size = kvmppc_rma_size(spapr_node0_size(), + spapr->htab_shift); } } @@ -1284,7 +1298,7 @@ static void ppc_spapr_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); hwaddr rma_alloc_size; - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; + hwaddr node0_size = spapr_node0_size(); uint32_t initrd_base = 0; long kernel_size = 0, initrd_size = 0; long load_limit, rtas_limit, fw_size;
In multiple places there is a node0_size variable calculation which assumes that NUMA node #0 and memory node #0 are the same things which they are not. Since we are going to change it and do not want to change it in multiple places, let's make a helper. This adds a spapr_node0_size() helper and makes use of it. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- hw/ppc/spapr.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)