selftests-mm-drop-test_uffdio_zeropage_eexist.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: drop test_uffdio_zeropage_eexist
has been removed from the -mm tree. Its filename was
selftests-mm-drop-test_uffdio_zeropage_eexist.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: selftests/mm: drop test_uffdio_zeropage_eexist
Date: Wed, 12 Apr 2023 12:42:38 -0400
The idea was trying to flip this var in the alarm handler from time to time to test -EEXIST of UFFDIO_ZEROPAGE, but firstly it's only used in the zeropage test so probably only used once, meanwhile we passed "retry==false" so it'll never got tested anyway.
Drop both sides so we always test UFFDIO_ZEROPAGE retries if has_zeropage is set (!hugetlb).
One more thing to do is doing UFFDIO_REGISTER for the alias buffer too, because otherwise the test won't even pass! We were just lucky that this test never really got ran at all.
---
tools/testing/selftests/mm/userfaultfd.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
tools/testing/selftests/mm/userfaultfd.c renamed from tools/testing/selftests/mm/userfaultfd.c~selftests-mm-drop-test_uffdio_zeropage_eexist +11 -9
@@ -88,7 +88,6 @@ static bool test_dev_userfaultfd;/* exercise the test_uffdio_*_eexist every ALARM_INTERVAL_SECS */ #define ALARM_INTERVAL_SECS 10static volatile bool test_uffdio_copy_eexist = true; -static volatile bool test_uffdio_zeropage_eexist = true;/* Whether to test uffd write-protection */ static bool test_uffdio_wp = true;/* Whether to test uffd minor faults */
@@ -1114,7 +1113,7 @@ static void retry_uffdio_zeropage(int uf } } -static int __uffdio_zeropage (int ufd,unsigned long offset,bool retry) +static int __uffdio_zeropage (int ufd,unsigned long offset) {struct uffdio_zeropage uffdio_zeropage;int ret;
@@ -1138,11 +1137,8 @@ static int __uffdio_zeropage(int ufd, unif (res != page_size) {err ("UFFDIO_ZEROPAGE unexpected size" ); }else { -if (test_uffdio_zeropage_eexist && retry) { - test_uffdio_zeropage_eexist = false; -retry_uffdio_zeropage (ufd, &uffdio_zeropage, - offset); - } +retry_uffdio_zeropage (ufd, &uffdio_zeropage, + offset);return 1 ; } }else
@@ -1153,7 +1149,7 @@ static int __uffdio_zeropage(int ufd, unstatic int uffdio_zeropage (int ufd,unsigned long offset) { -return __uffdio_zeropage (ufd, offset, false); +return __uffdio_zeropage (ufd, offset); }/* exercise UFFDIO_ZEROPAGE */
@@ -1177,6 +1173,13 @@ static int userfaultfd_zeropage_test(voiassert_expected_ioctls_present ( uffdio_register.mode, uffdio_register.ioctls); +if (area_dst_alias) { +/* Needed this to test zeropage-retry on shared memory */ + uffdio_register.range.start = (unsigned long ) area_dst_alias; +if (ioctl (uffd,UFFDIO_REGISTER , &uffdio_register)) +err ("register failure" ); + } +if (uffdio_zeropage (uffd,0 ))if (my_bcmp (area_dst, zeropage, page_size))err ("zeropage is not zero" );
@@ -1763,7 +1766,6 @@ static void sigalrm(int sig)if (sig !=SIGALRM )abort (); test_uffdio_copy_eexist = true; - test_uffdio_zeropage_eexist = true;alarm (ALARM_INTERVAL_SECS ); }
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-create-uffd-common.patch selftests-mm-split-uffd-tests-into-uffd-stress-and-uffd-unit-tests.patch selftests-mm-uffd_register.patch selftests-mm-uffd_open_devsys.patch selftests-mm-uffdio_api-test.patch selftests-mm-drop-global-mem_fd-in-uffd-tests.patch selftests-mm-drop-global-hpage_size-in-uffd-tests.patch selftests-mm-rename-uffd_stats-to-uffd_args.patch selftests-mm-let-uffd_handle_page_fault-take-wp-parameter.patch selftests-mm-allow-allocate_area-to-fail-properly.patch selftests-mm-add-framework-for-uffd-unit-test.patch selftests-mm-move-uffd-pagemap-test-to-unit-test.patch selftests-mm-move-uffd-minor-test-to-unit-test.patch selftests-mm-move-uffd-sig-events-tests-into-uffd-unit-tests.patch selftests-mm-move-zeropage-test-into-uffd-unit-tests.patch selftests-mm-workaround-no-way-to-detect-uffd-minor-wp.patch selftests-mm-allow-uffd-test-to-skip-properly-with-no-privilege.patch selftests-mm-drop-sys-dev-test-in-uffd-stress-test.patch selftests-mm-add-shmem-private-test-to-uffd-stress.patch selftests-mm-add-uffdio-register-ioctls-test.patch mm-hugetlb-fix-uffd-wp-during-fork.patch mm-hugetlb-fix-uffd-wp-bit-lost-when-unsharing-happens.patch selftests-mm-add-a-few-options-for-uffd-unit-test.patch selftests-mm-extend-and-rename-uffd-pagemap-test.patch selftests-mm-rename-cow_extra_libs-to-iouring_extra_libs.patch selftests-mm-add-tests-for-ro-pinning-vs-fork.patch