Skip to content

Commit 15a579d

Browse files
committed
iommufd/selftest: Fix tests to use MOCK_PAGE_SIZE based buffer sizes
JIRA: https://issues.redhat.com/browse/RHEL-40162 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git commit ffa3c79 Author: Joao Martins <joao.m.martins@oracle.com> Date: Thu Jun 27 12:00:58 2024 +0100 iommufd/selftest: Fix tests to use MOCK_PAGE_SIZE based buffer sizes commit a9af47e ("iommufd/selftest: Test IOMMU_HWPT_GET_DIRTY_BITMAP") added tests covering edge cases in the boundaries of iova bitmap. Although it used buffer sizes thinking in PAGE_SIZE (4K) as opposed to the MOCK_PAGE_SIZE (2K) that is used in iommufd mock selftests. This meant that isn't correctly exercising everything specifically the u32 and 4K bitmap test cases. Fix selftests buffer sizes to be based on mock page size. Link: https://lore.kernel.org/r/20240627110105.62325-5-joao.m.martins@oracle.com Reported-by: Kevin Tian <kevin.tian@intel.com> Closes: https://lore.kernel.org/linux-iommu/96efb6cf-a41c-420f-9673-2f0b682cac8c@oracle.com/ Fixes: a9af47e ("iommufd/selftest: Test IOMMU_HWPT_GET_DIRTY_BITMAP") Signed-off-by: Joao Martins <joao.m.martins@oracle.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Tested-by: Matt Ochs <mochs@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> (cherry picked from commit ffa3c79) Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
1 parent f6cd8a7 commit 15a579d

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

tools/testing/selftests/iommu/iommufd.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,47 +1797,47 @@ FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty16k)
17971797
.buffer_size = 16UL * 1024UL,
17981798
};
17991799

1800-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty128k)
1800+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty64k)
18011801
{
18021802
/* one u32 index bitmap */
1803-
.buffer_size = 128UL * 1024UL,
1803+
.buffer_size = 64UL * 1024UL,
18041804
};
18051805

1806-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty256k)
1806+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty128k)
18071807
{
18081808
/* one u64 index bitmap */
1809-
.buffer_size = 256UL * 1024UL,
1809+
.buffer_size = 128UL * 1024UL,
18101810
};
18111811

1812-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty640k)
1812+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty320k)
18131813
{
18141814
/* two u64 index and trailing end bitmap */
1815-
.buffer_size = 640UL * 1024UL,
1815+
.buffer_size = 320UL * 1024UL,
18161816
};
18171817

1818-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty128M)
1818+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty64M)
18191819
{
1820-
/* 4K bitmap (128M IOVA range) */
1821-
.buffer_size = 128UL * 1024UL * 1024UL,
1820+
/* 4K bitmap (64M IOVA range) */
1821+
.buffer_size = 64UL * 1024UL * 1024UL,
18221822
};
18231823

1824-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty128M_huge)
1824+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty64M_huge)
18251825
{
1826-
/* 4K bitmap (128M IOVA range) */
1827-
.buffer_size = 128UL * 1024UL * 1024UL,
1826+
/* 4K bitmap (64M IOVA range) */
1827+
.buffer_size = 64UL * 1024UL * 1024UL,
18281828
.hugepages = true,
18291829
};
18301830

1831-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty256M)
1831+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty128M)
18321832
{
1833-
/* 8K bitmap (256M IOVA range) */
1834-
.buffer_size = 256UL * 1024UL * 1024UL,
1833+
/* 8K bitmap (128M IOVA range) */
1834+
.buffer_size = 128UL * 1024UL * 1024UL,
18351835
};
18361836

1837-
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty256M_huge)
1837+
FIXTURE_VARIANT_ADD(iommufd_dirty_tracking, domain_dirty128M_huge)
18381838
{
1839-
/* 8K bitmap (256M IOVA range) */
1840-
.buffer_size = 256UL * 1024UL * 1024UL,
1839+
/* 8K bitmap (128M IOVA range) */
1840+
.buffer_size = 128UL * 1024UL * 1024UL,
18411841
.hugepages = true,
18421842
};
18431843

0 commit comments

Comments
 (0)