As of v6.8 commit 7fbb5e188248 ("mm: remove VM_EXEC requirement for THP 
eligibility")
thp collapse no longer requires file-backed mappings be created with
PROT_EXEC.

Remove the overly-strict dependency from thp collapse tests so we test
the least-strict requirement for success.

Signed-off-by: Zach O'Keefe <zoke...@google.com>
---
 tools/testing/selftests/mm/khugepaged.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/mm/khugepaged.c 
b/tools/testing/selftests/mm/khugepaged.c
index a18c50d51141..3fe7ef04ac62 100644
--- a/tools/testing/selftests/mm/khugepaged.c
+++ b/tools/testing/selftests/mm/khugepaged.c
@@ -394,7 +394,7 @@ static void *file_setup_area(int nr_hpages)
                perror("open()");
                exit(EXIT_FAILURE);
        }
-       p = mmap(BASE_ADDR, size, PROT_READ | PROT_EXEC,
+       p = mmap(BASE_ADDR, size, PROT_READ,
                 MAP_PRIVATE, finfo.fd, 0);
        if (p == MAP_FAILED || p != BASE_ADDR) {
                perror("mmap()");
-- 
2.51.0.384.g4c02a37b29-goog


Reply via email to