[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/6] spapr: Add a helper for node0_size calculati
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-devel] [PATCH v3 5/6] spapr: Add a helper for node0_size calculation |
Date: |
Thu, 3 Jul 2014 13:10:06 +1000 |
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 <address@hidden>
---
Changes:
v3:
* fixed bug when QEMU is started with RAM size
bigger that the only NUMA node like this:
-m 8192 -smp 4 -numa node,nodeid=0,cpus=0-3,mem=4096
v2:
* removed duplicated "return ram_size" from spapr_node0_size()
---
hw/ppc/spapr.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 680d7f9..c71ce1f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -282,6 +282,19 @@ 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) {
+ int i;
+ for (i = 0; i < nb_numa_nodes; ++i) {
+ if (numa_info[i].node_mem) {
+ return MIN(pow2floor(numa_info[i].node_mem), ram_size);
+ }
+ }
+ }
+ return ram_size;
+}
+
#define _FDT(exp) \
do { \
int ret = (exp); \
@@ -803,9 +816,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) ?
- numa_info[0].node_mem : 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);
}
}
@@ -1236,7 +1248,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) ? numa_info[0].node_mem : 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
- [Qemu-devel] [PATCH v3 0/6] spapr: rework memory nodes, Alexey Kardashevskiy, 2014/07/02
- [Qemu-devel] [PATCH v3 4/6] spapr: Split memory nodes to power-of-two blocks, Alexey Kardashevskiy, 2014/07/02
- [Qemu-devel] [PATCH v3 3/6] spapr: Refactor spapr_populate_memory() to allow memoryless nodes, Alexey Kardashevskiy, 2014/07/02
- [Qemu-devel] [PATCH v3 2/6] spapr: Use DT memory node rendering helper for other nodes, Alexey Kardashevskiy, 2014/07/02
- [Qemu-devel] [PATCH v3 6/6] spapr: Fix ibm, associativity for memory nodes, Alexey Kardashevskiy, 2014/07/02
- [Qemu-devel] [PATCH v3 1/6] spapr: Move DT memory node rendering to a helper, Alexey Kardashevskiy, 2014/07/02
- [Qemu-devel] [PATCH v3 5/6] spapr: Add a helper for node0_size calculation,
Alexey Kardashevskiy <=
- Re: [Qemu-devel] [PATCH v3 0/6] spapr: rework memory nodes, Alexey Kardashevskiy, 2014/07/20