From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yffkh-0000Ve-G0 for qemu-devel@nongnu.org; Tue, 07 Apr 2015 22:30:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yffke-0003le-HD for qemu-devel@nongnu.org; Tue, 07 Apr 2015 22:30:03 -0400 Date: Wed, 8 Apr 2015 12:01:21 +1000 From: David Gibson Message-ID: <20150408020121.GB28909@voom.redhat.com> References: <1427779727-13353-1-git-send-email-aik@ozlabs.ru> <1427779727-13353-5-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3uo+9/B/ebqu+fSQ" Content-Disposition: inline In-Reply-To: <1427779727-13353-5-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH qemu v5 04/12] spapr_pci_vfio: Enable multiple groups per container 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 --3uo+9/B/ebqu+fSQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 31, 2015 at 04:28:39PM +1100, Alexey Kardashevskiy wrote: > This enables multiple IOMMU groups in one VFIO container which means > that multiple devices from different groups can share the same IOMMU > table (or tables if DDW). >=20 > This removes a group id from vfio_container_ioctl(). The kernel support > is required for this; if the host kernel does not have the support, > it will allow only one group per container. The PHB's "iommuid" property > is ignored. >=20 > This adds a sanity check that there is just one VFIO container per > PHB address space. >=20 > Signed-off-by: Alexey Kardashevskiy [snip] > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index b012620..99e1900 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -915,21 +915,23 @@ void vfio_put_base_device(VFIODevice *vbasedev) > close(vbasedev->fd); > } > =20 > -static int vfio_container_do_ioctl(AddressSpace *as, int32_t groupid, > +static int vfio_container_do_ioctl(AddressSpace *as, > int req, void *param) > { > - VFIOGroup *group; > VFIOContainer *container; > - int ret =3D -1; > + int ret; > + VFIOAddressSpace *space; > =20 > - group =3D vfio_get_group(groupid, as); > - if (!group) { > - error_report("vfio: group %d not registered", groupid); > - return ret; > - } > + space =3D vfio_get_address_space(as); > + container =3D QLIST_FIRST(&space->containers); So getting the container handle from the address space, rather than the group id certainly makes more sense to me. > - container =3D group->container; > - if (group->container) { > + if (!container) { > + error_report("vfio: container is not set"); > + return -1; > + } else if (QLIST_NEXT(container, next)) { > + error_report("vfio: multiple containers per PHB are not supporte= d"); > + return -1; But if only one PHB per address space is possible, why is the containers field a list in the first place? > + } else { > ret =3D ioctl(container->fd, req, param); > if (ret < 0) { > error_report("vfio: failed to ioctl %d to container: ret=3D%= d, %s", > @@ -937,12 +939,10 @@ static int vfio_container_do_ioctl(AddressSpace *as= , int32_t groupid, > } > } > =20 > - vfio_put_group(group); > - > return ret; > } > =20 > -int vfio_container_ioctl(AddressSpace *as, int32_t groupid, > +int vfio_container_ioctl(AddressSpace *as, > int req, void *param) > { > /* We allow only certain ioctls to the container */ > @@ -957,5 +957,5 @@ int vfio_container_ioctl(AddressSpace *as, int32_t gr= oupid, > return -1; > } > =20 > - return vfio_container_do_ioctl(as, groupid, req, param); > + return vfio_container_do_ioctl(as, req, param); > } > diff --git a/include/hw/vfio/vfio.h b/include/hw/vfio/vfio.h > index 0b26cd8..76b5744 100644 > --- a/include/hw/vfio/vfio.h > +++ b/include/hw/vfio/vfio.h > @@ -3,7 +3,7 @@ > =20 > #include "qemu/typedefs.h" > =20 > -extern int vfio_container_ioctl(AddressSpace *as, int32_t groupid, > +extern int vfio_container_ioctl(AddressSpace *as, > int req, void *param); > =20 > #endif --=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 --3uo+9/B/ebqu+fSQ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVJIvxAAoJEGw4ysog2bOSSBUP/AvPWjyFS5RJNBNhKFXiAWsr Zemz+EyOkvpEj907NdTfXXA1YSPM0JHuCr+M3COulgla8bsWaDtPopAl8WAxfbvG oJ4zBPvCYDYzQiNcytK3Vvpm+9m2mlVS+wzohGBda9O3wJFaY6Zw7tZx3QzWUvR4 X9xaYGawXgzQ9p0CQX14F9C5/oQ5we5JGjWnNsMkPmZjf0mtaag5Ji4uj91PV9Br XBYnj9JZHb/7xiw37UcYChruVYaa0/yHxWG1FhUht2MnGOg+Dq2W4c54mjmMPNH1 Yacq0OkeOCL2HKQ5nt2ODJ6lOtaKLYz7xWM6GotjGP9HnAWJGddO5IWZztVjcP3h ZoyzEL2cQTA4UM1Vktsg1CbVVXJgto+uENBkyxFCJfX2CdhvyU2a1E0DphuTeHZd WCwSJeQBOtxtRKxBnqHG7INCaaALuMZn1SOKM5ZvL52k6AAgViEe7wHJkrXsRa21 XfHJYJJXqAjWNx3EzOKytDCytkov7ddhP9xnu1FcFH4Ix6SDO+ZB/vCaJiLTDnrO eo+gbjXkyiQTQbv/6nJlcYekRlfuCfNoI1EJ2Wd6WNA+bJC2wqFtrXE7hsRGebmM ppZjJo1FU+P32Fvu3mnPu7OxrFUUxtBq6mMLgwPpMTowuyWMUvVOVRamc/TqbWqM CyvAwrypUVggsDsxuRqr =tR7a -----END PGP SIGNATURE----- --3uo+9/B/ebqu+fSQ--