vfio: selftests: Introduce struct iommu

Introduce struct iommu, which logically represents either a VFIO
container or an iommufd IOAS, depending on which IOMMU mode is used by
the test.

This will be used in a subsequent commit to allow devices to be added to
the same container/iommufd.

Reviewed-by: Alex Mastro <amastro@fb.com>
Tested-by: Alex Mastro <amastro@fb.com>
Reviewed-by: Raghavendra Rao Ananta <rananta@google.com>
Signed-off-by: David Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20251126231733.3302983-6-dmatlack@google.com
Signed-off-by: Alex Williamson <alex@shazbot.org>

diff --git a/tools/testing/selftests/vfio/lib/include/vfio_util.h b/tools/testing/selftests/vfio/lib/include/vfio_util.h
index 2f5555138d7f4c702844f45f3750e1efcdb21b33..3160f2d1ea6ddd16d9f20154032f690085b585dc 100644 (file)
--- a/tools/testing/selftests/vfio/lib/include/vfio_util.h
+++ b/tools/testing/selftests/vfio/lib/include/vfio_util.h
@@ -163,15 +163,19 @@ struct vfio_pci_driver {
        int msi;
 };
 
+struct iommu {
+       const struct iommu_mode *mode;
+       int container_fd;
+       int iommufd;
+       u32 ioas_id;
+       struct list_head dma_regions;
+};
+
 struct vfio_pci_device {
        int fd;
-
-       const struct iommu_mode *iommu_mode;
        int group_fd;
-       int container_fd;
 
-       int iommufd;
-       u32 ioas_id;
+       struct iommu *iommu;
 
        struct vfio_device_info info;
        struct vfio_region_info config_space;
@@ -180,8 +184,6 @@ struct vfio_pci_device {
        struct vfio_irq_info msi_info;
        struct vfio_irq_info msix_info;
 
-       struct list_head dma_regions;
-
        /* eventfds for MSI and MSI-x interrupts */
        int msi_eventfds[PCI_MSIX_FLAGS_QSIZE + 1];
 

diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/testing/selftests/vfio/lib/vfio_pci_device.c
index 4a021ff4fc40d8d3664a93d01259b55f3eea8872..e47f3ccf6d49c04cf45dad0a5efe9ea8b92efbbe 100644 (file)
--- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c
+++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c
@@ -277,7 +277,7 @@ iova_t __to_iova(struct vfio_pci_device *device, void *vaddr)
 {
        struct vfio_dma_region *region;
 
-       list_for_each_entry(region, &device->dma_regions, link) {
+       list_for_each_entry(region, &device->iommu->dma_regions, link) {
                if (vaddr < region->vaddr)
                        continue;
 
@@ -397,7 +397,7 @@ static int vfio_iommu_dma_map(struct vfio_pci_device *device,
                .size = region->size,
        };
 
-       if (ioctl(device->container_fd, VFIO_IOMMU_MAP_DMA, &args))
+       if (ioctl(device->iommu->container_fd, VFIO_IOMMU_MAP_DMA, &args))
                return -errno;
 
        return 0;
@@ -414,10 +414,10 @@ static int iommufd_dma_map(struct vfio_pci_device *device,
                .user_va = (u64)region->vaddr,
                .iova = region->iova,
                .length = region->size,
-               .ioas_id = device->ioas_id,
+               .ioas_id = device->iommu->ioas_id,
        };
 
-       if (ioctl(device->iommufd, IOMMU_IOAS_MAP, &args))
+       if (ioctl(device->iommu->iommufd, IOMMU_IOAS_MAP, &args))
                return -errno;
 
        return 0;
@@ -428,7 +428,7 @@ int __vfio_pci_dma_map(struct vfio_pci_device *device,
 {
        int ret;
 
-       if (device->iommufd)
+       if (device->iommu->iommufd)
                ret = iommufd_dma_map(device, region);
        else
                ret = vfio_iommu_dma_map(device, region);
@@ -436,7 +436,7 @@ int __vfio_pci_dma_map(struct vfio_pci_device *device,
        if (ret)
                return ret;
 
-       list_add(&region->link, &device->dma_regions);
+       list_add(&region->link, &device->iommu->dma_regions);
 
        return 0;
 }
@@ -484,13 +484,14 @@ int __vfio_pci_dma_unmap(struct vfio_pci_device *device,
 {
        int ret;
 
-       if (device->iommufd)
-               ret = iommufd_dma_unmap(device->iommufd, region->iova,
-                                       region->size, device->ioas_id,
+       if (device->iommu->iommufd)
+               ret = iommufd_dma_unmap(device->iommu->iommufd, region->iova,
+                                       region->size, device->iommu->ioas_id,
                                        unmapped);
        else
-               ret = vfio_iommu_dma_unmap(device->container_fd, region->iova,
-                                          region->size, 0, unmapped);
+               ret = vfio_iommu_dma_unmap(device->iommu->container_fd,
+                                          region->iova, region->size, 0,
+                                          unmapped);
 
        if (ret)
                return ret;
@@ -505,17 +506,17 @@ int __vfio_pci_dma_unmap_all(struct vfio_pci_device *device, u64 *unmapped)
        int ret;
        struct vfio_dma_region *curr, *next;
 
-       if (device->iommufd)
-               ret = iommufd_dma_unmap(device->iommufd, 0, UINT64_MAX,
-                                       device->ioas_id, unmapped);
+       if (device->iommu->iommufd)
+               ret = iommufd_dma_unmap(device->iommu->iommufd, 0, UINT64_MAX,
+                                       device->iommu->ioas_id, unmapped);
        else
-               ret = vfio_iommu_dma_unmap(device->container_fd, 0, 0,
+               ret = vfio_iommu_dma_unmap(device->iommu->container_fd, 0, 0,
                                           VFIO_DMA_UNMAP_FLAG_ALL, unmapped);
 
        if (ret)
                return ret;
 
-       list_for_each_entry_safe(curr, next, &device->dma_regions, link)
+       list_for_each_entry_safe(curr, next, &device->iommu->dma_regions, link)
                list_del_init(&curr->link);
 
        return 0;
@@ -627,28 +628,28 @@ static void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf
        ioctl_assert(device->group_fd, VFIO_GROUP_GET_STATUS, &group_status);
        VFIO_ASSERT_TRUE(group_status.flags & VFIO_GROUP_FLAGS_VIABLE);
 
-       ioctl_assert(device->group_fd, VFIO_GROUP_SET_CONTAINER, &device->container_fd);
+       ioctl_assert(device->group_fd, VFIO_GROUP_SET_CONTAINER, &device->iommu->container_fd);
 }
 
 static void vfio_pci_container_setup(struct vfio_pci_device *device, const char *bdf)
 {
-       unsigned long iommu_type = device->iommu_mode->iommu_type;
-       const char *path = device->iommu_mode->container_path;
+       unsigned long iommu_type = device->iommu->mode->iommu_type;
+       const char *path = device->iommu->mode->container_path;
        int version;
        int ret;
 
-       device->container_fd = open(path, O_RDWR);
-       VFIO_ASSERT_GE(device->container_fd, 0, "open(%s) failed\n", path);
+       device->iommu->container_fd = open(path, O_RDWR);
+       VFIO_ASSERT_GE(device->iommu->container_fd, 0, "open(%s) failed\n", path);
 
-       version = ioctl(device->container_fd, VFIO_GET_API_VERSION);
+       version = ioctl(device->iommu->container_fd, VFIO_GET_API_VERSION);
        VFIO_ASSERT_EQ(version, VFIO_API_VERSION, "Unsupported version: %d\n", version);
 
        vfio_pci_group_setup(device, bdf);
 
-       ret = ioctl(device->container_fd, VFIO_CHECK_EXTENSION, iommu_type);
+       ret = ioctl(device->iommu->container_fd, VFIO_CHECK_EXTENSION, iommu_type);
        VFIO_ASSERT_GT(ret, 0, "VFIO IOMMU type %lu not supported\n", iommu_type);
 
-       ioctl_assert(device->container_fd, VFIO_SET_IOMMU, (void *)iommu_type);
+       ioctl_assert(device->iommu->container_fd, VFIO_SET_IOMMU, (void *)iommu_type);
 
        device->fd = ioctl(device->group_fd, VFIO_GROUP_GET_DEVICE_FD, bdf);
        VFIO_ASSERT_GE(device->fd, 0);
@@ -801,12 +802,12 @@ static void vfio_pci_iommufd_setup(struct vfio_pci_device *device, const char *b
         * used to check if iommufd is enabled. In practice open() will never
         * return 0 unless stdin is closed.
         */
-       device->iommufd = open("/dev/iommu", O_RDWR);
-       VFIO_ASSERT_GT(device->iommufd, 0);
+       device->iommu->iommufd = open("/dev/iommu", O_RDWR);
+       VFIO_ASSERT_GT(device->iommu->iommufd, 0);
 
-       vfio_device_bind_iommufd(device->fd, device->iommufd);
-       device->ioas_id = iommufd_ioas_alloc(device->iommufd);
-       vfio_device_attach_iommufd_pt(device->fd, device->ioas_id);
+       vfio_device_bind_iommufd(device->fd, device->iommu->iommufd);
+       device->iommu->ioas_id = iommufd_ioas_alloc(device->iommu->iommufd);
+       vfio_device_attach_iommufd_pt(device->fd, device->iommu->ioas_id);
 }
 
 struct vfio_pci_device *vfio_pci_device_init(const char *bdf, const char *iommu_mode)
@@ -816,11 +817,14 @@ struct vfio_pci_device *vfio_pci_device_init(const char *bdf, const char *iommu_
        device = calloc(1, sizeof(*device));
        VFIO_ASSERT_NOT_NULL(device);
 
-       INIT_LIST_HEAD(&device->dma_regions);
+       device->iommu = calloc(1, sizeof(*device->iommu));
+       VFIO_ASSERT_NOT_NULL(device->iommu);
+
+       INIT_LIST_HEAD(&device->iommu->dma_regions);
 
-       device->iommu_mode = lookup_iommu_mode(iommu_mode);
+       device->iommu->mode = lookup_iommu_mode(iommu_mode);
 
-       if (device->iommu_mode->container_path)
+       if (device->iommu->mode->container_path)
                vfio_pci_container_setup(device, bdf);
        else
                vfio_pci_iommufd_setup(device, bdf);
@@ -849,13 +853,14 @@ void vfio_pci_device_cleanup(struct vfio_pci_device *device)
                VFIO_ASSERT_EQ(close(device->msi_eventfds[i]), 0);
        }
 
-       if (device->iommufd) {
-               VFIO_ASSERT_EQ(close(device->iommufd), 0);
+       if (device->iommu->iommufd) {
+               VFIO_ASSERT_EQ(close(device->iommu->iommufd), 0);
        } else {
                VFIO_ASSERT_EQ(close(device->group_fd), 0);
-               VFIO_ASSERT_EQ(close(device->container_fd), 0);
+               VFIO_ASSERT_EQ(close(device->iommu->container_fd), 0);
        }
 
+       free(device->iommu);
        free(device);
 }