selftest/mm: extract sz2ord function into vm_util.h

The function already has 2 uses and will have a 3rd one in prctl
selftests.  The pagesize argument is added into the function, as it's not
a global variable anymore.  No functional change intended with this patch.

Link: https://lkml.kernel.org/r/20250815135549.130506-6-usamaarif642@gmail.com
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Usama Arif <usamaarif642@gmail.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Jann Horn <jannh@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Yafang <laoar.shao@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c
index b51fbeb9375141ee6d5a095b61e68fcd8345dba5..6560c26f47d1fee780549b28decc0c3871cb362b 100644 (file)
--- a/tools/testing/selftests/mm/cow.c
+++ b/tools/testing/selftests/mm/cow.c
@@ -52,7 +52,7 @@ static int detect_thp_sizes(size_t sizes[], int max)
        if (!pmdsize)
                return 0;
 
-       orders = 1UL << sz2ord(pmdsize);
+       orders = 1UL << sz2ord(pmdsize, pagesize);
        orders |= thp_supported_orders();
 
        for (i = 0; orders && count < max; i++) {
@@ -1211,8 +1211,8 @@ static void run_anon_test_case(struct test_case const *test_case)
                size_t size = thpsizes[i];
                struct thp_settings settings = *thp_current_settings();
 
-               settings.hugepages[sz2ord(pmdsize)].enabled = THP_NEVER;
-               settings.hugepages[sz2ord(size)].enabled = THP_ALWAYS;
+               settings.hugepages[sz2ord(pmdsize, pagesize)].enabled = THP_NEVER;
+               settings.hugepages[sz2ord(size, pagesize)].enabled = THP_ALWAYS;
                thp_push_settings(&settings);
 
                if (size == pmdsize) {
@@ -1863,7 +1863,7 @@ int main(int argc, char **argv)
        if (pmdsize) {
                /* Only if THP is supported. */
                thp_read_settings(&default_settings);
-               default_settings.hugepages[sz2ord(pmdsize)].enabled = THP_INHERIT;
+               default_settings.hugepages[sz2ord(pmdsize, pagesize)].enabled = THP_INHERIT;
                thp_save_settings();
                thp_push_settings(&default_settings);
 

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 505b5bb1829ea1d249805d90b184426d427ae62f..4e3408263a77bad27be5548631bac03c8ee42242 100644 (file)
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -546,7 +546,7 @@ int main(int argc, char **argv)
                ksft_exit_fail_msg("Reading PMD pagesize failed\n");
 
        nr_pages = pmd_pagesize / pagesize;
-       max_order = sz2ord(pmd_pagesize);
+       max_order =  sz2ord(pmd_pagesize, pagesize);
        tests = 2 + (max_order - 1) + (2 * max_order) + (max_order - 1) * 4 + 2;
        ksft_set_plan(tests);
 

diff --git a/tools/testing/selftests/mm/uffd-wp-mremap.c b/tools/testing/selftests/mm/uffd-wp-mremap.c
index e1193550e717826ccb4d5f6d1b82960fa477ce80..78038c40aaaff04418f98b1b817588e4edb450c5 100644 (file)
--- a/tools/testing/selftests/mm/uffd-wp-mremap.c
+++ b/tools/testing/selftests/mm/uffd-wp-mremap.c
@@ -82,9 +82,9 @@ static void *alloc_one_folio(size_t size, bool private, bool hugetlb)
                struct thp_settings settings = *thp_current_settings();
 
                if (private)
-                       settings.hugepages[sz2ord(size)].enabled = THP_ALWAYS;
+                       settings.hugepages[sz2ord(size, pagesize)].enabled = THP_ALWAYS;
                else
-                       settings.shmem_hugepages[sz2ord(size)].enabled = SHMEM_ALWAYS;
+                       settings.shmem_hugepages[sz2ord(size, pagesize)].enabled = SHMEM_ALWAYS;
 
                thp_push_settings(&settings);
 

diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h
index 85f7dae9a0c10bd9184e6f8d832639107855088e..3da56feeb9442a8b1c4437cea83f635e7f30fbb8 100644 (file)
--- a/tools/testing/selftests/mm/vm_util.h
+++ b/tools/testing/selftests/mm/vm_util.h
@@ -127,9 +127,9 @@ static inline void log_test_result(int result)
        ksft_test_result_report(result, "%s\n", test_name);
 }
 
-static inline int sz2ord(size_t size)
+static inline int sz2ord(size_t size, size_t pagesize)
 {
-       return __builtin_ctzll(size / getpagesize());
+       return __builtin_ctzll(size / pagesize);
 }
 
 void *sys_mremap(void *old_address, unsigned long old_size,