From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeL2W-00089j-Py for qemu-devel@nongnu.org; Thu, 07 Nov 2013 03:34:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeL2L-0006hL-PR for qemu-devel@nongnu.org; Thu, 07 Nov 2013 03:34:07 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:40942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeL2L-0006hA-Dn for qemu-devel@nongnu.org; Thu, 07 Nov 2013 03:33:57 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Nov 2013 08:33:55 -0000 Date: Thu, 7 Nov 2013 09:33:50 +0100 From: Thomas Huth Message-ID: <20131107093350.16f457ba@oc7435384737.ibm.com> In-Reply-To: <1383796200-13276-1-git-send-email-aik@ozlabs.ru> References: <1383796200-13276-1-git-send-email-aik@ozlabs.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3] spapr: make sure RMA is in first mode of first memory node 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 Thu, 7 Nov 2013 14:50:00 +1100 Alexey Kardashevskiy wrote: > The SPAPR specification says that the RMA starts at the LPAR's logical > address 0 and is the first logical memory block reported in > the LPAR=E2=80=99s device tree. >=20 > So SLOF only maps the first block and that block needs to span > the full RMA. >=20 > This makes sure that the RMA area is where SLOF expects it. >=20 > Cc: Thomas Huth > Cc: Benjamin Herrenschmidt > Signed-off-by: Alexey Kardashevskiy > --- > Changes: > v3: > * removed unnecessary RMA fixup from spapr_populate_memory() >=20 > v2: > * changed as recommended by Alex Graf > --- > hw/ppc/spapr.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 7e53a5f..1f320f6 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -532,9 +532,6 @@ static int spapr_populate_memory(sPAPREnvironment *sp= apr, void *fdt) >=20 > /* memory node(s) */ > node0_size =3D (nb_numa_nodes > 1) ? node_mem[0] : ram_size; > - if (spapr->rma_size > node0_size) { > - spapr->rma_size =3D node0_size; > - } >=20 > /* RMA */ > mem_reg_property[0] =3D 0; > @@ -1113,6 +1110,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *arg= s) > MemoryRegion *sysmem =3D get_system_memory(); > MemoryRegion *ram =3D g_new(MemoryRegion, 1); > hwaddr rma_alloc_size; > + hwaddr node0_size =3D (nb_numa_nodes > 1) ? node_mem[0] : ram_size; > uint32_t initrd_base =3D 0; > long kernel_size =3D 0, initrd_size =3D 0; > long load_limit, rtas_limit, fw_size; > @@ -1137,7 +1135,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *arg= s) > if (rma_alloc_size && (rma_alloc_size < ram_size)) { Uh, sorry for not seeing this earlier, ... but should that be "rma_alloc_size < node0_size" instead of "rma_alloc_size < ram_size"? For example, if rma_alloc_size =3D 256 MB, ram_size =3D 512 MB but node0_size =3D 128 MB, this will set rma_size to 256 MB ... > spapr->rma_size =3D rma_alloc_size; > } else { > - spapr->rma_size =3D ram_size; > + spapr->rma_size =3D node0_size; >=20 > /* With KVM, we don't actually know whether KVM supports an > * unbounded RMA (PR KVM) or is limited by the hash table size > @@ -1154,6 +1152,12 @@ static void ppc_spapr_init(QEMUMachineInitArgs *ar= gs) > } > } >=20 > + if (spapr->rma_size > node0_size) { > + fprintf(stderr, "Error: Numa node 0 has to span the RMA (%#08"HW= ADDR_PRIx")\n", > + spapr->rma_size); > + exit(1); > + } ... so in the above example you would get the error + exit here. Or did I miss something? Thomas