selftests/mm: gup_test: conform test to TAP format output

Conform the layout, informational and status messages to TAP.  No
functional change is intended other than the layout of output messages.

Link: https://lkml.kernel.org/r/20240102053807.2114200-1-usama.anjum@collabora.com
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/tools/testing/selftests/mm/gup_test.c b/tools/testing/selftests/mm/gup_test.c
index ec22291..cbe9959 100644 (file)
--- a/tools/testing/selftests/mm/gup_test.c
+++ b/tools/testing/selftests/mm/gup_test.c
@@ -50,39 +50,41 @@ static char *cmd_to_str(unsigned long cmd)
 void *gup_thread(void *data)
 {
        struct gup_test gup = *(struct gup_test *)data;
-       int i;
+       int i, status;
 
        /* Only report timing information on the *_BENCHMARK commands: */
        if ((cmd == PIN_FAST_BENCHMARK) || (cmd == GUP_FAST_BENCHMARK) ||
             (cmd == PIN_LONGTERM_BENCHMARK)) {
                for (i = 0; i < repeats; i++) {
                        gup.size = size;
-                       if (ioctl(gup_fd, cmd, &gup))
-                               perror("ioctl"), exit(1);
+                       status = ioctl(gup_fd, cmd, &gup);
+                       if (status)
+                               break;
 
                        pthread_mutex_lock(&print_mutex);
-                       printf("%s: Time: get:%lld put:%lld us",
-                              cmd_to_str(cmd), gup.get_delta_usec,
-                              gup.put_delta_usec);
+                       ksft_print_msg("%s: Time: get:%lld put:%lld us",
+                                      cmd_to_str(cmd), gup.get_delta_usec,
+                                      gup.put_delta_usec);
                        if (gup.size != size)
-                               printf(", truncated (size: %lld)", gup.size);
-                       printf("\n");
+                               ksft_print_msg(", truncated (size: %lld)", gup.size);
+                       ksft_print_msg("\n");
                        pthread_mutex_unlock(&print_mutex);
                }
        } else {
                gup.size = size;
-               if (ioctl(gup_fd, cmd, &gup)) {
-                       perror("ioctl");
-                       exit(1);
-               }
+               status = ioctl(gup_fd, cmd, &gup);
+               if (status)
+                       goto return_;
 
                pthread_mutex_lock(&print_mutex);
-               printf("%s: done\n", cmd_to_str(cmd));
+               ksft_print_msg("%s: done\n", cmd_to_str(cmd));
                if (gup.size != size)
-                       printf("Truncated (size: %lld)\n", gup.size);
+                       ksft_print_msg("Truncated (size: %lld)\n", gup.size);
                pthread_mutex_unlock(&print_mutex);
        }
 
+return_:
+       ksft_test_result(!status, "ioctl status %d\n", status);
        return NULL;
 }
 
@@ -170,7 +172,7 @@ int main(int argc, char **argv)
                        touch = 1;
                        break;
                default:
-                       return -1;
+                       ksft_exit_fail_msg("Wrong argument\n");
                }
        }
 
@@ -198,11 +200,12 @@ int main(int argc, char **argv)
                }
        }
 
+       ksft_print_header();
+       ksft_set_plan(nthreads);
+
        filed = open(file, O_RDWR|O_CREAT);
-       if (filed < 0) {
-               perror("open");
-               exit(filed);
-       }
+       if (filed < 0)
+               ksft_exit_fail_msg("Unable to open %s: %s\n", file, strerror(errno));
 
        gup.nr_pages_per_call = nr_pages;
        if (write)
@@ -213,27 +216,24 @@ int main(int argc, char **argv)
                switch (errno) {
                case EACCES:
                        if (getuid())
-                               printf("Please run this test as root\n");
+                               ksft_print_msg("Please run this test as root\n");
                        break;
                case ENOENT:
-                       if (opendir("/sys/kernel/debug") == NULL) {
-                               printf("mount debugfs at /sys/kernel/debug\n");
-                               break;
-                       }
-                       printf("check if CONFIG_GUP_TEST is enabled in kernel config\n");
+                       if (opendir("/sys/kernel/debug") == NULL)
+                               ksft_print_msg("mount debugfs at /sys/kernel/debug\n");
+                       ksft_print_msg("check if CONFIG_GUP_TEST is enabled in kernel config\n");
                        break;
                default:
-                       perror("failed to open " GUP_TEST_FILE);
+                       ksft_print_msg("failed to open %s: %s\n", GUP_TEST_FILE, strerror(errno));
                        break;
                }
-               exit(KSFT_SKIP);
+               ksft_test_result_skip("Please run this test as root\n");
+               return ksft_exit_pass();
        }
 
        p = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, filed, 0);
-       if (p == MAP_FAILED) {
-               perror("mmap");
-               exit(1);
-       }
+       if (p == MAP_FAILED)
+               ksft_exit_fail_msg("mmap: %s\n", strerror(errno));
        gup.addr = (unsigned long)p;
 
        if (thp == 1)
@@ -264,7 +264,8 @@ int main(int argc, char **argv)
                ret = pthread_join(tid[i], NULL);
                assert(ret == 0);
        }
+
        free(tid);
 
-       return 0;
+       return ksft_exit_pass();
 }