From nobody Thu Oct 2 03:23:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1584440229; cv=none; d=zohomail.com; s=zohoarc; b=j8erm6ecNELO2v8m+iaW+4WjTIKsvOlnJMeQxlQFp9VI/UkfAZKJzN5k/4SeQIOlmcNXe625dkOvZkksXXINnfzBbSiiaD/QVPNGM2cUyEbgM2M7oWPiqeBOiAX5IEFbiOWniDpTyLzDjbHPniMmSVVliGw/0Z2hUqx+DHu7RCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584440229; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DwNvXDY8sUFkDYnQDirukNEJHqfWa9Z4lQ5iv+FNYqQ=; b=AqazOUk0FKBmGbTFNDEGrhOfFkAOS7WVyBla1w7aBkfzInqjsi27C6cK56MgaWVVMp+64HAnzB5/VKdfMpCJbs5CebjCx8Zg5G6PUCpUaBMT6D8uMn2lsq66tIEwcs8GiPXEyx9PDa4nhFtcXLKUkxmXB53MvtcsCXreF2xLH34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15844402299371004.6538354989672; Tue, 17 Mar 2020 03:17:09 -0700 (PDT) Received: from localhost ([::1]:55720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE9HY-0006XF-RP for importer@patchew.org; Tue, 17 Mar 2020 06:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45935) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE967-0001iB-EG for qemu-devel@nongnu.org; Tue, 17 Mar 2020 06:05:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE965-0005YK-Qc for qemu-devel@nongnu.org; Tue, 17 Mar 2020 06:05:19 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:57809 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jE965-0002os-Bl; Tue, 17 Mar 2020 06:05:17 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 48hTKx6jdnz9sTC; Tue, 17 Mar 2020 21:04:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1584439477; bh=o7N/dshst+CIkSfq9Go1qUnQPzkKuFsVjI0nGOok1OU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MxarlFhTsBJfLcn+OBdW+1z9HbK7kbwamUkQIbmqchS2vq2HRzBvk+oJyjNKqqhXh GQTIKY196jYmQdFqAdqd5Rr/2u5axjGOlcFJIT78cAA26n+95ZWuFjlr+u8c2QFlyk CHKq2qD927Odkv+6/6QxbNkAv+/19dBKClEW43+M= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 21/45] spapr: Clean up RMA size calculation Date: Tue, 17 Mar 2020 21:03:59 +1100 Message-Id: <20200317100423.622643-22-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317100423.622643-1-david@gibson.dropbear.id.au> References: <20200317100423.622643-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Move the calculation of the Real Mode Area (RMA) size into a helper function. While we're there clean it up and correct it in a few ways: * Add comments making it clearer where the various constraints come from * Remove a pointless check that the RMA fits within Node 0 (we've just clamped it so that it does) Signed-off-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 61 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 95bda4a615..1950fc303e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2648,6 +2648,42 @@ static PCIHostState *spapr_create_default_phb(void) return PCI_HOST_BRIDGE(dev); } =20 +static hwaddr spapr_rma_size(SpaprMachineState *spapr, Error **errp) +{ + MachineState *machine =3D MACHINE(spapr); + SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); + hwaddr rma_size =3D machine->ram_size; + hwaddr node0_size =3D spapr_node0_size(machine); + + /* RMA has to fit in the first NUMA node */ + rma_size =3D MIN(rma_size, node0_size); + + /* + * VRMA access is via a special 1TiB SLB mapping, so the RMA can + * never exceed that + */ + rma_size =3D MIN(rma_size, 1 * TiB); + + /* + * Clamp the RMA size based on machine type. This is for + * migration compatibility with older qemu versions, which limited + * the RMA size for complicated and mostly bad reasons. + */ + if (smc->rma_limit) { + rma_size =3D MIN(rma_size, smc->rma_limit); + } + + if (rma_size < MIN_RMA_SLOF) { + error_setg(errp, + "pSeries SLOF firmware requires >=3D %" HWADDR_PRIx + "ldMiB guest RMA (Real Mode Area memory)", + MIN_RMA_SLOF / MiB); + return 0; + } + + return rma_size; +} + /* pSeries LPAR / sPAPR hardware init */ static void spapr_machine_init(MachineState *machine) { @@ -2659,7 +2695,6 @@ static void spapr_machine_init(MachineState *machine) PCIHostState *phb; int i; MemoryRegion *sysmem =3D get_system_memory(); - hwaddr node0_size =3D spapr_node0_size(machine); long load_limit, fw_size; char *filename; Error *resize_hpt_err =3D NULL; @@ -2699,22 +2734,7 @@ static void spapr_machine_init(MachineState *machine) exit(1); } =20 - spapr->rma_size =3D node0_size; - - /* - * Clamp the RMA size based on machine type. This is for - * migration compatibility with older qemu versions, which limited - * the RMA size for complicated and mostly bad reasons. - */ - if (smc->rma_limit) { - spapr->rma_size =3D MIN(spapr->rma_size, smc->rma_limit); - } - - if (spapr->rma_size > node0_size) { - error_report("Numa node 0 has to span the RMA (%#08"HWADDR_PRIx")", - spapr->rma_size); - exit(1); - } + spapr->rma_size =3D spapr_rma_size(spapr, &error_fatal); =20 /* Setup a load limit for the ramdisk leaving room for SLOF and FDT */ load_limit =3D MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; @@ -2951,13 +2971,6 @@ static void spapr_machine_init(MachineState *machine) } } =20 - if (spapr->rma_size < MIN_RMA_SLOF) { - error_report( - "pSeries SLOF firmware requires >=3D %ldMiB guest RMA (Real Mo= de Area memory)", - MIN_RMA_SLOF / MiB); - exit(1); - } - if (kernel_filename) { uint64_t lowaddr =3D 0; =20 --=20 2.24.1