From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy7j0-0007ji-Kl for qemu-devel@nongnu.org; Fri, 20 Jun 2014 18:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wy7iq-00052k-JB for qemu-devel@nongnu.org; Fri, 20 Jun 2014 18:56:02 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:50676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy7iq-00052M-Dv for qemu-devel@nongnu.org; Fri, 20 Jun 2014 18:55:52 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Jun 2014 18:55:51 -0400 Date: Fri, 20 Jun 2014 15:55:28 -0700 From: Nishanth Aravamudan Message-ID: <20140620225528.GA2008@linux.vnet.ibm.com> References: <1402905233-26510-1-git-send-email-aik@ozlabs.ru> <1402905233-26510-4-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1402905233-26510-4-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH 3/7] spapr: Refactor spapr_populate_memory() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf On 16.06.2014 [17:53:49 +1000], Alexey Kardashevskiy wrote: > Current QEMU does not support memoryless NUMA nodes. > This prepares SPAPR for that. > > This moves 2 calls of spapr_populate_memory_node() into > the existing loop which handles nodes other than than > the first one. > > Signed-off-by: Alexey Kardashevskiy > --- > hw/ppc/spapr.c | 31 +++++++++++-------------------- > 1 file changed, 11 insertions(+), 20 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index cb3a10a..666b676 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -689,28 +689,13 @@ static void spapr_populate_memory_node(void *fdt, int nodeid, hwaddr start, > > static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt) > { > - hwaddr node0_size, mem_start, node_size; > + hwaddr mem_start, node_size; > int i; > > - /* memory node(s) */ > - if (nb_numa_nodes > 1 && node_mem[0] < ram_size) { > - node0_size = node_mem[0]; > - } else { > - node0_size = ram_size; > - } > - > - /* RMA */ > - spapr_populate_memory_node(fdt, 0, 0, spapr->rma_size); > - > - /* RAM: Node 0 */ > - if (node0_size > spapr->rma_size) { > - spapr_populate_memory_node(fdt, 0, spapr->rma_size, > - node0_size - spapr->rma_size); > - } > - > - /* RAM: Node 1 and beyond */ > - mem_start = node0_size; > - for (i = 1; i < nb_numa_nodes; i++) { > + for (i = 0, mem_start = 0; i < nb_numa_nodes; ++i) { > + if (!node_mem[i]) { > + continue; > + } Doesn't this skip memoryless nodes? What actually puts the memoryless node in the device-tree? And if you were to put them in, wouldn't spapr_populate_memory_node() fail because we'd be creating two nodes with memory@XXX where XXX is the same (starting address) for both? Thanks, Nish