From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmELs-0007AV-Bz for qemu-devel@nongnu.org; Tue, 20 Sep 2016 02:16:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmELo-0000R7-74 for qemu-devel@nongnu.org; Tue, 20 Sep 2016 02:16:19 -0400 Received: from ozlabs.org ([103.22.144.67]:56723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmELn-0000Qd-FW for qemu-devel@nongnu.org; Tue, 20 Sep 2016 02:16:16 -0400 Date: Tue, 20 Sep 2016 16:13:16 +1000 From: David Gibson Message-ID: <20160920061316.GW20488@umbus> References: <1473841548-26742-1-git-send-email-peterx@redhat.com> <1473841548-26742-3-git-send-email-peterx@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8bLSEqNM5P+Jqlqx" Content-Disposition: inline In-Reply-To: <1473841548-26742-3-git-send-email-peterx@redhat.com> Subject: Re: [Qemu-devel] [PATCH v5 2/3] memory: introduce IOMMUOps.notify_flag_changed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com, vkaplans@redhat.com, alex.williamson@redhat.com, wexu@redhat.com, pbonzini@redhat.com, cornelia.huck@de.ibm.com, dgibson@redhat.com --8bLSEqNM5P+Jqlqx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 14, 2016 at 04:25:47PM +0800, Peter Xu wrote: > The new interface can be used to replace the old notify_started() and > notify_stopped(). Meanwhile it provides explicit flags so that IOMMUs > can know what kind of notifications it is requested for. >=20 > Signed-off-by: Peter Xu Acked-by: David Gibson > --- > hw/i386/intel_iommu.c | 6 ++++-- > hw/ppc/spapr_iommu.c | 18 ++++++++++-------- > include/exec/memory.h | 9 +++++---- > memory.c | 29 +++++++++++++++++++++-------- > 4 files changed, 40 insertions(+), 22 deletions(-) >=20 > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index 28c31a2..9d49be7 100644 > --- a/hw/i386/intel_iommu.c > +++ b/hw/i386/intel_iommu.c > @@ -1974,7 +1974,9 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegi= on *iommu, hwaddr addr, > return ret; > } > =20 > -static void vtd_iommu_notify_started(MemoryRegion *iommu) > +static void vtd_iommu_notify_flag_changed(MemoryRegion *iommu, > + IOMMUNotifierFlag old, > + IOMMUNotifierFlag new) > { > VTDAddressSpace *vtd_as =3D container_of(iommu, VTDAddressSpace, iom= mu); > =20 > @@ -2348,7 +2350,7 @@ static void vtd_init(IntelIOMMUState *s) > memset(s->womask, 0, DMAR_REG_SIZE); > =20 > s->iommu_ops.translate =3D vtd_iommu_translate; > - s->iommu_ops.notify_started =3D vtd_iommu_notify_started; > + s->iommu_ops.notify_flag_changed =3D vtd_iommu_notify_flag_changed; > s->root =3D 0; > s->root_extended =3D false; > s->dmar_enabled =3D false; > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c > index f20b0b8..ae30bbe 100644 > --- a/hw/ppc/spapr_iommu.c > +++ b/hw/ppc/spapr_iommu.c > @@ -156,14 +156,17 @@ static uint64_t spapr_tce_get_min_page_size(MemoryR= egion *iommu) > return 1ULL << tcet->page_shift; > } > =20 > -static void spapr_tce_notify_started(MemoryRegion *iommu) > +static void spapr_tce_notify_flag_changed(MemoryRegion *iommu, > + IOMMUNotifierFlag old, > + IOMMUNotifierFlag new) > { > - spapr_tce_set_need_vfio(container_of(iommu, sPAPRTCETable, iommu), t= rue); > -} > + struct sPAPRTCETable *tbl =3D container_of(iommu, sPAPRTCETable, iom= mu); > =20 > -static void spapr_tce_notify_stopped(MemoryRegion *iommu) > -{ > - spapr_tce_set_need_vfio(container_of(iommu, sPAPRTCETable, iommu), f= alse); > + if (old =3D=3D IOMMU_NOTIFIER_NONE && new !=3D IOMMU_NOTIFIER_NONE) { > + spapr_tce_set_need_vfio(tbl, true); > + } else if (old !=3D IOMMU_NOTIFIER_NONE && new =3D=3D IOMMU_NOTIFIER= _NONE) { > + spapr_tce_set_need_vfio(tbl, false); Need to change those now-wrong "need_vfio" names, but that's not in scope for this patch of course. > + } > } > =20 > static int spapr_tce_table_post_load(void *opaque, int version_id) > @@ -246,8 +249,7 @@ static const VMStateDescription vmstate_spapr_tce_tab= le =3D { > static MemoryRegionIOMMUOps spapr_iommu_ops =3D { > .translate =3D spapr_tce_translate_iommu, > .get_min_page_size =3D spapr_tce_get_min_page_size, > - .notify_started =3D spapr_tce_notify_started, > - .notify_stopped =3D spapr_tce_notify_stopped, > + .notify_flag_changed =3D spapr_tce_notify_flag_changed, > }; > =20 > static int spapr_tce_table_realize(DeviceState *dev) > diff --git a/include/exec/memory.h b/include/exec/memory.h > index e69e984..e04b752 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -174,10 +174,10 @@ struct MemoryRegionIOMMUOps { > IOMMUTLBEntry (*translate)(MemoryRegion *iommu, hwaddr addr, bool is= _write); > /* Returns minimum supported page size */ > uint64_t (*get_min_page_size)(MemoryRegion *iommu); > - /* Called when the first notifier is set */ > - void (*notify_started)(MemoryRegion *iommu); > - /* Called when the last notifier is removed */ > - void (*notify_stopped)(MemoryRegion *iommu); > + /* Called when IOMMU Notifier flag changed */ > + void (*notify_flag_changed)(MemoryRegion *iommu, > + IOMMUNotifierFlag old_flags, > + IOMMUNotifierFlag new_flags); > }; > =20 > typedef struct CoalescedMemoryRange CoalescedMemoryRange; > @@ -223,6 +223,7 @@ struct MemoryRegion { > unsigned ioeventfd_nb; > MemoryRegionIoeventfd *ioeventfds; > QLIST_HEAD(, IOMMUNotifier) iommu_notify; > + IOMMUNotifierFlag iommu_notify_flags; > }; > =20 > /** > diff --git a/memory.c b/memory.c > index f65c600..b1e9664 100644 > --- a/memory.c > +++ b/memory.c > @@ -1419,6 +1419,7 @@ void memory_region_init_iommu(MemoryRegion *mr, > mr->iommu_ops =3D ops, > mr->terminates =3D true; /* then re-forwards */ > QLIST_INIT(&mr->iommu_notify); > + mr->iommu_notify_flags =3D IOMMU_NOTIFIER_NONE; > } > =20 > static void memory_region_finalize(Object *obj) > @@ -1513,16 +1514,31 @@ bool memory_region_is_logging(MemoryRegion *mr, u= int8_t client) > return memory_region_get_dirty_log_mask(mr) & (1 << client); > } > =20 > +static void memory_region_update_iommu_notify_flags(MemoryRegion *mr) > +{ > + IOMMUNotifierFlag flags =3D IOMMU_NOTIFIER_NONE; > + IOMMUNotifier *iommu_notifier; > + > + QLIST_FOREACH(iommu_notifier, &mr->iommu_notify, node) { > + flags |=3D iommu_notifier->notifier_flags; > + } > + > + if (flags !=3D mr->iommu_notify_flags && > + mr->iommu_ops->notify_flag_changed) { > + mr->iommu_ops->notify_flag_changed(mr, mr->iommu_notify_flags, > + flags); > + } > + > + mr->iommu_notify_flags =3D flags; > +} > + > void memory_region_register_iommu_notifier(MemoryRegion *mr, > IOMMUNotifier *n) > { > /* We need to register for at least one bitfield */ > assert(n->notifier_flags !=3D IOMMU_NOTIFIER_NONE); > - if (mr->iommu_ops->notify_started && > - QLIST_EMPTY(&mr->iommu_notify)) { > - mr->iommu_ops->notify_started(mr); > - } > QLIST_INSERT_HEAD(&mr->iommu_notify, n, node); > + memory_region_update_iommu_notify_flags(mr); > } > =20 > uint64_t memory_region_iommu_get_min_page_size(MemoryRegion *mr) > @@ -1560,10 +1576,7 @@ void memory_region_unregister_iommu_notifier(Memor= yRegion *mr, > IOMMUNotifier *n) > { > QLIST_REMOVE(n, node); > - if (mr->iommu_ops->notify_stopped && > - QLIST_EMPTY(&mr->iommu_notify)) { > - mr->iommu_ops->notify_stopped(mr); > - } > + memory_region_update_iommu_notify_flags(mr); > } > =20 > void memory_region_notify_iommu(MemoryRegion *mr, --=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 --8bLSEqNM5P+Jqlqx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX4NN8AAoJEGw4ysog2bOS40wQANrEi0GQnhKtCUzSDzIw82pg h8eBQFBi8COu6LG7mtrnHtTy6smY4ZnLlSFUWnTOG/PsMHWyd/WTlliVxV3kzSUW VSmiiOzcduWQVR3Ptrsw3a7p3UbY6P1zeo/7o0MIYmvxAUcZ1rXF+HNBSC025vvS c9k8D7LHPna713CvH9Jod9t+znqCS4ET37Mzb4jzaNYHfAhsUwJEq1+o7CsKuQij zx7W+5DWkY9eoQUiNq3pHoZjtuWtn3a13owXhLwwufTIYL9TLsJmrRsKrtmsw23G KdpXXH+lIWjnK3kyJSAQNnd7qL/rr0I+rLhlc9yWNHcfmFlDL8k9T2BdP+5cnV0R WqKTzLuY0Z5HaruSuXSG8QpagaUnBzkSpMaSAnSrIHVk+Df0PWIVDe50kPXkkZsI IuQ+gz60nYRmCSdqU+KKg+JmGdW2V9T4rLiI8Sj79GZ4FI8SBxhmCjZFISy0uTZd 5wRdCZLWI1/h0ls9VkMWH4yzC6eSGC2XUP67aha1wJPvI1AAHwfnO3+rOTCgQsp+ LUa5s0husoX3d7OEZNIEcja5zSJzi9ah0cRnlk3Rcv7oBlkLYjoFdceDsDhyMel6 vroOmgTrNO3ka8fz6O+rH6jmm2hXO6iNTIZCbKfNqIR3iCCk8dPhHcz+EtjA2Bkp 5OpqvpQcRgGy1CuIEtmd =l+/S -----END PGP SIGNATURE----- --8bLSEqNM5P+Jqlqx--