From: Sayali Patil <[email protected]>
The HMM compound testcase currently assume only PMD-level
mappings and fail on systems when default_hugepagesz=1G is set.
Extend the checks to accept PUD-level protections as well,
avoiding false failures.
Fixes: e478425bec93 ("mm/hmm: add tests for hmm_pfn_to_map_order()")
Signed-off-by: Sayali Patil <[email protected]>
Signed-off-by: Aboorva Devarajan <[email protected]>
---
tools/testing/selftests/mm/hmm-tests.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/mm/hmm-tests.c
b/tools/testing/selftests/mm/hmm-tests.c
index 77fb4c5d871b..6dc839866dfe 100644
--- a/tools/testing/selftests/mm/hmm-tests.c
+++ b/tools/testing/selftests/mm/hmm-tests.c
@@ -1599,8 +1599,8 @@ TEST_F(hmm2, snapshot)
}
/*
- * Test the hmm_range_fault() HMM_PFN_PMD flag for large pages that
- * should be mapped by a large page table entry.
+ * Test the hmm_range_fault() handling of large pages (PMD or PUD)
+ * that should be mapped by a large page table entry.
*/
TEST_F(hmm, compound)
{
@@ -1649,8 +1649,8 @@ TEST_F(hmm, compound)
/* Check what the device saw. */
m = buffer->mirror;
for (i = 0; i < npages; ++i)
- ASSERT_EQ(m[i], HMM_DMIRROR_PROT_WRITE |
- HMM_DMIRROR_PROT_PMD);
+ ASSERT_TRUE((m[i] == (HMM_DMIRROR_PROT_WRITE |
HMM_DMIRROR_PROT_PMD)) ||
+ (m[i] == (HMM_DMIRROR_PROT_WRITE |
HMM_DMIRROR_PROT_PUD)));
/* Make the region read-only. */
ret = mprotect(buffer->ptr, size, PROT_READ);
@@ -1664,8 +1664,8 @@ TEST_F(hmm, compound)
/* Check what the device saw. */
m = buffer->mirror;
for (i = 0; i < npages; ++i)
- ASSERT_EQ(m[i], HMM_DMIRROR_PROT_READ |
- HMM_DMIRROR_PROT_PMD);
+ ASSERT_TRUE((m[i] == (HMM_DMIRROR_PROT_READ |
HMM_DMIRROR_PROT_PMD)) ||
+ (m[i] == (HMM_DMIRROR_PROT_READ |
HMM_DMIRROR_PROT_PUD)));
munmap(buffer->ptr, buffer->size);
buffer->ptr = NULL;
--
2.54.0
