Skip to content

Commit 1c588bc

Browse files
dmatlackawilliam
authored andcommitted
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>
1 parent 080723f commit 1c588bc

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

tools/testing/selftests/vfio/vfio_dma_mapping_test.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,8 @@ TEST_F(vfio_dma_mapping_test, dma_map_unmap)
161161
if (rc == -EOPNOTSUPP)
162162
goto unmap;
163163

164-
/*
165-
* IOMMUFD compatibility-mode does not support huge mappings when
166-
* using VFIO_TYPE1_IOMMU.
167-
*/
168-
if (!strcmp(variant->iommu_mode, MODE_IOMMUFD_COMPAT_TYPE1))
169-
mapping_size = SZ_4K;
164+
if (self->iommu->mode->iommu_type == VFIO_TYPE1_IOMMU)
165+
goto unmap;
170166

171167
ASSERT_EQ(0, rc);
172168
printf("Found IOMMU mappings for IOVA 0x%lx:\n", region.iova);

0 commit comments

Comments
 (0)