]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests/mm: uffd-stress: use kselftest framework
authorMike Rapoport (Microsoft) <rppt@kernel.org>
Mon, 11 May 2026 16:28:03 +0000 (19:28 +0300)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 21 Jun 2026 18:37:22 +0000 (11:37 -0700)
Convert uffd-stress test to use kselftest framework for reporting and
tracking successful and failing runs.

Link: https://lore.kernel.org/20260511162840.375890-20-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Tested-by: Sarthak Sharma <sarthak.sharma@arm.com>
Tested-by: Luiz Capitulino <luizcap@redhat.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Donet Tom <donettom@linux.ibm.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Liam Howlett <liam@infradead.org>
Cc: Li Wang <li.wang@linux.dev>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Nico Pache <npache@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
tools/testing/selftests/mm/uffd-stress.c

index 700fbaa18d44b87c83c211db4482206d16dacfa6..0ce493dac35400802f62d05580591bf37c36bc0d 100644 (file)
@@ -286,18 +286,12 @@ static int userfaultfd_stress(uffd_global_test_opts_t *gopts)
        pthread_attr_setstacksize(&attr, 16*1024*1024);
 
        while (bounces--) {
-               printf("bounces: %d, mode:", bounces);
-               if (bounces & BOUNCE_RANDOM)
-                       printf(" rnd");
-               if (bounces & BOUNCE_RACINGFAULTS)
-                       printf(" racing");
-               if (bounces & BOUNCE_VERIFY)
-                       printf(" ver");
-               if (bounces & BOUNCE_POLL)
-                       printf(" poll");
-               else
-                       printf(" read");
-               printf(", ");
+               ksft_print_msg("bounces: %d, mode:%s%s%s%s, ",
+                              bounces,
+                              bounces & BOUNCE_RANDOM ? " rnd" : "",
+                              bounces & BOUNCE_RACINGFAULTS ? " racing" : "",
+                              bounces & BOUNCE_VERIFY ? " ver" : "",
+                              bounces & BOUNCE_POLL ? " poll" : " read");
                fflush(stdout);
 
                if (bounces & BOUNCE_POLL)
@@ -461,6 +455,9 @@ int main(int argc, char **argv)
        if (argc < 4)
                usage();
 
+       ksft_print_header();
+       ksft_set_plan(1);
+
        if (signal(SIGALRM, sigalrm) == SIG_ERR)
                err("failed to arm SIGALRM");
        alarm(ALARM_INTERVAL_SECS);
@@ -484,10 +481,8 @@ int main(int argc, char **argv)
         * for racy extra reservation of hugepages.
         */
        if (gopts->test_type == TEST_HUGETLB &&
-          get_free_hugepages() < 2 * (bytes / gopts->page_size) + gopts->nr_parallel - 1) {
-               printf("skip: Skipping userfaultfd... not enough hugepages\n");
-               return KSFT_SKIP;
-       }
+          get_free_hugepages() < 2 * (bytes / gopts->page_size) + gopts->nr_parallel - 1)
+               ksft_exit_skip("Skipping userfaultfd... not enough hugepages\n");
 
        gopts->nr_pages_per_cpu = bytes / gopts->page_size / gopts->nr_parallel;
        if (!gopts->nr_pages_per_cpu) {
@@ -503,9 +498,12 @@ int main(int argc, char **argv)
        }
        gopts->nr_pages = gopts->nr_pages_per_cpu * gopts->nr_parallel;
 
-       printf("nr_pages: %lu, nr_pages_per_cpu: %lu\n",
-              gopts->nr_pages, gopts->nr_pages_per_cpu);
-       return userfaultfd_stress(gopts);
+       ksft_print_msg("nr_pages: %lu, nr_pages_per_cpu: %lu\n",
+                      gopts->nr_pages, gopts->nr_pages_per_cpu);
+
+       ksft_test_result(!userfaultfd_stress(gopts),
+                        "uffd-stress %s\n", argv[1]);
+       ksft_finished();
 }
 
 #else /* __NR_userfaultfd */
@@ -514,8 +512,8 @@ int main(int argc, char **argv)
 
 int main(void)
 {
-       printf("skip: Skipping userfaultfd test (missing __NR_userfaultfd)\n");
-       return KSFT_SKIP;
+       ksft_print_header();
+       ksft_exit_skip("missing __NR_userfaultfd definition\n");
 }
 
 #endif /* __NR_userfaultfd */