vfio: selftests: Drop IOMMU mapping size assertions for VFIO_TYPE1_IOMMU

Drop the assertions about IOMMU mappings sizes for VFIO_TYPE1_IOMMU
modes (both the VFIO mode and the iommufd compatibility mode). These
assertions fail when CONFIG_IOMMUFD_VFIO_CONTAINER is enabled, since
iommufd compatibility mode provides different huge page behavior than
VFIO for VFIO_TYPE1_IOMMU. VFIO_TYPE1_IOMMU is an old enough interface
that it's not worth changing the behavior of VFIO and iommufd to match
nor care about the IOMMU mapping sizes.

Cc: Jason Gunthorpe <jgg@ziepe.ca>
Link: https://lore.kernel.org/kvm/20260109143830.176dc279@shazbot.org/
Signed-off-by: David Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20260114211252.2581145-1-dmatlack@google.com
Signed-off-by: Alex Williamson <alex@shazbot.org>

diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c
index 3d2f44f9c62fb154a587076cfc710af55b2383f3..abb170bdcef7ef83eb513cde97ea9144e523cd8a 100644 (file)
--- a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c
+++ b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c
@@ -161,12 +161,8 @@ TEST_F(vfio_dma_mapping_test, dma_map_unmap)
        if (rc == -EOPNOTSUPP)
                goto unmap;
 
-       /*
-        * IOMMUFD compatibility-mode does not support huge mappings when
-        * using VFIO_TYPE1_IOMMU.
-        */
-       if (!strcmp(variant->iommu_mode, MODE_IOMMUFD_COMPAT_TYPE1))
-               mapping_size = SZ_4K;
+       if (self->iommu->mode->iommu_type == VFIO_TYPE1_IOMMU)
+               goto unmap;
 
        ASSERT_EQ(0, rc);
        printf("Found IOMMU mappings for IOVA 0x%lx:\n", region.iova);