On Fri, 15 Aug 2025 14:54:57 +0100 Usama Arif <usamaarif642@xxxxxxxxx> wrote: > 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. > https://lkml.kernel.org/r/20250816040113.760010-5-aboorvad@xxxxxxxxxxxxx jut did this, but didn't add the extra arg. tools/testing/selftests/mm/split_huge_page_test.c needed updating. --- a/tools/testing/selftests/mm/cow.c~selftest-mm-extract-sz2ord-function-into-vm_utilh +++ a/tools/testing/selftests/mm/cow.c @@ -52,7 +52,7 @@ static int detect_thp_sizes(size_t sizes 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 te 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(void) 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); --- a/tools/testing/selftests/mm/uffd-wp-mremap.c~selftest-mm-extract-sz2ord-function-into-vm_utilh +++ a/tools/testing/selftests/mm/uffd-wp-mremap.c @@ -82,9 +82,9 @@ static void *alloc_one_folio(size_t size 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); --- a/tools/testing/selftests/mm/vm_util.h~selftest-mm-extract-sz2ord-function-into-vm_utilh +++ a/tools/testing/selftests/mm/vm_util.h @@ -127,9 +127,9 @@ static inline void log_test_result(int r 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, --- a/tools/testing/selftests/mm/split_huge_page_test.c~selftest-mm-extract-sz2ord-function-into-vm_utilh +++ a/tools/testing/selftests/mm/split_huge_page_test.c @@ -544,7 +544,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); _
