From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D78A9C3F2C6 for ; Tue, 3 Mar 2020 03:53:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B73F20866 for ; Tue, 3 Mar 2020 03:53:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="OOAI5ui5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B73F20866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8ycO-0006If-Ol for qemu-devel@archiver.kernel.org; Mon, 02 Mar 2020 22:53:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35421) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8yTY-0004lg-4H for qemu-devel@nongnu.org; Mon, 02 Mar 2020 22:44:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8yTW-0002I4-QU for qemu-devel@nongnu.org; Mon, 02 Mar 2020 22:44:07 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:52151) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8yTW-0002FH-EL; Mon, 02 Mar 2020 22:44:06 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 48WjY64yttz9sT5; Tue, 3 Mar 2020 14:43:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1583207034; bh=TMpWHCpIYUqLIDccEPgFcDolGGDxOSwMSGtwzXipxWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OOAI5ui5JpBDAeedzF/yrODRLYH2a20fEm3aPxr8aArVMEOmRhr02JmoYgWGnRReu 8cHXioZC6epcvt7sa0hIcXmXlXYSg0hh2sm3bA6QBJRY0vGwZQxeUaFoTvZXrWbMMR /83qmH9IqFQUPxAhVbzYfCmiIHU2flO6A2DE9jM8= From: David Gibson To: qemu-ppc@nongnu.org, clg@kaod.org, qemu-devel@nongnu.org, groug@kaod.org Subject: [PATCH v7 16/17] spapr: Clean up RMA size calculation Date: Tue, 3 Mar 2020 14:43:50 +1100 Message-Id: <20200303034351.333043-17-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200303034351.333043-1-david@gibson.dropbear.id.au> References: <20200303034351.333043-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, Thomas Huth , Xiao Guangrong , farosas@linux.ibm.com, aik@ozlabs.ru, "Michael S. Tsirkin" , Mark Cave-Ayland , Paolo Bonzini , paulus@samba.org, "Edgar E. Iglesias" , Igor Mammedov , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 fro= m * 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 --- hw/ppc/spapr.c | 60 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 95bda4a615..2eb0d8f70d 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2648,6 +2648,41 @@ 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 %ldMiB guest RMA (Real Mode Area me= mory)", + MIN_RMA_SLOF / MiB); + return 0; + } + + return rma_size; +} + /* pSeries LPAR / sPAPR hardware init */ static void spapr_machine_init(MachineState *machine) { @@ -2659,7 +2694,6 @@ static void spapr_machine_init(MachineState *machin= e) 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 +2733,7 @@ static void spapr_machine_init(MachineState *machi= ne) 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 +2970,6 @@ static void spapr_machine_init(MachineState *machi= ne) } } =20 - if (spapr->rma_size < MIN_RMA_SLOF) { - error_report( - "pSeries SLOF firmware requires >=3D %ldMiB guest RMA (Real = Mode Area memory)", - MIN_RMA_SLOF / MiB); - exit(1); - } - if (kernel_filename) { uint64_t lowaddr =3D 0; =20 --=20 2.24.1