Re: [PATCH v3 1/3] kselftest: mm: rename read_pmd_pagesize() to pmd_psize()
From: Lorenzo Stoakes (ARM)
Date: Tue Sep 15 2026 - 05:11:33 EST
On Mon, Sep 14, 2026 at 08:30:46AM +0100, Yeoreum Yun wrote:
> For consistency with psize(), rename read_pmd_pagesize() to
> pmd_psize(). There is no functional change.
>
> Suggested-by: David Hildenbrand (Arm) <david@xxxxxxxxxx>
> Signed-off-by: Yeoreum Yun <yeoreum.yun@xxxxxxx>
LGTM so:
Reviewed-by: Lorenzo Stoakes (ARM) <ljs@xxxxxxxxxx>
> ---
> tools/testing/selftests/mm/cow.c | 2 +-
> tools/testing/selftests/mm/folio_split_race_test.c | 2 +-
> tools/testing/selftests/mm/hmm-tests.c | 22 +++++++++++-----------
> tools/testing/selftests/mm/khugepaged.c | 2 +-
> tools/testing/selftests/mm/migration.c | 4 ++--
> tools/testing/selftests/mm/mkdirty.c | 2 +-
> tools/testing/selftests/mm/pagemap_ioctl.c | 2 +-
> tools/testing/selftests/mm/prctl_thp_disable.c | 4 ++--
> tools/testing/selftests/mm/process_madv.c | 2 +-
> tools/testing/selftests/mm/soft-dirty.c | 2 +-
> tools/testing/selftests/mm/split_huge_page_test.c | 2 +-
> tools/testing/selftests/mm/uffd-common.c | 6 +++---
> tools/testing/selftests/mm/uffd-unit-tests.c | 8 ++++----
> tools/testing/selftests/mm/uffd-wp-mremap.c | 2 +-
> tools/testing/selftests/mm/vm_util.c | 8 ++++----
> tools/testing/selftests/mm/vm_util.h | 2 +-
> 16 files changed, 36 insertions(+), 36 deletions(-)
>
> diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c
> index 8aa5249d9bef..e42edeccfd7a 100644
> --- a/tools/testing/selftests/mm/cow.c
> +++ b/tools/testing/selftests/mm/cow.c
> @@ -1889,7 +1889,7 @@ int main(int argc, char **argv)
> thp_save_settings();
>
> pagesize = getpagesize();
> - pmdsize = read_pmd_pagesize();
> + pmdsize = pmd_psize();
> if (pmdsize) {
> /* Only if THP is supported. */
> thp_read_settings(&default_settings);
> diff --git a/tools/testing/selftests/mm/folio_split_race_test.c b/tools/testing/selftests/mm/folio_split_race_test.c
> index 1960635a953e..a956e5c74c65 100644
> --- a/tools/testing/selftests/mm/folio_split_race_test.c
> +++ b/tools/testing/selftests/mm/folio_split_race_test.c
> @@ -235,7 +235,7 @@ int main(void)
> ksft_print_header();
>
> page_size = getpagesize();
> - pmd_pagesize = read_pmd_pagesize();
> + pmd_pagesize = pmd_psize();
>
> if (!thp_available() || !pmd_pagesize)
> ksft_exit_skip("Transparent Hugepages not available\n");
> diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftests/mm/hmm-tests.c
> index e2642eca0d02..ad14372b75d9 100644
> --- a/tools/testing/selftests/mm/hmm-tests.c
> +++ b/tools/testing/selftests/mm/hmm-tests.c
> @@ -569,7 +569,7 @@ TEST_F(hmm, anon_write_child)
>
> for (migrate = 0; migrate < 2; ++migrate) {
> for (use_thp = 0; use_thp < 2; ++use_thp) {
> - npages = ALIGN(use_thp ? read_pmd_pagesize() : HMM_BUFFER_SIZE,
> + npages = ALIGN(use_thp ? pmd_psize() : HMM_BUFFER_SIZE,
> self->page_size) >> self->page_shift;
> ASSERT_NE(npages, 0);
> size = npages << self->page_shift;
> @@ -730,7 +730,7 @@ TEST_F(hmm, anon_write_huge)
> int *ptr;
> int ret;
>
> - size = 2 * read_pmd_pagesize();
> + size = 2 * pmd_psize();
>
> buffer = hmm_buffer_alloc(size, size,
> PROT_READ | PROT_WRITE,
> @@ -1941,7 +1941,7 @@ TEST_F(hmm, migrate_anon_huge_empty)
> int *ptr;
> int ret;
>
> - size = read_pmd_pagesize();
> + size = pmd_psize();
>
> buffer = hmm_buffer_alloc(2 * size, size,
> PROT_READ,
> @@ -1984,7 +1984,7 @@ TEST_F(hmm, migrate_anon_huge_zero)
> int ret;
> int val;
>
> - size = read_pmd_pagesize();
> + size = pmd_psize();
>
> buffer = hmm_buffer_alloc(2 * size, size,
> PROT_READ,
> @@ -2038,7 +2038,7 @@ TEST_F(hmm, migrate_anon_huge_free)
> int *ptr;
> int ret;
>
> - size = read_pmd_pagesize();
> + size = pmd_psize();
>
> buffer = hmm_buffer_alloc(2 * size, size,
> PROT_READ | PROT_WRITE,
> @@ -2091,7 +2091,7 @@ TEST_F(hmm, migrate_anon_huge_fault)
> int *ptr;
> int ret;
>
> - size = read_pmd_pagesize();
> + size = pmd_psize();
>
> buffer = hmm_buffer_alloc(2 * size, size,
> PROT_READ | PROT_WRITE,
> @@ -2161,7 +2161,7 @@ TEST_F(hmm, migrate_partial_unmap_fault)
> {
> struct hmm_buffer *buffer;
> unsigned long npages;
> - unsigned long size = read_pmd_pagesize();
> + unsigned long size = pmd_psize();
> unsigned long unmap_size;
> unsigned long offsets[3];
> unsigned long i;
> @@ -2226,7 +2226,7 @@ TEST_F(hmm, migrate_remap_fault)
> {
> struct hmm_buffer *buffer;
> unsigned long npages;
> - unsigned long size = read_pmd_pagesize();
> + unsigned long size = pmd_psize();
> unsigned long offsets[3];
> unsigned long i;
> void *old_ptr, *new_ptr = NULL;
> @@ -2323,7 +2323,7 @@ TEST_F(hmm, migrate_anon_huge_err)
> int *ptr;
> int ret;
>
> - size = read_pmd_pagesize();
> + size = pmd_psize();
>
> buffer = hmm_buffer_alloc(2 * size, 2 * size,
> PROT_READ | PROT_WRITE,
> @@ -2413,7 +2413,7 @@ TEST_F(hmm, migrate_anon_huge_zero_err)
> int *ptr;
> int ret;
>
> - size = read_pmd_pagesize();
> + size = pmd_psize();
>
> buffer = hmm_buffer_alloc(2 * size, 2 * size,
> PROT_READ,
> @@ -2609,7 +2609,7 @@ static inline int run_migration_benchmark(int fd, int use_thp, size_t buffer_siz
> TEST_F_TIMEOUT(hmm, benchmark_thp_migration, 120)
> {
> struct benchmark_results thp_results, regular_results;
> - size_t thp_size = read_pmd_pagesize();
> + size_t thp_size = pmd_psize();
> int iterations = 5;
>
> if (!thp_size)
> diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c
> index f82673f5f6b4..76c1fbcc5260 100644
> --- a/tools/testing/selftests/mm/khugepaged.c
> +++ b/tools/testing/selftests/mm/khugepaged.c
> @@ -1330,7 +1330,7 @@ int main(int argc, char **argv)
> ksft_exit_skip("Transparent Hugepages not available\n");
>
> page_size = getpagesize();
> - hpage_pmd_size = read_pmd_pagesize();
> + hpage_pmd_size = pmd_psize();
> if (!hpage_pmd_size)
> ksft_exit_fail_msg("Reading PMD pagesize failed\n");
> hpage_pmd_nr = hpage_pmd_size / page_size;
> diff --git a/tools/testing/selftests/mm/migration.c b/tools/testing/selftests/mm/migration.c
> index f19d53c69576..4280d2c87b22 100644
> --- a/tools/testing/selftests/mm/migration.c
> +++ b/tools/testing/selftests/mm/migration.c
> @@ -229,7 +229,7 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME)
> if (!thp_is_enabled())
> SKIP(return, "Transparent Hugepages not available");
>
> - pmdsize = read_pmd_pagesize();
> + pmdsize = pmd_psize();
> if (!pmdsize)
> SKIP(return, "Reading PMD pagesize failed");
>
> @@ -263,7 +263,7 @@ TEST_F_TIMEOUT(migration, shared_anon_thp, 2*RUNTIME)
> if (!thp_is_enabled())
> SKIP(return, "Transparent Hugepages not available");
>
> - pmdsize = read_pmd_pagesize();
> + pmdsize = pmd_psize();
> if (!pmdsize)
> SKIP(return, "Reading PMD pagesize failed");
>
> diff --git a/tools/testing/selftests/mm/mkdirty.c b/tools/testing/selftests/mm/mkdirty.c
> index 68dd447a5454..49ef643a6e63 100644
> --- a/tools/testing/selftests/mm/mkdirty.c
> +++ b/tools/testing/selftests/mm/mkdirty.c
> @@ -330,7 +330,7 @@ int main(void)
> int err, tests = 2;
>
> pagesize = getpagesize();
> - thpsize = read_pmd_pagesize();
> + thpsize = pmd_psize();
> if (thpsize) {
> ksft_print_msg("[INFO] detected THP size: %zu KiB\n",
> thpsize / 1024);
> diff --git a/tools/testing/selftests/mm/pagemap_ioctl.c b/tools/testing/selftests/mm/pagemap_ioctl.c
> index d9a4fb782ecf..d0e34dd5850b 100644
> --- a/tools/testing/selftests/mm/pagemap_ioctl.c
> +++ b/tools/testing/selftests/mm/pagemap_ioctl.c
> @@ -1654,7 +1654,7 @@ int main(int __attribute__((unused)) argc, char *argv[])
> ksft_print_header();
>
> page_size = getpagesize();
> - hpage_size = read_pmd_pagesize();
> + hpage_size = pmd_psize();
>
> if (init_uffd())
> ksft_exit_skip("Failed to initialize userfaultfd\n");
> diff --git a/tools/testing/selftests/mm/prctl_thp_disable.c b/tools/testing/selftests/mm/prctl_thp_disable.c
> index 82c6e96ea6eb..d0290c4567bd 100644
> --- a/tools/testing/selftests/mm/prctl_thp_disable.c
> +++ b/tools/testing/selftests/mm/prctl_thp_disable.c
> @@ -133,7 +133,7 @@ FIXTURE_SETUP(prctl_thp_disable_completely)
> if (!thp_available())
> SKIP(return, "Transparent Hugepages not available\n");
>
> - self->pmdsize = read_pmd_pagesize();
> + self->pmdsize = pmd_psize();
> if (!self->pmdsize)
> SKIP(return, "Unable to read PMD size\n");
>
> @@ -241,7 +241,7 @@ FIXTURE_SETUP(prctl_thp_disable_except_madvise)
> if (!thp_available())
> SKIP(return, "Transparent Hugepages not available\n");
>
> - self->pmdsize = read_pmd_pagesize();
> + self->pmdsize = pmd_psize();
> if (!self->pmdsize)
> SKIP(return, "Unable to read PMD size\n");
>
> diff --git a/tools/testing/selftests/mm/process_madv.c b/tools/testing/selftests/mm/process_madv.c
> index 3fffd5f7e6fb..7e32bad8ab2a 100644
> --- a/tools/testing/selftests/mm/process_madv.c
> +++ b/tools/testing/selftests/mm/process_madv.c
> @@ -141,7 +141,7 @@ TEST_F(process_madvise, remote_collapse)
> void *map_addr;
> } info;
>
> - huge_page_size = read_pmd_pagesize();
> + huge_page_size = pmd_psize();
> if (huge_page_size <= 0)
> SKIP(return, "Could not determine a valid huge page size.\n");
>
> diff --git a/tools/testing/selftests/mm/soft-dirty.c b/tools/testing/selftests/mm/soft-dirty.c
> index 5f278913c4d7..670fcad083b5 100644
> --- a/tools/testing/selftests/mm/soft-dirty.c
> +++ b/tools/testing/selftests/mm/soft-dirty.c
> @@ -88,7 +88,7 @@ static void test_hugepage(int pagemap_fd, int pagesize)
> return;
> }
>
> - size_t hpage_len = read_pmd_pagesize();
> + size_t hpage_len = pmd_psize();
> if (!hpage_len)
> ksft_exit_fail_msg("Reading PMD pagesize failed");
>
> diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
> index c01d227d7fd6..295a6769d670 100644
> --- a/tools/testing/selftests/mm/split_huge_page_test.c
> +++ b/tools/testing/selftests/mm/split_huge_page_test.c
> @@ -658,7 +658,7 @@ int main(int argc, char **argv)
>
> pagesize = getpagesize();
> pageshift = ffs(pagesize) - 1;
> - pmd_pagesize = read_pmd_pagesize();
> + pmd_pagesize = pmd_psize();
> if (!pmd_pagesize)
> ksft_exit_fail_msg("Reading PMD pagesize failed\n");
>
> diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
> index 1fb967ef4985..0b8bbb55c335 100644
> --- a/tools/testing/selftests/mm/uffd-common.c
> +++ b/tools/testing/selftests/mm/uffd-common.c
> @@ -137,7 +137,7 @@ static void shmem_release_pages(uffd_global_test_opts_t *gopts, char *rel_area)
> static int shmem_allocate_area(uffd_global_test_opts_t *gopts, void **alloc_area, bool is_src)
> {
> void *area_alias = NULL;
> - size_t bytes = gopts->nr_pages * gopts->page_size, hpage_size = read_pmd_pagesize();
> + size_t bytes = gopts->nr_pages * gopts->page_size, hpage_size = pmd_psize();
> unsigned long offset = is_src ? 0 : bytes;
> char *p = NULL, *p_alias = NULL;
> int mem_fd = uffd_mem_fd_create(bytes * 2, false);
> @@ -194,10 +194,10 @@ static void shmem_alias_mapping(uffd_global_test_opts_t *gopts, __u64 *start,
>
> static void shmem_check_pmd_mapping(uffd_global_test_opts_t *gopts, void *p, int expect_nr_hpages)
> {
> - size_t len = expect_nr_hpages * read_pmd_pagesize();
> + size_t len = expect_nr_hpages * pmd_psize();
>
> if (!check_huge_shmem(gopts->area_dst_alias, len, expect_nr_hpages,
> - read_pmd_pagesize()))
> + pmd_psize()))
> err("Did not find expected %d number of hugepages",
> expect_nr_hpages);
> }
> diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
> index 6f2360f9b75d..dcb1755c35fb 100644
> --- a/tools/testing/selftests/mm/uffd-unit-tests.c
> +++ b/tools/testing/selftests/mm/uffd-unit-tests.c
> @@ -646,7 +646,7 @@ static void uffd_minor_test_common(uffd_global_test_opts_t *gopts, bool test_col
> uffd_test_ops->check_pmd_mapping(gopts,
> gopts->area_dst,
> gopts->nr_pages * gopts->page_size /
> - read_pmd_pagesize());
> + pmd_psize());
> /*
> * This won't cause uffd-fault - it purely just makes sure there
> * was no corruption.
> @@ -1975,7 +1975,7 @@ static void uffd_move_handle_fault(uffd_global_test_opts_t *gopts, struct uffd_m
> static void uffd_move_pmd_handle_fault(uffd_global_test_opts_t *gopts, struct uffd_msg *msg,
> struct uffd_args *args)
> {
> - uffd_move_handle_fault_common(gopts, msg, args, read_pmd_pagesize());
> + uffd_move_handle_fault_common(gopts, msg, args, pmd_psize());
> }
>
> static void
> @@ -2086,7 +2086,7 @@ static void uffd_move_pmd_test(uffd_global_test_opts_t *gopts, uffd_test_args_t
> {
> if (madvise(gopts->area_dst, gopts->nr_pages * gopts->page_size, MADV_HUGEPAGE))
> err("madvise(MADV_HUGEPAGE) failure");
> - uffd_move_test_common(gopts, targs, read_pmd_pagesize(),
> + uffd_move_test_common(gopts, targs, pmd_psize(),
> uffd_move_pmd_handle_fault);
> }
>
> @@ -2094,7 +2094,7 @@ static void uffd_move_pmd_split_test(uffd_global_test_opts_t *gopts, uffd_test_a
> {
> if (madvise(gopts->area_dst, gopts->nr_pages * gopts->page_size, MADV_NOHUGEPAGE))
> err("madvise(MADV_NOHUGEPAGE) failure");
> - uffd_move_test_common(gopts, targs, read_pmd_pagesize(),
> + uffd_move_test_common(gopts, targs, pmd_psize(),
> uffd_move_pmd_handle_fault);
> }
>
> diff --git a/tools/testing/selftests/mm/uffd-wp-mremap.c b/tools/testing/selftests/mm/uffd-wp-mremap.c
> index 572c2516e874..f46edd3ee6d8 100644
> --- a/tools/testing/selftests/mm/uffd-wp-mremap.c
> +++ b/tools/testing/selftests/mm/uffd-wp-mremap.c
> @@ -38,7 +38,7 @@ static int detect_thp_sizes(size_t sizes[], int max)
> int i;
>
> /* thp not supported at all. */
> - if (!read_pmd_pagesize())
> + if (!pmd_psize())
> return 0;
>
> orders = thp_supported_orders();
> diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c
> index 4821a3563036..e712a980851c 100644
> --- a/tools/testing/selftests/mm/vm_util.c
> +++ b/tools/testing/selftests/mm/vm_util.c
> @@ -155,7 +155,7 @@ bool check_for_pattern(FILE *fp, const char *pattern, char *buf, size_t len)
> return false;
> }
>
> -uint64_t read_pmd_pagesize(void)
> +uint64_t pmd_psize(void)
> {
> int fd;
> char buf[20];
> @@ -412,7 +412,7 @@ static bool check_large_folios(void *addr, size_t len, int nr_hpages,
>
> bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage_size)
> {
> - uint64_t pmd_pagesize = read_pmd_pagesize();
> + uint64_t pmd_pagesize = pmd_psize();
>
> if (!pmd_pagesize)
> ksft_exit_fail_msg("reading PMD pagesize failed\n");
> @@ -425,7 +425,7 @@ bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage_size)
>
> bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage_size)
> {
> - uint64_t pmd_pagesize = read_pmd_pagesize();
> + uint64_t pmd_pagesize = pmd_psize();
>
> if (!pmd_pagesize)
> ksft_exit_fail_msg("reading PMD pagesize failed\n");
> @@ -438,7 +438,7 @@ bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage_size)
>
> bool check_huge_shmem(void *addr, size_t len, int nr_hpages, uint64_t hpage_size)
> {
> - uint64_t pmd_pagesize = read_pmd_pagesize();
> + uint64_t pmd_pagesize = pmd_psize();
>
> if (!pmd_pagesize)
> ksft_exit_fail_msg("reading PMD pagesize failed\n");
> diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h
> index 9a49af88702e..a40e40c820ef 100644
> --- a/tools/testing/selftests/mm/vm_util.h
> +++ b/tools/testing/selftests/mm/vm_util.h
> @@ -88,7 +88,7 @@ bool pagemap_is_populated(int fd, char *start);
> unsigned long pagemap_get_pfn(int fd, char *start);
> void clear_softdirty(void);
> bool check_for_pattern(FILE *fp, const char *pattern, char *buf, size_t len);
> -uint64_t read_pmd_pagesize(void);
> +uint64_t pmd_psize(void);
> unsigned long rss_anon(void);
> bool check_huge_anon(void *addr, size_t len, int nr_hpages, uint64_t hpage_size);
> bool check_huge_file(void *addr, size_t len, int nr_hpages, uint64_t hpage_size);
>
> --
> 2.43.0
>
--
Cheers, Lorenzo