From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGd6l-0005Cm-Gy for qemu-devel@nongnu.org; Wed, 28 Jan 2015 19:37:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGd6k-0001QE-Ci for qemu-devel@nongnu.org; Wed, 28 Jan 2015 19:37:19 -0500 Date: Thu, 29 Jan 2015 11:37:32 +1100 From: David Gibson Message-ID: <20150129003732.GJ14681@voom> References: <1421202819-19860-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QxIEt88oQPsT6QmF" Content-Disposition: inline In-Reply-To: <1421202819-19860-1-git-send-email-david@gibson.dropbear.id.au> Subject: Re: [Qemu-devel] [PATCH] pseries: Limit PCI host bridge "index" value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aik@ozlabs.ru, mdroth@us.ibm.com, agraf@suse.de Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org --QxIEt88oQPsT6QmF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Ping agraf, Any word on merging this? On Wed, Jan 14, 2015 at 01:33:39PM +1100, David Gibson wrote: > pseries guests can have large numbers of PCI host bridges. To avoid the > user having to specify a number of different configuration values for eve= ry > one, the device supports an "index" property which is a shorthand setting > the various window and configuration addresses from a predefined sensible > set. >=20 > There are some problems with the details at present: > * The "index" propery is signed, but negative values will create PCI > windows below where we expect, potentially colliding with other devices > * No limit is imposed on the "index" property and large values can > translate to extremely large window addresses. With PCI passthrough in > particular this can mean we exceed various mapping and physical address > limits causing the guest host bridge to not work in strange ways. >=20 > This patch addresses this, by making "index" unsigned, and imposing a > limit. Currently the limit allows indices from 0..255 which is probably > enough host bridges for the time being. It's fairly easy to extend if > we discover we need more. >=20 > Signed-off-by: David Gibson > --- > hw/ppc/spapr_pci.c | 8 +++++++- > include/hw/pci-host/spapr.h | 4 +++- > 2 files changed, 10 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 21b95b3..6deeb19 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -501,6 +501,12 @@ static void spapr_phb_realize(DeviceState *dev, Erro= r **errp) > return; > } > =20 > + if (sphb->index > SPAPR_PCI_MAX_INDEX) { > + error_setg(errp, "\"index\" for PAPR PHB is too large (max %= u)", > + SPAPR_PCI_MAX_INDEX); > + return; > + } > + > sphb->buid =3D SPAPR_PCI_BASE_BUID + sphb->index; > sphb->dma_liobn =3D SPAPR_PCI_BASE_LIOBN + sphb->index; > =20 > @@ -669,7 +675,7 @@ static void spapr_phb_reset(DeviceState *qdev) > } > =20 > static Property spapr_phb_properties[] =3D { > - DEFINE_PROP_INT32("index", sPAPRPHBState, index, -1), > + DEFINE_PROP_UINT32("index", sPAPRPHBState, index, -1), > DEFINE_PROP_UINT64("buid", sPAPRPHBState, buid, -1), > DEFINE_PROP_UINT32("liobn", sPAPRPHBState, dma_liobn, -1), > DEFINE_PROP_UINT64("mem_win_addr", sPAPRPHBState, mem_win_addr, -1), > diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h > index 4ea2a0d..876ecf0 100644 > --- a/include/hw/pci-host/spapr.h > +++ b/include/hw/pci-host/spapr.h > @@ -64,7 +64,7 @@ typedef struct spapr_pci_msi_mig { > struct sPAPRPHBState { > PCIHostState parent_obj; > =20 > - int32_t index; > + uint32_t index; > uint64_t buid; > char *dtbusname; > =20 > @@ -94,6 +94,8 @@ struct sPAPRPHBVFIOState { > int32_t iommugroupid; > }; > =20 > +#define SPAPR_PCI_MAX_INDEX 255 > + > #define SPAPR_PCI_BASE_BUID 0x800000020000000ULL > =20 > #define SPAPR_PCI_WINDOW_BASE 0x10000000000ULL --=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 --QxIEt88oQPsT6QmF Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUyYDMAAoJEGw4ysog2bOSMfkP/R/a+jJs8FRmdCDhJA/lXaPg UPEtEtja1ipvmKjL7SADQCYedOCIRTxWqh3K2E26x0EVOOZb+/O4AE/+8qzjI/55 gZLqMi5rSE/eMvOVAYYS4zuIVqNBWFziKCG9vrSHby2uZVj4aILI6wX8aptp1H0h GT4Nvhb1kFmuv8vSdyuGbUucVIQo1+QVK+Onm8nLpqbbPrKdqMkKfHgWRrnX9AbM kLFBdaTbWEJhLr0Zw6F6bqKYUYcMmwCSup59Up/V33CTdcqhQAIQPwSpAqJK/Tp9 I8ptRH6e4LPf9Xj8vAXsme27eoRBeNdib8H5Wu0IMkWh4YhdpjLLJ5nCUCZqGjry gsqLJ/tm/RMP9Ziq28yTCcqe92w8Oz/DIzNzkUHxwjERYzRz5OD7fWr9vZdOVaaI olWg8HvsJj8gSHes8SKmHVhnyS3CmFP4rbpdWX+csCtZz0h8mwW1jD2ZCHa9jh1D 9GTZ2btD+CoJTkKUEJgul6iHf7O9ZedsjFsP912m1DkjnyTIugXnFEZxojQgCt// MoLRm2NoZ72gpSpih5wThumSBssaaWuQH341w3e3sc82Oy2Lg4l2yny6A5frgtsB rAlJd1slQaZiqA9eCgNcGG23yuKOIN1GdsDhtClocBlbFngzJsknNzp2sUU4Njns nkKB83n5QNsJNEGrWQJ1 =sE1/ -----END PGP SIGNATURE----- --QxIEt88oQPsT6QmF--