1*053f45beSAndroid Build Coastguard WorkerFrom cee5b1e7290443c472b3fa379212076dc45242fd Mon Sep 17 00:00:00 2001 2*053f45beSAndroid Build Coastguard WorkerFrom: Edward Liaw <[email protected]> 3*053f45beSAndroid Build Coastguard WorkerDate: Thu, 12 Oct 2023 22:01:34 +0000 4*053f45beSAndroid Build Coastguard WorkerSubject: [PATCH] Revert "selftests/uffd: enable uffd-wp for shmem/hugetlbfs" 5*053f45beSAndroid Build Coastguard Worker 6*053f45beSAndroid Build Coastguard WorkerThis reverts commit c0eeeb02d9df878c71a457008900b650d94bd0d9. 7*053f45beSAndroid Build Coastguard Worker 8*053f45beSAndroid Build Coastguard WorkerReason for revert: uffd-wp support is only from >5.19 of the kernel. It 9*053f45beSAndroid Build Coastguard Workerwill fail on most of the active Android kernels 10*053f45beSAndroid Build Coastguard Worker 11*053f45beSAndroid Build Coastguard WorkerBug: 303675116 12*053f45beSAndroid Build Coastguard WorkerTest: atest vts_linux_kselftest_arm_64:vm_userfaultfd_shmem_arm_64 13*053f45beSAndroid Build Coastguard WorkerSigned-off-by: Edward Liaw <[email protected]> 14*053f45beSAndroid Build Coastguard Worker--- 15*053f45beSAndroid Build Coastguard Worker tools/testing/selftests/vm/userfaultfd.c | 4 +++- 16*053f45beSAndroid Build Coastguard Worker 1 file changed, 3 insertions(+), 1 deletion(-) 17*053f45beSAndroid Build Coastguard Worker 18*053f45beSAndroid Build Coastguard Workerdiff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c 19*053f45beSAndroid Build Coastguard Workerindex 02cc35b65a7a..20f0e1ff4635 100644 20*053f45beSAndroid Build Coastguard Worker--- a/tools/testing/selftests/vm/userfaultfd.c 21*053f45beSAndroid Build Coastguard Worker+++ b/tools/testing/selftests/vm/userfaultfd.c 22*053f45beSAndroid Build Coastguard Worker@@ -90,7 +90,7 @@ static bool test_dev_userfaultfd; 23*053f45beSAndroid Build Coastguard Worker static volatile bool test_uffdio_copy_eexist = true; 24*053f45beSAndroid Build Coastguard Worker static volatile bool test_uffdio_zeropage_eexist = true; 25*053f45beSAndroid Build Coastguard Worker /* Whether to test uffd write-protection */ 26*053f45beSAndroid Build Coastguard Worker-static bool test_uffdio_wp = true; 27*053f45beSAndroid Build Coastguard Worker+static bool test_uffdio_wp = false; 28*053f45beSAndroid Build Coastguard Worker /* Whether to test uffd minor faults */ 29*053f45beSAndroid Build Coastguard Worker static bool test_uffdio_minor = false; 30*053f45beSAndroid Build Coastguard Worker 31*053f45beSAndroid Build Coastguard Worker@@ -1764,6 +1764,8 @@ static void set_test_type(const char *type) 32*053f45beSAndroid Build Coastguard Worker if (!strcmp(type, "anon")) { 33*053f45beSAndroid Build Coastguard Worker test_type = TEST_ANON; 34*053f45beSAndroid Build Coastguard Worker uffd_test_ops = &anon_uffd_test_ops; 35*053f45beSAndroid Build Coastguard Worker+ /* Only enable write-protect test for anonymous test */ 36*053f45beSAndroid Build Coastguard Worker+ test_uffdio_wp = true; 37*053f45beSAndroid Build Coastguard Worker } else if (!strcmp(type, "hugetlb")) { 38*053f45beSAndroid Build Coastguard Worker test_type = TEST_HUGETLB; 39*053f45beSAndroid Build Coastguard Worker uffd_test_ops = &hugetlb_uffd_test_ops; 40*053f45beSAndroid Build Coastguard Worker-- 41*053f45beSAndroid Build Coastguard Worker2.42.0.655.g421f12c284-goog 42*053f45beSAndroid Build Coastguard Worker 43