From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXPA4-0004et-6h for qemu-devel@nongnu.org; Fri, 26 Sep 2014 02:37:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXPA1-00060Y-VF for qemu-devel@nongnu.org; Fri, 26 Sep 2014 02:37:48 -0400 Date: Fri, 26 Sep 2014 15:47:09 +1000 From: David Gibson Message-ID: <20140926054709.GA26350@voom.redhat.com> References: <1409307142-2600-1-git-send-email-aik@ozlabs.ru> <1409307142-2600-17-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gBBFr7Ir9EOA20Yy" Content-Disposition: inline In-Reply-To: <1409307142-2600-17-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [RFC PATCH v3 16/18] spapr_pci_vfio: Enable DDW List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: Alex Williamson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf --gBBFr7Ir9EOA20Yy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 29, 2014 at 08:12:20PM +1000, Alexey Kardashevskiy wrote: > This implements DDW for VFIO. Host kernel support is required for this. >=20 > After this patch DDW will be enabled on all machines but pseries-2.1. >=20 > Signed-off-by: Alexey Kardashevskiy > --- > Changes: > v2: > * remove()/reset() callbacks use spapr_pci's ones > --- > hw/ppc/spapr_pci_vfio.c | 74 +++++++++++++++++++++++++++++++++++++++++++= ++++++ > 1 file changed, 74 insertions(+) >=20 > diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c > index e53880e..94e1361 100644 > --- a/hw/ppc/spapr_pci_vfio.c > +++ b/hw/ppc/spapr_pci_vfio.c > @@ -73,6 +73,77 @@ static void spapr_phb_vfio_finish_realize(sPAPRPHBStat= e *sphb, Error **errp) > object_unref(OBJECT(tcet)); > =20 > sphb->windows_num =3D 1; > + > + if (sphb->ddw_enabled) { > + sphb->ddw_enabled =3D !!(info.flags & VFIO_IOMMU_SPAPR_TCE_FLAG_= DDW); > + } > +} > + > +static int spapr_pci_vfio_ddw_query(sPAPRPHBState *sphb, > + uint32_t *windows_available, > + uint32_t *page_size_mask) > +{ > + sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > + struct vfio_iommu_spapr_tce_info info =3D { .argsz =3D sizeof(info) = }; > + int ret; Again, I think you should check ddw_enabled for the explicitly disabled case. > + ret =3D vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, > + VFIO_IOMMU_SPAPR_TCE_GET_INFO, &info); > + if (ret) { > + return ret; > + } Btw, is the kernel/VFIO side stuff for DDW merged yet? If not could you give me a pointer to somewhere the patches are posted, or a git tree? > + > + *windows_available =3D info.windows_available; > + *page_size_mask =3D info.page_size_mask; > + > + return ret; > +} > + > +static int spapr_pci_vfio_ddw_create(sPAPRPHBState *sphb, uint32_t page_= shift, > + uint32_t window_shift, uint32_t lio= bn, > + sPAPRTCETable **ptcet) > +{ > + sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > + struct vfio_iommu_spapr_tce_create create =3D { > + .argsz =3D sizeof(create), > + .page_shift =3D page_shift, > + .window_shift =3D window_shift, > + .start_addr =3D 0 > + }; > + int ret; > + > + ret =3D vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, > + VFIO_IOMMU_SPAPR_TCE_CREATE, &create); > + if (ret) { > + return ret; > + } > + > + *ptcet =3D spapr_tce_new_table(DEVICE(sphb), liobn, > + create.start_addr, page_shift, > + 1ULL << (window_shift - page_shift), > + true); > + memory_region_add_subregion(&sphb->iommu_root, (*ptcet)->bus_offset, > + spapr_tce_get_iommu(*ptcet)); > + > + ++sphb->windows_num; > + > + return ret; > +} > + > +static int spapr_pci_vfio_ddw_remove(sPAPRPHBState *sphb, sPAPRTCETable = *tcet) > +{ > + sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > + struct vfio_iommu_spapr_tce_remove remove =3D { > + .argsz =3D sizeof(remove), > + .start_addr =3D tcet->bus_offset > + }; > + int ret; > + > + spapr_pci_ddw_remove(sphb, tcet); > + ret =3D vfio_container_ioctl(&sphb->iommu_as, svphb->iommugroupid, > + VFIO_IOMMU_SPAPR_TCE_REMOVE, &remove); > + > + return ret; > } > =20 > static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) > @@ -82,6 +153,9 @@ static void spapr_phb_vfio_class_init(ObjectClass *kla= ss, void *data) > =20 > dc->props =3D spapr_phb_vfio_properties; > spc->finish_realize =3D spapr_phb_vfio_finish_realize; > + spc->ddw_query =3D spapr_pci_vfio_ddw_query; > + spc->ddw_create =3D spapr_pci_vfio_ddw_create; > + spc->ddw_remove =3D spapr_pci_vfio_ddw_remove; > } > =20 > static const TypeInfo spapr_phb_vfio_info =3D { --=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 --gBBFr7Ir9EOA20Yy Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUJP3dAAoJEGw4ysog2bOSyzsP/jyQ/vWTNddYS2phQdBXl8Ct dXvfBig69d0PYutiXBcabBU2+AyHF7TNYAsG5yCI6FFWH+G7RRrMBSdK/gqmqMH7 NFt230U862QiMGM2BXoop5Cw2w4+A4PlpXnHqBgCjQEM9q4yb8c16DyDhuFcC2uK LV6GQPnvzJH10YwKh3o7qylLHOnHoZXzCM6y1TSmoORonU7uGuCKZlyXCc8EQnLs Q03691d/694b130wV8WiX1WzJSOqIWR7S6dOyh2CkeiXnajItKaL95MOp0SpeFv0 7gqofk9yK77I9jmBUE5kZ6ko3G1jzZkP/lSIMniBOdZ3SG3WM/+A5ShEWw2Us7JU ICavVoIZgt3Hqa5d+Y6o3TPnsCAVR2EXTCL7WNQdPecQvE89ptXT1Uwc1G2G0VNk 7h7zxy7fOZGJj7nbIzHAmcEHzcWhaLDMw0wdlWSjbKvxwDzqgZAWsCFMi/sMtwGv UD9cBJMPyRBdKFJteziVfMNLW7FiPe046Ep7Z0YeurzEVj36E+oLGC7LMzEfAyzN Gib5H3uI1Em75BmmMUkOhIBjB5FRIUCK4UwW+SxQ8sP/qAQk3MO6ZMQjwiJJ7Wgt DuxdpwYFxHLCYwF3jR2Ky/l/J2UA7Hb7chSxQbku/7BgHckb6DnFvAq/fJEGRuVz DyC8GKJ9rpiDFufyN/fu =LJES -----END PGP SIGNATURE----- --gBBFr7Ir9EOA20Yy--