selftests-mm-move-zeropage-test-into-uffd-unit-tests.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: move zeropage test into uffd unit tests
has been removed from the -mm tree. Its filename was
selftests-mm-move-zeropage-test-into-uffd-unit-tests.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: move zeropage test into uffd unit tests
Date: Wed, 12 Apr 2023 12:44:04 -0400
Simplifies it a bit along the way, e.g., drop the never used offset field (which was always the 1st page so offset=0).
Introduce uffd_register_with_ioctls() out of uffd_register() to detect uffdio_register.ioctls got returned. Check that automatically when testing UFFDIO_ZEROPAGE on different types of memory (and kernel).
---
tools/testing/selftests/mm/uffd-stress.c | 94 ----------------- tools/testing/selftests/mm/uffd-unit-tests.c | 93 ++++++++++++++++ tools/testing/selftests/mm/vm_util.c | 14 ++ tools/testing/selftests/mm/vm_util.h | 2 4 files changed, 108 insertions(+), 95 deletions(-)
tools/testing/selftests/mm/uffd-stress.c renamed from tools/testing/selftests/mm/uffd-stress.c~selftests-mm-move-zeropage-test-into-uffd-unit-tests +1 -93
@@ -109,15 +109,6 @@ static inline uint64_t uffd_minor_featurreturn 0 ; } -static int my_bcmp (char *str1,char *str2,size_t n) -{ -unsigned long i; -for (i =0 ; i < n; i++) -if (str1[i] != str2[i]) -return 1 ; -return 0 ; -} -static void *locking_thread (void *arg) {unsigned long cpu = (unsigned long ) arg;
@@ -273,89 +264,6 @@ static int stress(struct uffd_args *argsreturn 0 ; } -static void retry_uffdio_zeropage (int ufd, -struct uffdio_zeropage *uffdio_zeropage, -unsigned long offset) -{ - uffd_test_ops->alias_mapping (&uffdio_zeropage->range.start, - uffdio_zeropage->range.len, - offset); -if (ioctl (ufd,UFFDIO_ZEROPAGE , uffdio_zeropage)) { -if (uffdio_zeropage->zeropage != -EEXIST ) -err ("UFFDIO_ZEROPAGE error: %" PRId64, - (int64_t )uffdio_zeropage->zeropage); - }else { -err ("UFFDIO_ZEROPAGE error: %" PRId64, - (int64_t )uffdio_zeropage->zeropage); - } -} - -static int __uffdio_zeropage (int ufd,unsigned long offset) -{ -struct uffdio_zeropage uffdio_zeropage; -int ret; -bool has_zeropage = !(test_type ==TEST_HUGETLB ); -__s64 res; - -if (offset >= nr_pages * page_size) -err ("unexpected offset %lu" , offset); - uffdio_zeropage.range.start = (unsigned long ) area_dst + offset; - uffdio_zeropage.range.len = page_size; - uffdio_zeropage.mode =0 ; - ret =ioctl (ufd,UFFDIO_ZEROPAGE , &uffdio_zeropage); - res = uffdio_zeropage.zeropage; -if (ret) { -/* real retval in ufdio_zeropage.zeropage */ -if (has_zeropage) -err ("UFFDIO_ZEROPAGE error: %" PRId64, (int64_t )res); -else if (res != -EINVAL ) -err ("UFFDIO_ZEROPAGE not -EINVAL" ); - }else if (has_zeropage) { -if (res != page_size) { -err ("UFFDIO_ZEROPAGE unexpected size" ); - }else { -retry_uffdio_zeropage (ufd, &uffdio_zeropage, - offset); -return 1 ; - } - }else -err ("UFFDIO_ZEROPAGE succeeded" ); - -return 0 ; -} - -static int uffdio_zeropage (int ufd,unsigned long offset) -{ -return __uffdio_zeropage (ufd, offset); -} - -/* exercise UFFDIO_ZEROPAGE */ -static int userfaultfd_zeropage_test (void ) -{ -printf ("testing UFFDIO_ZEROPAGE: " ); -fflush (stdout); - -uffd_test_ctx_init (0 ); - -if (uffd_register (uffd, area_dst, nr_pages * page_size, - true, test_uffdio_wp, false)) -err ("register failure" ); - -if (area_dst_alias) { -/* Needed this to test zeropage-retry on shared memory */ -if (uffd_register (uffd, area_dst_alias, nr_pages * page_size, - true, test_uffdio_wp, false)) -err ("register failure" ); - } - -if (uffdio_zeropage (uffd,0 )) -if (my_bcmp (area_dst, zeropage, page_size)) -err ("zeropage is not zero" ); - -printf ("done.\n" ); -return 0 ; -} -static int userfaultfd_stress (void ) {void *area;
@@ -467,7 +375,7 @@ static int userfaultfd_stress(void)uffd_stats_report (args, nr_cpus); } -return userfaultfd_zeropage_test (); +return 0 ; }static void set_test_type (const char *type)
tools/testing/selftests/mm/uffd-unit-tests.c renamed from tools/testing/selftests/mm/uffd-unit-tests.c~selftests-mm-move-zeropage-test-into-uffd-unit-tests +93 -0
101 lines not on this page · raw message
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~selftests-mm-move-zeropage-test-into-uffd-unit-tests +12 -2
@@ -198,8 +198,9 @@ unsigned long default_huge_page_size(voireturn hps; } -int uffd_register (int uffd,void *addr,uint64_t len, -bool miss,bool wp,bool minor) +/* If `ioctls' non-NULL, the allowed ioctls will be returned into the var */ +int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len, +bool miss,bool wp,bool minor,uint64_t *ioctls) {struct uffdio_register uffdio_register = {0 };uint64_t mode =0 ;
@@ -218,10 +219,19 @@ int uffd_register(int uffd, void *addr,if (ioctl (uffd,UFFDIO_REGISTER , &uffdio_register) ==-1 ) ret = -errno; +else if (ioctls) + *ioctls = uffdio_register.ioctls;return ret; } +int uffd_register (int uffd,void *addr,uint64_t len, +bool miss,bool wp,bool minor) +{ +return uffd_register_with_ioctls (uffd, addr, len, + miss, wp, minor,NULL ); +} +int uffd_unregister (int uffd,void *addr,uint64_t len) {struct uffdio_range range = { .start = (uintptr_t )addr, .len = len };
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-move-zeropage-test-into-uffd-unit-tests +2 -0
@@ -52,6 +52,8 @@ int uffd_open_dev(unsigned int flags);int uffd_open_sys (unsigned int flags);int uffd_open (unsigned int flags);int uffd_get_features (uint64_t *features); +int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len, +bool miss,bool wp,bool minor,uint64_t *ioctls);/* * On ppc64 this will only work with radix 2M hugepage size
_
Patches currently in -mm which might be from [email protected] are
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