From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WziQE-0006FY-HG for qemu-devel@nongnu.org; Wed, 25 Jun 2014 04:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WziQ4-0005os-LD for qemu-devel@nongnu.org; Wed, 25 Jun 2014 04:19:14 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:42987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WziQ3-0005oY-Vh for qemu-devel@nongnu.org; Wed, 25 Jun 2014 04:19:04 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Jun 2014 18:18:55 +1000 From: Alexey Kardashevskiy Date: Wed, 25 Jun 2014 18:18:50 +1000 Message-Id: <1403684330-9027-1-git-send-email-aik@ozlabs.ru> In-Reply-To: <1403628191-5574-6-git-send-email-aik@ozlabs.ru> References: <1403628191-5574-6-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v2.5] spapr: Add a helper for node0_size calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf 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 --- Changes: v2.5: * fixed old (but just reported) 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 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3c1f892..c14d6c2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -351,6 +351,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 (node_mem[i]) { + return MIN(pow2floor(node_mem[i]), ram_size); + } + } + } + return ram_size; +} + #define _FDT(exp) \ do { \ int ret = (exp); \ @@ -860,8 +873,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); } } @@ -1292,7 +1305,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