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=-8.1 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_SANE_1 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 51CE0C4360C for ; Fri, 4 Oct 2019 04:12:28 +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 1A4C52086A for ; Fri, 4 Oct 2019 04:12:28 +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="LYtaETBJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A4C52086A 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]:42141 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGEx9-00065b-9u for qemu-devel@archiver.kernel.org; Fri, 04 Oct 2019 00:12:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39629) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGEvs-0005WE-Bz for qemu-devel@nongnu.org; Fri, 04 Oct 2019 00:11:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGEvn-0003Yv-In for qemu-devel@nongnu.org; Fri, 04 Oct 2019 00:11:06 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:38569 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGEvh-0002oH-DB; Fri, 04 Oct 2019 00:10:59 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46kxHv14Slz9sPv; Fri, 4 Oct 2019 14:10:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1570162251; bh=VdcdyaF8c/sVJ05ZG09iWt9TZcIS03n1Eh4RNe3OP+w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LYtaETBJgsoanGH1Rdwx+0N8jO0L/wTxp8lCsXhmrr6rSTrZ4Y7ijxkVV+9ZAbdY+ Ws8Lb3kTdqwJ8wEpYqXNZd0Hy0P9B0IC7kD0Lj+QfyIWMXrWG6vYoiUuRxxEcqOlP+ 3xORbgQbTMdcC3gHu5eYVRq8kMkb0lC41iizXJy8= Date: Fri, 4 Oct 2019 14:07:25 +1000 From: David Gibson To: Greg Kurz Subject: Re: [PATCH 2/7] spapr, xive: Turn "nr-ends" property into "nr-servers" property Message-ID: <20191004040725.GB27597@umbus.fritz.box> References: <157010404888.246126.9768030542733152637.stgit@bahia.lan> <157010406203.246126.13381271918474281392.stgit@bahia.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="dc+cDN39EJAMEtIO" Content-Disposition: inline In-Reply-To: <157010406203.246126.13381271918474281392.stgit@bahia.lan> User-Agent: Mutt/1.12.1 (2019-06-15) 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: qemu-ppc@nongnu.org, =?iso-8859-1?Q?C=E9dric?= Le Goater , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --dc+cDN39EJAMEtIO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 03, 2019 at 02:01:13PM +0200, Greg Kurz wrote: > The sPAPR XIVE object has an nr_ends field which happens to be a > multiple of spapr_max_server_number(). It is currently set with > the help of "nr-ends" property. This is a bit unfortunate since > it exposes to the sPAPR irq frontend what should remain an > implemantation detail within the XIVE backend. >=20 > It will be possible soon to inform the XIVE KVM device about the > range of VCPU ids that may be used in the VM, as returned by the > spapr_max_server_number() function. This will allow the device > to substantially reduce the consumption of scarce resources > in the XIVE HW. >=20 > For both reasons, replace the "nr-ends" property with an "nr-servers" > one. The existing nr_ends field must be kept though since it tells how > many ENDs are migrated, it is derived from "nr-servers" at realize time > for simplicity. Convert spapr_dt_xive() to use it as well. >=20 > Signed-off-by: Greg Kurz > --- > hw/intc/spapr_xive.c | 21 ++++++++++++++++----- > hw/ppc/spapr_irq.c | 2 +- > include/hw/ppc/spapr_xive.h | 1 + > 3 files changed, 18 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index 04879abf2e7a..62888ddc68db 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -99,6 +99,15 @@ int spapr_xive_end_to_target(uint8_t end_blk, uint32_t= end_idx, > return 0; > } > =20 > +static uint32_t spapr_xive_vcpu_id_to_end_idx(uint32_t vcpu_id) > +{ > + /* > + * 8 XIVE END structures per CPU. One for each available > + * priority > + */ > + return vcpu_id << 3; > +} > + > static void spapr_xive_cpu_to_end(PowerPCCPU *cpu, uint8_t prio, > uint8_t *out_end_blk, uint32_t *out_en= d_idx) > { > @@ -109,7 +118,7 @@ static void spapr_xive_cpu_to_end(PowerPCCPU *cpu, ui= nt8_t prio, > } > =20 > if (out_end_idx) { > - *out_end_idx =3D (cpu->vcpu_id << 3) + prio; > + *out_end_idx =3D spapr_xive_vcpu_id_to_end_idx(cpu->vcpu_id) + p= rio; > } > } > =20 > @@ -283,11 +292,13 @@ static void spapr_xive_realize(DeviceState *dev, Er= ror **errp) > return; > } > =20 > - if (!xive->nr_ends) { > - error_setg(errp, "Number of interrupt needs to be greater 0"); > + if (!xive->nr_servers) { > + error_setg(errp, "Number of interrupt servers must be greater th= an 0"); > return; > } > =20 > + xive->nr_ends =3D spapr_xive_vcpu_id_to_end_idx(xive->nr_servers); I'd prefer not to store both nr_servers and nr_servers * 8 in the structure. I think you just want xive->nr_servers, then derive it any any places that current look at xive->nr_ends. > /* > * Initialize the internal sources, for IPIs and virtual devices. > */ > @@ -489,7 +500,7 @@ static const VMStateDescription vmstate_spapr_xive = =3D { > =20 > static Property spapr_xive_properties[] =3D { > DEFINE_PROP_UINT32("nr-irqs", SpaprXive, nr_irqs, 0), > - DEFINE_PROP_UINT32("nr-ends", SpaprXive, nr_ends, 0), > + DEFINE_PROP_UINT32("nr-servers", SpaprXive, nr_servers, 0), Technically speaking the user can reach in using -global and modify QOM properties like this, so this is arguably an interface breakage. That said, I've always thought it was kind of a problem that the way QOM is used internally thereby exposes as interface a bunch of things that are really intended to be internal. So... I'm inclined to go ahead with this anyway. I won't tell if you don't. > DEFINE_PROP_UINT64("vc-base", SpaprXive, vc_base, SPAPR_XIVE_VC_BASE= ), > DEFINE_PROP_UINT64("tm-base", SpaprXive, tm_base, SPAPR_XIVE_TM_BASE= ), > DEFINE_PROP_END_OF_LIST(), > @@ -1550,7 +1561,7 @@ void spapr_dt_xive(SpaprMachineState *spapr, uint32= _t nr_servers, void *fdt, > /* Interrupt number ranges for the IPIs */ > uint32_t lisn_ranges[] =3D { > cpu_to_be32(0), > - cpu_to_be32(nr_servers), > + cpu_to_be32(xive->nr_servers), > }; > /* > * EQ size - the sizes of pages supported by the system 4K, 64K, > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 457eabe24cda..025fd00143a2 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -591,7 +591,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error *= *errp) > * 8 XIVE END structures per CPU. One for each available > * priority > */ > - qdev_prop_set_uint32(dev, "nr-ends", nr_servers << 3); > + qdev_prop_set_uint32(dev, "nr-servers", nr_servers); > qdev_init_nofail(dev); > =20 > spapr->xive =3D SPAPR_XIVE(dev); > diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h > index 0df20a6590a5..4a4a6fc6be7f 100644 > --- a/include/hw/ppc/spapr_xive.h > +++ b/include/hw/ppc/spapr_xive.h > @@ -22,6 +22,7 @@ typedef struct SpaprXive { > /* Internal interrupt source for IPIs and virtual devices */ > XiveSource source; > hwaddr vc_base; > + uint32_t nr_servers; This is a basic paraneter, not really related to the internal source structure, so I'd move it up above that comment there. > =20 > /* END ESB MMIOs */ > XiveENDSource end_source; >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --dc+cDN39EJAMEtIO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl2WxXsACgkQbDjKyiDZ s5KuKg//Xld4sY7aLhQ0Ru/GZlSFXncphmuXG5sR1zA/jZfX3pIiH2XMGMb9zIOG anRJhJGSfne6CHS4RmThlchBbgHBtRKcgYFdaGpd6wUoyrGismqQlUastoQiQ3TM sCPyU3fAe22QmGKh4UrUK6/+L3Q7Gyvq5JMNXW0zY6r3bRjKSGcehPYUqaRogmnH qUlAOo6AMx1uxrD0zEc/44siToDyjDqSsAwcV31a8BF4EHA6N2L3NZFm7NWrc04X 9900eT8dBtigWaE5yAL9xM2WJQtePDbTEm802e+SXA9RfhsZIcWv9t/CZ0QiKTnl EZu/fbg3fQieRZgmswZssG3KhirBGFzLKvr3PXWVybl/VaEVaRoM8nhGgHcBQYhT 15Ek5Eth3XygtOOVwnvCVK0wgqXFz3K2o4SVkQa/iDIgLhNTfykwC4eoE0e3vqoV P5vv4KCrv1wlVrxIe3hVQ/0Aot/8vFPoltYP1xKlgPrs/SOuPFKI/Jc2OYbSjEt3 gxPeag4lKXNVGNVrH8cg9TU9sDSyPlV3Zi3+xrsHUvx4Mrae4EcbXIB7vlcQ5C4f jdSqKIPcb3jKNU0ortsrbImg3miu2hU9zN8PS/Ne8Zuj/aUYnZOX5vGCotOnI8lm +RWtNUhSUIANhnpxuLkVAV9lHmM/BcjKco4vzs4QqlZq2HQvz38= =zzAv -----END PGP SIGNATURE----- --dc+cDN39EJAMEtIO--