From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBMmp-0003dQ-05 for qemu-devel@nongnu.org; Wed, 14 Jan 2015 07:11:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBMmn-0004Ga-Vv for qemu-devel@nongnu.org; Wed, 14 Jan 2015 07:10:58 -0500 Message-ID: <54B65CBD.2080807@redhat.com> Date: Wed, 14 Jan 2015 13:10:37 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1421202819-19860-1-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1421202819-19860-1-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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: David Gibson , aik@ozlabs.ru, mdroth@us.ibm.com, agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 14/01/2015 03:33, 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 every > one, the device supports an "index" property which is a shorthand setting > the various window and configuration addresses from a predefined sensible > set. > > 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. > > 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. > > 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(-) > > 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, Error **errp) > return; > } > > + 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 = SPAPR_PCI_BASE_BUID + sphb->index; > sphb->dma_liobn = SPAPR_PCI_BASE_LIOBN + sphb->index; > > @@ -669,7 +675,7 @@ static void spapr_phb_reset(DeviceState *qdev) > } > > static Property spapr_phb_properties[] = { > - 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; > > - int32_t index; > + uint32_t index; > uint64_t buid; > char *dtbusname; > > @@ -94,6 +94,8 @@ struct sPAPRPHBVFIOState { > int32_t iommugroupid; > }; > > +#define SPAPR_PCI_MAX_INDEX 255 > + > #define SPAPR_PCI_BASE_BUID 0x800000020000000ULL > > #define SPAPR_PCI_WINDOW_BASE 0x10000000000ULL > Reviewed-by: Paolo Bonzini