[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v7 10/26] vfio: Introduce hostwin_from_range helper
From: |
Eric Auger |
Subject: |
[RFC v7 10/26] vfio: Introduce hostwin_from_range helper |
Date: |
Mon, 16 Nov 2020 19:13:33 +0100 |
Let's introduce a hostwin_from_range() helper that returns the
hostwin encapsulating an IOVA range or NULL if none is found.
This improves the readibility of callers and removes the usage
of hostwin_found.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/vfio/common.c | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 80c68c0446..18e8aa0d56 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -651,6 +651,19 @@ out:
rcu_read_unlock();
}
+static VFIOHostDMAWindow *
+hostwin_from_range(VFIOContainer *container, hwaddr iova, hwaddr end)
+{
+ VFIOHostDMAWindow *hostwin;
+
+ QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
+ if (hostwin->min_iova <= iova && end <= hostwin->max_iova) {
+ return hostwin;
+ }
+ }
+ return NULL;
+}
+
static void vfio_listener_region_add(MemoryListener *listener,
MemoryRegionSection *section)
{
@@ -660,7 +673,6 @@ static void vfio_listener_region_add(MemoryListener
*listener,
void *vaddr;
int ret;
VFIOHostDMAWindow *hostwin;
- bool hostwin_found;
Error *err = NULL;
if (vfio_listener_skipped_section(section)) {
@@ -745,15 +757,8 @@ static void vfio_listener_region_add(MemoryListener
*listener,
#endif
}
- hostwin_found = false;
- QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
- if (hostwin->min_iova <= iova && end <= hostwin->max_iova) {
- hostwin_found = true;
- break;
- }
- }
-
- if (!hostwin_found) {
+ hostwin = hostwin_from_range(container, iova, end);
+ if (!hostwin) {
error_setg(&err, "Container %p can't map guest IOVA region"
" 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, iova, end);
goto fail;
@@ -934,16 +939,9 @@ static void vfio_listener_region_del(MemoryListener
*listener,
if (memory_region_is_ram_device(section->mr)) {
hwaddr pgmask;
- VFIOHostDMAWindow *hostwin;
- bool hostwin_found = false;
+ VFIOHostDMAWindow *hostwin = hostwin_from_range(container, iova, end);
- QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
- if (hostwin->min_iova <= iova && end <= hostwin->max_iova) {
- hostwin_found = true;
- break;
- }
- }
- assert(hostwin_found); /* or region_add() would have failed */
+ assert(hostwin); /* or region_add() would have failed */
pgmask = (1ULL << ctz64(hostwin->iova_pgsizes)) - 1;
try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask));
--
2.21.3
- [RFC v7 00/26] vSMMUv3/pSMMUv3 2 stage VFIO integration, Eric Auger, 2020/11/16
- [RFC v7 01/26] update-linux-headers: Import iommu.h, Eric Auger, 2020/11/16
- [RFC v7 02/26] header update against 5.10-rc4 and IOMMU/VFIO nested stage APIs, Eric Auger, 2020/11/16
- [RFC v7 03/26] memory: Add IOMMU_ATTR_VFIO_NESTED IOMMU memory region attribute, Eric Auger, 2020/11/16
- [RFC v7 04/26] memory: Add IOMMU_ATTR_MSI_TRANSLATE IOMMU memory region attribute, Eric Auger, 2020/11/16
- [RFC v7 05/26] memory: Introduce IOMMU Memory Region inject_faults API, Eric Auger, 2020/11/16
- [RFC v7 06/26] memory: Add arch_id and leaf fields in IOTLBEntry, Eric Auger, 2020/11/16
- [RFC v7 07/26] iommu: Introduce generic header, Eric Auger, 2020/11/16
- [RFC v7 08/26] pci: introduce PCIPASIDOps to PCIDevice, Eric Auger, 2020/11/16
- [RFC v7 09/26] vfio: Force nested if iommu requires it, Eric Auger, 2020/11/16
- [RFC v7 10/26] vfio: Introduce hostwin_from_range helper,
Eric Auger <=
- [RFC v7 11/26] vfio: Introduce helpers to DMA map/unmap a RAM section, Eric Auger, 2020/11/16
- [RFC v7 12/26] vfio: Set up nested stage mappings, Eric Auger, 2020/11/16
- [RFC v7 13/26] vfio: Pass stage 1 MSI bindings to the host, Eric Auger, 2020/11/16
- [RFC v7 14/26] vfio: Helper to get IRQ info including capabilities, Eric Auger, 2020/11/16
- [RFC v7 15/26] vfio/pci: Register handler for iommu fault, Eric Auger, 2020/11/16
- [RFC v7 16/26] vfio/pci: Set up the DMA FAULT region, Eric Auger, 2020/11/16
- [RFC v7 17/26] vfio/pci: Implement the DMA fault handler, Eric Auger, 2020/11/16
- [RFC v7 18/26] hw/arm/smmuv3: Advertise MSI_TRANSLATE attribute, Eric Auger, 2020/11/16
- [RFC v7 19/26] hw/arm/smmuv3: Store the PASID table GPA in the translation config, Eric Auger, 2020/11/16
- [RFC v7 20/26] hw/arm/smmuv3: Fill the IOTLBEntry arch_id on NH_VA invalidation, Eric Auger, 2020/11/16