From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abM41-0001z0-Ik for qemu-devel@nongnu.org; Thu, 03 Mar 2016 00:44:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abM3w-00069D-Dg for qemu-devel@nongnu.org; Thu, 03 Mar 2016 00:44:40 -0500 Date: Thu, 3 Mar 2016 16:36:33 +1100 From: David Gibson Message-ID: <20160303053633.GJ1620@voom.redhat.com> References: <1456823441-46757-1-git-send-email-aik@ozlabs.ru> <1456823441-46757-10-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qD3brAgIG4LbUq6d" Content-Disposition: inline In-Reply-To: <1456823441-46757-10-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH qemu v13 09/16] vfio: Generalize IOMMU memory listener 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 --qD3brAgIG4LbUq6d Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 01, 2016 at 08:10:34PM +1100, Alexey Kardashevskiy wrote: > At the moment VFIOContainer uses one memory listener which listens on > PCI address space for both Type1 and sPAPR IOMMUs. Soon we will need > another listener to listen on RAM; this will do DMA memory > pre-registration for sPAPR guests which basically pins all guest > pages in the host physical RAM. >=20 > This introduces VFIOMemoryListener which is wrapper for MemoryListener > and stores a pointer to the container. This allows having multiple > memory listeners for the same container. This replaces the existing > @listener with @iommu_listener. >=20 > This should cause no change in behavior. This is nonsense. The two listeners you're talking about have (or should have) both a different AS they're listening on, *and* different notification functions. Since they have nothing in common, there's no point trying to build a common structure for them. >=20 > Signed-off-by: Alexey Kardashevskiy > --- > hw/vfio/common.c | 41 +++++++++++++++++++++++++++++++------= ---- > include/hw/vfio/vfio-common.h | 9 ++++++++- > 2 files changed, 39 insertions(+), 11 deletions(-) >=20 > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index ca3fd47..0e67a5a 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -318,10 +318,10 @@ static hwaddr vfio_container_granularity(VFIOContai= ner *container) > return (hwaddr)1 << ctz64(container->iova_pgsizes); > } > =20 > -static void vfio_listener_region_add(MemoryListener *listener, > +static void vfio_listener_region_add(VFIOMemoryListener *vlistener, > MemoryRegionSection *section) > { > - VFIOContainer *container =3D container_of(listener, VFIOContainer, l= istener); > + VFIOContainer *container =3D vlistener->container; > hwaddr iova, end; > Int128 llend; > void *vaddr; > @@ -425,10 +425,10 @@ fail: > } > } > =20 > -static void vfio_listener_region_del(MemoryListener *listener, > +static void vfio_listener_region_del(VFIOMemoryListener *vlistener, > MemoryRegionSection *section) > { > - VFIOContainer *container =3D container_of(listener, VFIOContainer, l= istener); > + VFIOContainer *container =3D vlistener->container; > hwaddr iova, end; > int ret; > MemoryRegion *iommu =3D NULL; > @@ -492,14 +492,33 @@ static void vfio_listener_region_del(MemoryListener= *listener, > } > } > =20 > -static const MemoryListener vfio_memory_listener =3D { > - .region_add =3D vfio_listener_region_add, > - .region_del =3D vfio_listener_region_del, > +static void vfio_iommu_listener_region_add(MemoryListener *listener, > + MemoryRegionSection *section) > +{ > + VFIOMemoryListener *vlistener =3D container_of(listener, VFIOMemoryL= istener, > + listener); > + > + vfio_listener_region_add(vlistener, section); > +} > + > + > +static void vfio_iommu_listener_region_del(MemoryListener *listener, > + MemoryRegionSection *section) > +{ > + VFIOMemoryListener *vlistener =3D container_of(listener, VFIOMemoryL= istener, > + listener); > + > + vfio_listener_region_del(vlistener, section); > +} > + > +static const MemoryListener vfio_iommu_listener =3D { > + .region_add =3D vfio_iommu_listener_region_add, > + .region_del =3D vfio_iommu_listener_region_del, > }; > =20 > static void vfio_listener_release(VFIOContainer *container) > { > - memory_listener_unregister(&container->listener); > + memory_listener_unregister(&container->iommu_listener.listener); > } > =20 > int vfio_mmap_region(Object *obj, VFIORegion *region, > @@ -768,9 +787,11 @@ static int vfio_connect_container(VFIOGroup *group, = AddressSpace *as) > goto free_container_exit; > } > =20 > - container->listener =3D vfio_memory_listener; > + container->iommu_listener.container =3D container; > + container->iommu_listener.listener =3D vfio_iommu_listener; > =20 > - memory_listener_register(&container->listener, container->space->as); > + memory_listener_register(&container->iommu_listener.listener, > + container->space->as); > =20 > if (container->error) { > ret =3D container->error; > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 9ffa681..b6b736c 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -57,12 +57,19 @@ typedef struct VFIOAddressSpace { > QLIST_ENTRY(VFIOAddressSpace) list; > } VFIOAddressSpace; > =20 > +typedef struct VFIOContainer VFIOContainer; > + > +typedef struct VFIOMemoryListener { > + struct MemoryListener listener; > + VFIOContainer *container; > +} VFIOMemoryListener; > + > struct VFIOGroup; > =20 > typedef struct VFIOContainer { > VFIOAddressSpace *space; > int fd; /* /dev/vfio/vfio, empowered by the attached groups */ > - MemoryListener listener; > + VFIOMemoryListener iommu_listener; > int error; > bool initialized; > /* --=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 --qD3brAgIG4LbUq6d Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJW181hAAoJEGw4ysog2bOSgrEP/0P6kG8Zji5yaPtItZmb84qr BQrWUr2Jl4J/mfe1TxHRVN5GVtQfvuWMMG7gXUG5IWjN90/TcLCaP1bQQKT9dw0K Bsk6E/H5LL1mtRygUrT0YjvVusT17zKzVEevOWkEONwb5CAJhaNjslLBgRrl39DN iX0GFzAMptbYDsWPuu17moDyZ5doWjIzjE5R7zWOND6h2UXZcp5BXWeMDCgXTvhy 77wzwSENuALcpWL6ZMdTZYzJNBDPWT0mx5BU1ZanM64MP+/PYG+rGF/a/oe8D20T Glgkm57jolCQRXe+nxpv+n3KpupMPy626UjQqW450TdWq/mbS+MUf7qwY03iHMfB g4dJEyEdwykwnologLtob460DQ+NvyVx10AzLRqo8yYiVj+2vO3Ht+WTf2/p3dli 0kSzePvlzMssFwIm1f3WhQpl3963jW60Yv8QzNPtqyJhkfEYWFCJvPE6vmx1mxAR VHOZUdC6/vlHubfnqGUlZYPk8jn0qsQZ0bY9ttP/vYgp163pJQHwJlt+ObCJwAap MKKv0mADK0WMje5LO3NZpLRbd5eLBWuuvkvX6zq+snyNjxkyMqQdpOy7T57MRI2u tlvYP1PfTHx9je2rAV2BKSEOSPb593ZbNn2vwtcjKx31tV7sjAWDrLlLRFCpPwuh 878bylou2KVZVnC3IQeA =fJnO -----END PGP SIGNATURE----- --qD3brAgIG4LbUq6d--