selftests/mm: remove unused parameters

Cleanup code and remove the unused arguments

Link: https://lkml.kernel.org/r/20250731160132.1795351-6-usama.anjum@collabora.com
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/tools/testing/selftests/mm/ksm_tests.c b/tools/testing/selftests/mm/ksm_tests.c
index b77462b5c240bff064b31492ecab795da93354e1..f5dabb513ed7fc7656c8c5265013e14c2ead974e 100644 (file)
--- a/tools/testing/selftests/mm/ksm_tests.c
+++ b/tools/testing/selftests/mm/ksm_tests.c
@@ -238,8 +238,7 @@ static int ksm_merge_pages(int merge_type, void *addr, size_t size,
        return 0;
 }
 
-static int ksm_unmerge_pages(void *addr, size_t size,
-                            struct timespec start_time, int timeout)
+static int ksm_unmerge_pages(void *addr, size_t size)
 {
        if (madvise(addr, size, MADV_UNMERGEABLE)) {
                perror("madvise");
@@ -456,7 +455,7 @@ static int get_first_mem_node(void)
        return get_next_mem_node(numa_max_node());
 }
 
-static int check_ksm_numa_merge(int merge_type, int mapping, int prot, int timeout,
+static int check_ksm_numa_merge(int merge_type, int timeout,
                                bool merge_across_nodes, size_t page_size)
 {
        void *numa1_map_ptr, *numa2_map_ptr;
@@ -520,8 +519,7 @@ err_out:
        return KSFT_FAIL;
 }
 
-static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot,
-                               int timeout, size_t map_size)
+static int ksm_merge_hugepages_time(int merge_type, int timeout, size_t map_size)
 {
        void *map_ptr, *map_ptr_orig;
        struct timespec start_time, end_time;
@@ -656,7 +654,7 @@ static int ksm_unmerge_time(int merge_type, int mapping, int prot, int timeout,
                perror("clock_gettime");
                goto err_out;
        }
-       if (ksm_unmerge_pages(map_ptr, map_size, start_time, timeout))
+       if (ksm_unmerge_pages(map_ptr, map_size))
                goto err_out;
        if (clock_gettime(CLOCK_MONOTONIC_RAW, &end_time)) {
                perror("clock_gettime");
@@ -884,8 +882,8 @@ int main(int argc, char *argv[])
                                                page_size);
                break;
        case CHECK_KSM_NUMA_MERGE:
-               ret = check_ksm_numa_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot,
-                                       ksm_scan_limit_sec, merge_across_nodes, page_size);
+               ret = check_ksm_numa_merge(merge_type, ksm_scan_limit_sec, merge_across_nodes,
+                                          page_size);
                break;
        case KSM_MERGE_TIME:
                if (size_MB == 0) {
@@ -900,8 +898,7 @@ int main(int argc, char *argv[])
                        printf("Option '-s' is required.\n");
                        return KSFT_FAIL;
                }
-               ret = ksm_merge_hugepages_time(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot,
-                               ksm_scan_limit_sec, size_MB);
+               ret = ksm_merge_hugepages_time(merge_type, ksm_scan_limit_sec, size_MB);
                break;
        case KSM_UNMERGE_TIME:
                if (size_MB == 0) {

diff --git a/tools/testing/selftests/mm/soft-dirty.c b/tools/testing/selftests/mm/soft-dirty.c
index e62be4136f69e1e594ae2e6f8a293ae155b8ec93..751fbc52857ea4e0623bbac7e97f3fd6c2d4aa13 100644 (file)
--- a/tools/testing/selftests/mm/soft-dirty.c
+++ b/tools/testing/selftests/mm/soft-dirty.c
@@ -76,7 +76,7 @@ static void test_vma_reuse(int pagemap_fd, int pagesize)
        munmap(map2, pagesize);
 }
 
-static void test_hugepage(int pagemap_fd, int pagesize)
+static void test_hugepage(int pagemap_fd)
 {
        char *map;
        int i, ret;
@@ -210,7 +210,7 @@ int main(void)
 
        test_simple(pagemap_fd, pagesize);
        test_vma_reuse(pagemap_fd, pagesize);
-       test_hugepage(pagemap_fd, pagesize);
+       test_hugepage(pagemap_fd);
        test_mprotect_anon(pagemap_fd, pagesize);
        test_mprotect_file(pagemap_fd, pagesize);
 

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 674fa3708dd950e8b343adf1436e8c219e5f2f8c..cc8dff080d7e86f73635a592f7e65182a9f3f631 100644 (file)
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -106,7 +106,7 @@ static char *allocate_zero_filled_hugepage(size_t len)
        return result;
 }
 
-static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, int nr_hpages, size_t len)
+static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, size_t len)
 {
        unsigned long rss_anon_before, rss_anon_after;
        size_t i;
@@ -142,7 +142,7 @@ void split_pmd_zero_pages(void)
        size_t len = nr_hpages * pmd_pagesize;
 
        one_page = allocate_zero_filled_hugepage(len);
-       verify_rss_anon_split_huge_page_all_zeroes(one_page, nr_hpages, len);
+       verify_rss_anon_split_huge_page_all_zeroes(one_page, len);
        ksft_test_result_pass("Split zero filled huge pages successful\n");
        free(one_page);
 }

diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
index a37088a23ffefad47af97165611d7df02f58c5b0..815c22114b57e972ca0e202989fef1483c034477 100644 (file)
--- a/tools/testing/selftests/mm/uffd-common.c
+++ b/tools/testing/selftests/mm/uffd-common.c
@@ -416,7 +416,7 @@ static void continue_range(int ufd, __u64 start, __u64 len, bool wp)
                    ret, (int64_t) req.mapped);
 }
 
-int uffd_read_msg(int ufd, struct uffd_msg *msg)
+int uffd_read_msg(struct uffd_msg *msg)
 {
        int ret = read(uffd, msg, sizeof(*msg));
 
@@ -537,7 +537,7 @@ void *uffd_poll_thread(void *arg)
                }
                if (!(pollfd[0].revents & POLLIN))
                        err("pollfd[0].revents %d", pollfd[0].revents);
-               if (uffd_read_msg(uffd, &msg))
+               if (uffd_read_msg(&msg))
                        continue;
                switch (msg.event) {
                default:

diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h
index 7700cbfa397563d2f2bc82be45f96f2fc2032bbe..2e7066d69103d5cf7cea3531b93e15387912de11 100644 (file)
--- a/tools/testing/selftests/mm/uffd-common.h
+++ b/tools/testing/selftests/mm/uffd-common.h
@@ -117,7 +117,7 @@ void uffd_stats_report(struct uffd_args *args, int n_cpus);
 int uffd_test_ctx_init(uint64_t features, const char **errmsg);
 void uffd_test_ctx_clear(void);
 int userfaultfd_open(uint64_t *features);
-int uffd_read_msg(int ufd, struct uffd_msg *msg);
+int uffd_read_msg(struct uffd_msg *msg);
 void wp_range(int ufd, __u64 start, __u64 len, bool wp);
 void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args);
 int __copy_page(int ufd, unsigned long offset, bool retry, bool wp);

diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c
index c0f64df5085c4a4cf7928040e8b4febc440af589..24aac0ae96c6cf8f377ab80f67cfbfda2b965921 100644 (file)
--- a/tools/testing/selftests/mm/uffd-stress.c
+++ b/tools/testing/selftests/mm/uffd-stress.c
@@ -137,7 +137,7 @@ static void *uffd_read_thread(void *arg)
        /* from here cancellation is ok */
 
        for (;;) {
-               if (uffd_read_msg(uffd, &msg))
+               if (uffd_read_msg(&msg))
                        continue;
                uffd_handle_page_fault(&msg, args);
        }

diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
index 50501b38e34e70189ac7e75302d8bd4c7e4e409e..df7b82bbebaadc7c36118351727ad5cb1215c9e5 100644 (file)
--- a/tools/testing/selftests/mm/uffd-unit-tests.c
+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -248,7 +248,7 @@ static void *fork_event_consumer(void *data)
        ready_for_fork = true;
 
        /* Read until a full msg received */
-       while (uffd_read_msg(args->parent_uffd, &msg));
+       while (uffd_read_msg(&msg));
 
        if (msg.event != UFFD_EVENT_FORK)
                err("wrong message: %u\n", msg.event);
@@ -1352,11 +1352,11 @@ static void *uffd_mmap_changing_thread(void *opaque)
        return NULL;
 }
 
-static void uffd_consume_message(int fd)
+static void uffd_consume_message(void)
 {
        struct uffd_msg msg = { 0 };
 
-       while (uffd_read_msg(fd, &msg));
+       while (uffd_read_msg(&msg));
 }
 
 static void uffd_mmap_changing_test(uffd_test_args_t *targs)
@@ -1407,7 +1407,7 @@ static void uffd_mmap_changing_test(uffd_test_args_t *targs)
         * All succeeded above!  Recycle everything.  Start by reading the
         * event so as to kick the thread roll again..
         */
-       uffd_consume_message(uffd);
+       uffd_consume_message();
 
        ret = pthread_join(tid, NULL);
        assert(ret == 0);