From: Yi Liu <yi.l.liu@intel.com> To: alex.williamson@redhat.com, cohuck@redhat.com, qemu-devel@nongnu.org Cc: david@gibson.dropbear.id.au, thuth@redhat.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, akrowiak@linux.ibm.com, pasic@linux.ibm.com, jjherne@linux.ibm.com, jasowang@redhat.com, kvm@vger.kernel.org, jgg@nvidia.com, nicolinc@nvidia.com, eric.auger@redhat.com, eric.auger.pro@gmail.com, kevin.tian@intel.com, yi.l.liu@intel.com, chao.p.peng@intel.com, yi.y.sun@intel.com, peterx@redhat.com Subject: [RFC 05/18] vfio/common: Rename VFIOGuestIOMMU::iommu into ::iommu_mr Date: Thu, 14 Apr 2022 03:46:57 -0700 [thread overview] Message-ID: <20220414104710.28534-6-yi.l.liu@intel.com> (raw) In-Reply-To: <20220414104710.28534-1-yi.l.liu@intel.com> Rename VFIOGuestIOMMU iommu field into iommu_mr. Then it becomes clearer it is an IOMMU memory region. no functional change intended Signed-off-by: Yi Liu <yi.l.liu@intel.com> --- hw/vfio/common.c | 16 ++++++++-------- include/hw/vfio/vfio-common.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 080046e3f5..b05f68b5c7 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -992,7 +992,7 @@ static void vfio_listener_region_add(MemoryListener *listener, * device emulation the VFIO iommu handles to use). */ giommu = g_malloc0(sizeof(*giommu)); - giommu->iommu = iommu_mr; + giommu->iommu_mr = iommu_mr; giommu->iommu_offset = section->offset_within_address_space - section->offset_within_region; giommu->container = container; @@ -1007,7 +1007,7 @@ static void vfio_listener_region_add(MemoryListener *listener, int128_get64(llend), iommu_idx); - ret = memory_region_iommu_set_page_size_mask(giommu->iommu, + ret = memory_region_iommu_set_page_size_mask(giommu->iommu_mr, container->pgsizes, &err); if (ret) { @@ -1022,7 +1022,7 @@ static void vfio_listener_region_add(MemoryListener *listener, goto fail; } QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); - memory_region_iommu_replay(giommu->iommu, &giommu->n); + memory_region_iommu_replay(giommu->iommu_mr, &giommu->n); return; } @@ -1128,7 +1128,7 @@ static void vfio_listener_region_del(MemoryListener *listener, VFIOGuestIOMMU *giommu; QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { - if (MEMORY_REGION(giommu->iommu) == section->mr && + if (MEMORY_REGION(giommu->iommu_mr) == section->mr && giommu->n.start == section->offset_within_region) { memory_region_unregister_iommu_notifier(section->mr, &giommu->n); @@ -1393,11 +1393,11 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container, VFIOGuestIOMMU *giommu; QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { - if (MEMORY_REGION(giommu->iommu) == section->mr && + if (MEMORY_REGION(giommu->iommu_mr) == section->mr && giommu->n.start == section->offset_within_region) { Int128 llend; vfio_giommu_dirty_notifier gdn = { .giommu = giommu }; - int idx = memory_region_iommu_attrs_to_index(giommu->iommu, + int idx = memory_region_iommu_attrs_to_index(giommu->iommu_mr, MEMTXATTRS_UNSPECIFIED); llend = int128_add(int128_make64(section->offset_within_region), @@ -1410,7 +1410,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container, section->offset_within_region, int128_get64(llend), idx); - memory_region_iommu_replay(giommu->iommu, &gdn.n); + memory_region_iommu_replay(giommu->iommu_mr, &gdn.n); break; } } @@ -2246,7 +2246,7 @@ static void vfio_disconnect_container(VFIOGroup *group) QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) { memory_region_unregister_iommu_notifier( - MEMORY_REGION(giommu->iommu), &giommu->n); + MEMORY_REGION(giommu->iommu_mr), &giommu->n); QLIST_REMOVE(giommu, giommu_next); g_free(giommu); } diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 8af11b0a76..e573f5a9f1 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -98,7 +98,7 @@ typedef struct VFIOContainer { typedef struct VFIOGuestIOMMU { VFIOContainer *container; - IOMMUMemoryRegion *iommu; + IOMMUMemoryRegion *iommu_mr; hwaddr iommu_offset; IOMMUNotifier n; QLIST_ENTRY(VFIOGuestIOMMU) giommu_next; -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Yi Liu <yi.l.liu@intel.com> To: alex.williamson@redhat.com, cohuck@redhat.com, qemu-devel@nongnu.org Cc: akrowiak@linux.ibm.com, jjherne@linux.ibm.com, thuth@redhat.com, yi.l.liu@intel.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, jasowang@redhat.com, farman@linux.ibm.com, peterx@redhat.com, pasic@linux.ibm.com, eric.auger@redhat.com, yi.y.sun@intel.com, chao.p.peng@intel.com, nicolinc@nvidia.com, kevin.tian@intel.com, jgg@nvidia.com, eric.auger.pro@gmail.com, david@gibson.dropbear.id.au Subject: [RFC 05/18] vfio/common: Rename VFIOGuestIOMMU::iommu into ::iommu_mr Date: Thu, 14 Apr 2022 03:46:57 -0700 [thread overview] Message-ID: <20220414104710.28534-6-yi.l.liu@intel.com> (raw) In-Reply-To: <20220414104710.28534-1-yi.l.liu@intel.com> Rename VFIOGuestIOMMU iommu field into iommu_mr. Then it becomes clearer it is an IOMMU memory region. no functional change intended Signed-off-by: Yi Liu <yi.l.liu@intel.com> --- hw/vfio/common.c | 16 ++++++++-------- include/hw/vfio/vfio-common.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 080046e3f5..b05f68b5c7 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -992,7 +992,7 @@ static void vfio_listener_region_add(MemoryListener *listener, * device emulation the VFIO iommu handles to use). */ giommu = g_malloc0(sizeof(*giommu)); - giommu->iommu = iommu_mr; + giommu->iommu_mr = iommu_mr; giommu->iommu_offset = section->offset_within_address_space - section->offset_within_region; giommu->container = container; @@ -1007,7 +1007,7 @@ static void vfio_listener_region_add(MemoryListener *listener, int128_get64(llend), iommu_idx); - ret = memory_region_iommu_set_page_size_mask(giommu->iommu, + ret = memory_region_iommu_set_page_size_mask(giommu->iommu_mr, container->pgsizes, &err); if (ret) { @@ -1022,7 +1022,7 @@ static void vfio_listener_region_add(MemoryListener *listener, goto fail; } QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); - memory_region_iommu_replay(giommu->iommu, &giommu->n); + memory_region_iommu_replay(giommu->iommu_mr, &giommu->n); return; } @@ -1128,7 +1128,7 @@ static void vfio_listener_region_del(MemoryListener *listener, VFIOGuestIOMMU *giommu; QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { - if (MEMORY_REGION(giommu->iommu) == section->mr && + if (MEMORY_REGION(giommu->iommu_mr) == section->mr && giommu->n.start == section->offset_within_region) { memory_region_unregister_iommu_notifier(section->mr, &giommu->n); @@ -1393,11 +1393,11 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container, VFIOGuestIOMMU *giommu; QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { - if (MEMORY_REGION(giommu->iommu) == section->mr && + if (MEMORY_REGION(giommu->iommu_mr) == section->mr && giommu->n.start == section->offset_within_region) { Int128 llend; vfio_giommu_dirty_notifier gdn = { .giommu = giommu }; - int idx = memory_region_iommu_attrs_to_index(giommu->iommu, + int idx = memory_region_iommu_attrs_to_index(giommu->iommu_mr, MEMTXATTRS_UNSPECIFIED); llend = int128_add(int128_make64(section->offset_within_region), @@ -1410,7 +1410,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container, section->offset_within_region, int128_get64(llend), idx); - memory_region_iommu_replay(giommu->iommu, &gdn.n); + memory_region_iommu_replay(giommu->iommu_mr, &gdn.n); break; } } @@ -2246,7 +2246,7 @@ static void vfio_disconnect_container(VFIOGroup *group) QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) { memory_region_unregister_iommu_notifier( - MEMORY_REGION(giommu->iommu), &giommu->n); + MEMORY_REGION(giommu->iommu_mr), &giommu->n); QLIST_REMOVE(giommu, giommu_next); g_free(giommu); } diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 8af11b0a76..e573f5a9f1 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -98,7 +98,7 @@ typedef struct VFIOContainer { typedef struct VFIOGuestIOMMU { VFIOContainer *container; - IOMMUMemoryRegion *iommu; + IOMMUMemoryRegion *iommu_mr; hwaddr iommu_offset; IOMMUNotifier n; QLIST_ENTRY(VFIOGuestIOMMU) giommu_next; -- 2.27.0
next prev parent reply other threads:[~2022-04-14 10:47 UTC|newest] Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-14 10:46 [RFC 00/18] vfio: Adopt iommufd Yi Liu 2022-04-14 10:46 ` Yi Liu 2022-04-14 10:46 ` [RFC 01/18] scripts/update-linux-headers: Add iommufd.h Yi Liu 2022-04-14 10:46 ` Yi Liu 2022-04-14 10:46 ` [RFC 02/18] linux-headers: Import latest vfio.h and iommufd.h Yi Liu 2022-04-14 10:46 ` Yi Liu 2022-04-14 10:46 ` [RFC 03/18] hw/vfio/pci: fix vfio_pci_hot_reset_result trace point Yi Liu 2022-04-14 10:46 ` Yi Liu 2022-04-14 10:46 ` [RFC 04/18] vfio/pci: Use vbasedev local variable in vfio_realize() Yi Liu 2022-04-14 10:46 ` Yi Liu 2022-04-14 10:46 ` Yi Liu [this message] 2022-04-14 10:46 ` [RFC 05/18] vfio/common: Rename VFIOGuestIOMMU::iommu into ::iommu_mr Yi Liu 2022-04-14 10:46 ` [RFC 06/18] vfio/common: Split common.c into common.c, container.c and as.c Yi Liu 2022-04-14 10:46 ` [RFC 07/18] vfio: Add base object for VFIOContainer Yi Liu 2022-04-14 10:46 ` Yi Liu 2022-04-29 6:29 ` David Gibson 2022-04-29 6:29 ` David Gibson 2022-05-03 13:05 ` Yi Liu 2022-04-14 10:47 ` [RFC 08/18] vfio/container: Introduce vfio_[attach/detach]_device Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 09/18] vfio/platform: Use vfio_[attach/detach]_device Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 10/18] vfio/ap: " Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 11/18] vfio/ccw: " Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 12/18] vfio/container-obj: Introduce [attach/detach]_device container callbacks Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 13/18] vfio/container-obj: Introduce VFIOContainer reset callback Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 14/18] hw/iommufd: Creation Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 15/18] vfio/iommufd: Implement iommufd backend Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-22 14:58 ` Jason Gunthorpe 2022-04-22 21:33 ` Alex Williamson 2022-04-22 21:33 ` Alex Williamson 2022-04-26 9:55 ` Yi Liu 2022-04-26 9:55 ` Yi Liu 2022-04-26 10:41 ` Tian, Kevin 2022-04-26 10:41 ` Tian, Kevin 2022-04-26 13:41 ` Jason Gunthorpe 2022-04-26 14:08 ` Yi Liu 2022-04-26 14:08 ` Yi Liu 2022-04-26 14:11 ` Jason Gunthorpe 2022-04-26 18:45 ` Alex Williamson 2022-04-26 18:45 ` Alex Williamson 2022-04-26 19:27 ` Jason Gunthorpe 2022-04-26 20:59 ` Alex Williamson 2022-04-26 20:59 ` Alex Williamson 2022-04-26 23:08 ` Jason Gunthorpe 2022-04-26 13:53 ` Jason Gunthorpe 2022-04-14 10:47 ` [RFC 16/18] vfio/iommufd: Add IOAS_COPY_DMA support Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 17/18] vfio/as: Allow the selection of a given iommu backend Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-14 10:47 ` [RFC 18/18] vfio/pci: Add an iommufd option Yi Liu 2022-04-14 10:47 ` Yi Liu 2022-04-15 8:37 ` [RFC 00/18] vfio: Adopt iommufd Nicolin Chen 2022-04-17 10:30 ` Eric Auger 2022-04-17 10:30 ` Eric Auger 2022-04-19 3:26 ` Nicolin Chen 2022-04-25 19:40 ` Eric Auger 2022-04-25 19:40 ` Eric Auger 2022-04-18 8:49 ` Tian, Kevin 2022-04-18 8:49 ` Tian, Kevin 2022-04-18 12:09 ` Yi Liu 2022-04-18 12:09 ` Yi Liu 2022-04-25 19:51 ` Eric Auger 2022-04-25 19:51 ` Eric Auger 2022-04-25 19:55 ` Eric Auger 2022-04-25 19:55 ` Eric Auger 2022-04-26 8:39 ` Tian, Kevin 2022-04-26 8:39 ` Tian, Kevin 2022-04-22 22:09 ` Alex Williamson 2022-04-22 22:09 ` Alex Williamson 2022-04-25 10:10 ` Daniel P. Berrangé 2022-04-25 10:10 ` Daniel P. Berrangé 2022-04-25 13:36 ` Jason Gunthorpe 2022-04-25 14:37 ` Alex Williamson 2022-04-25 14:37 ` Alex Williamson 2022-04-26 8:37 ` Tian, Kevin 2022-04-26 8:37 ` Tian, Kevin 2022-04-26 12:33 ` Jason Gunthorpe 2022-04-26 16:21 ` Alex Williamson 2022-04-26 16:21 ` Alex Williamson 2022-04-26 16:42 ` Jason Gunthorpe 2022-04-26 19:24 ` Alex Williamson 2022-04-26 19:24 ` Alex Williamson 2022-04-26 19:36 ` Jason Gunthorpe 2022-04-28 3:21 ` Tian, Kevin 2022-04-28 3:21 ` Tian, Kevin 2022-04-28 14:24 ` Alex Williamson 2022-04-28 14:24 ` Alex Williamson 2022-04-28 16:20 ` Daniel P. Berrangé 2022-04-28 16:20 ` Daniel P. Berrangé 2022-04-29 0:45 ` Tian, Kevin 2022-04-29 0:45 ` Tian, Kevin 2022-04-25 20:23 ` Eric Auger 2022-04-25 20:23 ` Eric Auger 2022-04-25 22:53 ` Alex Williamson 2022-04-25 22:53 ` Alex Williamson 2022-04-26 9:47 ` Shameerali Kolothum Thodi via 2022-04-26 9:47 ` Shameerali Kolothum Thodi 2022-04-26 11:44 ` Eric Auger 2022-04-26 11:44 ` Eric Auger 2022-04-26 12:43 ` Shameerali Kolothum Thodi 2022-04-26 12:43 ` Shameerali Kolothum Thodi via 2022-04-26 16:35 ` Alex Williamson 2022-04-26 16:35 ` Alex Williamson 2022-05-09 14:24 ` Zhangfei Gao 2022-05-10 3:17 ` Yi Liu 2022-05-10 6:51 ` Eric Auger 2022-05-10 12:35 ` Zhangfei Gao 2022-05-10 12:45 ` Jason Gunthorpe 2022-05-10 14:08 ` Yi Liu 2022-05-11 14:17 ` zhangfei.gao 2022-05-12 9:01 ` zhangfei.gao 2022-05-17 8:55 ` Yi Liu 2022-05-18 7:22 ` zhangfei.gao 2022-05-18 14:00 ` Yi Liu 2022-06-28 8:14 ` Shameerali Kolothum Thodi 2022-06-28 8:14 ` Shameerali Kolothum Thodi via 2022-06-28 8:58 ` Eric Auger 2022-05-17 8:52 ` Yi Liu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220414104710.28534-6-yi.l.liu@intel.com \ --to=yi.l.liu@intel.com \ --cc=akrowiak@linux.ibm.com \ --cc=alex.williamson@redhat.com \ --cc=chao.p.peng@intel.com \ --cc=cohuck@redhat.com \ --cc=david@gibson.dropbear.id.au \ --cc=eric.auger.pro@gmail.com \ --cc=eric.auger@redhat.com \ --cc=farman@linux.ibm.com \ --cc=jasowang@redhat.com \ --cc=jgg@nvidia.com \ --cc=jjherne@linux.ibm.com \ --cc=kevin.tian@intel.com \ --cc=kvm@vger.kernel.org \ --cc=mjrosato@linux.ibm.com \ --cc=nicolinc@nvidia.com \ --cc=pasic@linux.ibm.com \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=thuth@redhat.com \ --cc=yi.y.sun@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.