From: Yeoreum Yun <yeoreum.yun@arm.com>
To: Lorenzo Stoakes <ljs@kernel.org>,
"Liam R. Howlett" <liam@infradead.org>,
Vlastimil Babka <vbabka@kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Suren Baghdasaryan <surenb@google.com>,
Michal Hocko <mhocko@suse.com>, Zi Yan <ziy@nvidia.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Nico Pache <nico.pache@linux.dev>,
Ryan Roberts <ryan.roberts@arm.com>, Dev Jain <dev.jain@arm.com>,
Barry Song <baohua@kernel.org>,
Lance Yang <lance.yang@linux.dev>,
Usama Arif <usama.arif@linux.dev>,
Kiryl Shutsemau <kas@kernel.org>, Peter Xu <peterx@redhat.com>,
linux-mm@kvack.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@kernel.org>,
Shuah Khan <shuah@kernel.org>, Jason Gunthorpe <jgg@ziepe.ca>,
Leon Romanovsky <leon@kernel.org>,
Sarthak Sharma <sarthak.sharma@arm.com>,
Yeoreum Yun <yeoreum.yun@arm.com>
Subject: [PATCH v4 1/3] kselftest: mm: rename read_pmd_pagesize() to pmd_psize()
Date: Mon, 21 Sep 2026 11:36:38 +0100 [thread overview]
Message-ID: <20260921-fix_hpage_macro-v4-1-cdea4fc6ce3f@arm.com> (raw)
In-Reply-To: <20260921-fix_hpage_macro-v4-0-cdea4fc6ce3f@arm.com>
For consistency with psize(), rename read_pmd_pagesize() to
pmd_psize(). There is no functional change.
Suggested-by: David Hildenbrand (Arm) <david@kernel.org>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
---
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 8aa5249d9bef6..e42edeccfd7a2 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 1960635a953eb..a956e5c74c655 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 e2642eca0d02b..ad14372b75d9e 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 f82673f5f6b47..76c1fbcc5260d 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 f19d53c695764..4280d2c87b22a 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 68dd447a54542..49ef643a6e639 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 d9a4fb782ecfe..d0e34dd5850b1 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 82c6e96ea6eb3..d0290c4567bd9 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 3fffd5f7e6fb4..7e32bad8ab2a9 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 5f278913c4d75..670fcad083b58 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 c01d227d7fd6d..295a6769d670b 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 1fb967ef49854..0b8bbb55c3357 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 ef9b3956bdcfd..05477466af1b2 100644
--- a/tools/testing/selftests/mm/uffd-unit-tests.c
+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -588,7 +588,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.
@@ -1914,7 +1914,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
@@ -2025,7 +2025,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);
}
@@ -2033,7 +2033,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 572c2516e874d..f46edd3ee6d81 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 4821a35630363..e712a980851c8 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 9a49af88702e4..a40e40c820ef7 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
next prev parent reply other threads:[~2026-09-21 10:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 10:36 [PATCH v4 0/3] kselftest: mm: remove HPAGE_SIZE and HPAGE_SHIFT macro Yeoreum Yun
2026-09-21 10:36 ` Yeoreum Yun [this message]
2026-09-21 10:36 ` [PATCH v4 2/3] " Yeoreum Yun
2026-09-21 15:31 ` David Hildenbrand (Arm)
2026-09-21 15:46 ` Lorenzo Stoakes (ARM)
2026-09-21 10:36 ` [PATCH v4 3/3] kselftest: mm: introduce size_to_shift() helper Yeoreum Yun
2026-09-21 15:31 ` David Hildenbrand (Arm)
2026-09-21 15:32 ` Zi Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260921-fix_hpage_macro-v4-1-cdea4fc6ce3f@arm.com \
--to=yeoreum.yun@arm.com \
--cc=akpm@linux-foundation.org \
--cc=baohua@kernel.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=david@kernel.org \
--cc=dev.jain@arm.com \
--cc=jgg@ziepe.ca \
--cc=kas@kernel.org \
--cc=lance.yang@linux.dev \
--cc=leon@kernel.org \
--cc=liam@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ljs@kernel.org \
--cc=mhocko@suse.com \
--cc=nico.pache@linux.dev \
--cc=peterx@redhat.com \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=sarthak.sharma@arm.com \
--cc=shuah@kernel.org \
--cc=surenb@google.com \
--cc=usama.arif@linux.dev \
--cc=vbabka@kernel.org \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®