selftests-mm-uffd-unit-tests-use-kselftest-framework.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: uffd-unit-tests: use kselftest framework
has been removed from the -mm tree. Its filename was
selftests-mm-uffd-unit-tests-use-kselftest-framework.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: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: selftests/mm: uffd-unit-tests: use kselftest framework
Date: Mon, 11 May 2026 19:28:04 +0300
Convert uffd-unit-tests to use kselftest framework for reporting and tracking successful and failing runs.
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>
Reviewed-by Donet Tom <[email protected]>
Reviewed-by Mark Brown <[email protected]>
Tested-by Luiz Capitulino <[email protected]>
Cc Baolin Wang <[email protected]>
Cc Barry Song <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Dev Jain <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc John Hubbard <[email protected]>
Cc Lance Yang <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Li Wang <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Nico Pache <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Sarthak Sharma <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Zi Yan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
tools/testing/selftests/mm/uffd-unit-tests.c | 105 ++++++++--------- 1 file changed, 52 insertions(+), 53 deletions(-)
tools/testing/selftests/mm/uffd-unit-tests.c renamed from tools/testing/selftests/mm/uffd-unit-tests.c~selftests-mm-uffd-unit-tests-use-kselftest-framework +52 -53
@@ -86,47 +86,28 @@ typedef struct {uffd_test_case_ops_t *test_case_ops; } uffd_test_case_t; -static void uffd_test_report (void ) -{ -printf ("Userfaults unit tests: pass=%u, skip=%u, fail=%u (total=%u)\n" , -ksft_get_pass_cnt (), -ksft_get_xskip_cnt (), -ksft_get_fail_cnt (), -ksft_test_num ()); -} +static char current_test[256 ];static void uffd_test_pass (void ) { -printf ("done\n" ); -ksft_inc_pass_cnt (); +ksft_test_result_pass ("%s\n" , current_test); }#define uffd_test_start (...) do { \ - printf("Testing "); \ - printf(__VA_ARGS__); \ - printf("... "); \ - fflush(stdout); \ + snprintf(current_test, sizeof(current_test), __VA_ARGS__); \ } while (0) -#define uffd_test_fail (...) do { \ - printf("failed [reason: "); \ - printf(__VA_ARGS__); \ - printf("]\n"); \ - ksft_inc_fail_cnt(); \ +#define uffd_test_fail (fmt, ...) do { \ + ksft_print_msg("failed reason: [" fmt "]\n", ##__VA_ARGS__); \ + ksft_test_result_fail("%s\n", current_test); \ } while (0)static void uffd_test_skip (const char *message) { -printf ("skipped [reason: %s]\n" , message); -ksft_inc_xskip_cnt (); +ksft_test_result_skip ("%s (%s)\n" , current_test, message); } -/* -* Returns 1 if specific userfaultfd supported, 0 otherwise. Note, we'll -* return 1 even if some test failed as long as uffd supported, because in -* that case we still want to proceed with the rest uffd unit tests. -*/ -static int test_uffd_api (bool use_dev) +static void test_uffd_api (bool use_dev) {struct uffdio_api uffdio_api;int uffd;
@@ -140,7 +121,7 @@ static int test_uffd_api(bool use_dev) uffd =uffd_open_sys (UFFD_FLAGS );if (uffd <0 ) {uffd_test_skip ("cannot open userfaultfd handle" ); -return 0 ; +return ; }/* Test wrong UFFD_API */
@@ -177,8 +158,6 @@ static int test_uffd_api(bool use_dev)uffd_test_pass (); out:close (uffd); -/* We have a valid uffd handle */ -return 1 ; }
@@ -1701,6 +1680,26 @@ static void usage(const char *prog)exit (KSFT_FAIL ); } +static int uffd_count_tests (int n_tests,int n_mems,const char *test_filter) +{ +uffd_test_case_t *test; +int i, j, count =0 ; + +if (!test_filter) + count +=2 ;/* test_uffd_api(false) + test_uffd_api(true) */ + +for (i =0 ; i < n_tests; i++) { + test = &uffd_tests[i]; +if (test_filter && !strstr (test->name, test_filter)) +continue ; +for (j =0 ; j < n_mems; j++) +if (test->mem_targets & mem_types[j].mem_flag) + count++; + } + +return count; +} +int main (int argc,char *argv[]) {int n_tests =sizeof (uffd_tests) /sizeof (uffd_test_case_t);
@@ -1711,8 +1710,7 @@ int main(int argc, char *argv[])mem_type_t *mem_type;uffd_test_args_t args;const char *errmsg; -int has_uffd, opt; -int i, j; +int i, j, opt;while ((opt =getopt (argc, argv,"f:hl" )) !=-1 ) {switch (opt) {
@@ -1730,24 +1728,28 @@ int main(int argc, char *argv[]) } } -if (!test_filter && !list_only) { - has_uffd =test_uffd_api (false); - has_uffd |=test_uffd_api (true); - -if (!has_uffd) { -printf ("Userfaultfd not supported or unprivileged, skip all tests\n" ); -exit (KSFT_SKIP ); +if (list_only) { +for (i =0 ; i < n_tests; i++) { + test = &uffd_tests[i]; +if (test_filter && !strstr (test->name, test_filter)) +continue ; +printf ("%s\n" , test->name); } +return KSFT_PASS ; + } + +ksft_print_header (); +ksft_set_plan (uffd_count_tests (n_tests, n_mems, test_filter)); + +if (!test_filter) { +test_uffd_api (false); +test_uffd_api (true); }for (i =0 ; i < n_tests; i++) { test = &uffd_tests[i];if (test_filter && !strstr (test->name, test_filter))continue ; -if (list_only) { -printf ("%s\n" , test->name); -continue ; - }for (j =0 ; j < n_mems; j++) { mem_type = &mem_types[j];
@@ -1758,6 +1760,10 @@ int main(int argc, char *argv[]) uffd_test_ops = mem_type->mem_ops; uffd_test_case_ops = test->test_case_ops; +if (!(test->mem_targets & mem_type->mem_flag)) +continue ; + +uffd_test_start ("%s on %s" , test->name, mem_type->name);if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE |MEM_HUGETLB )) { gopts.page_size =default_huge_page_size ();if (gopts.page_size ==0 ) {
@@ -1777,10 +1783,6 @@ int main(int argc, char *argv[])/* Initialize test arguments */ args.mem_type = mem_type; -if (!(test->mem_targets & mem_type->mem_flag)) -continue ; - -uffd_test_start ("%s on %s" , test->name, mem_type->name);if (!uffd_feature_supported (test)) {uffd_test_skip ("feature missing" );continue ;
@@ -1794,10 +1796,7 @@ int main(int argc, char *argv[]) } } -if (!list_only) -uffd_test_report (); - -return ksft_get_fail_cnt () ?KSFT_FAIL :KSFT_PASS ; +ksft_finished (); }#else /* __NR_userfaultfd */
@@ -1806,8 +1805,8 @@ int main(int argc, char *argv[])int main (void ) { -printf ("Skipping %s (missing __NR_userfaultfd)\n" , __file__); -return KSFT_SKIP ; +ksft_print_header (); +ksft_exit_skip ("missing __NR_userfaultfd definition\n" ); }#endif /* __NR_userfaultfd */
_
Patches currently in -mm which might be from [email protected] are