From: Chris Down <chris@chrisdown.name>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
kernel-team@fb.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH v2 3/3] selftests/mm: Add UFFDIO_MOVE huge zeropage PMD regression test
Date: Thu, 26 Feb 2026 22:18:03 +0800 [thread overview]
Message-ID: <aaBWG4fajXXbjpVN@chrisdown.name> (raw)
The existing uffd-unit-tests move-pmd coverage exercises PMD-sized
UFFDIO_MOVE on anonymous THPs, but it does not force the huge zeropage
PMD path in move_pages_huge_pmd().
Add a dedicated anonymous UFFDIO_MOVE PMD test that exercises this
relatively comprehensively.
Signed-off-by: Chris Down <chris@chrisdown.name>
---
tools/testing/selftests/mm/uffd-unit-tests.c | 176 +++++++++++++++++++
1 file changed, 176 insertions(+)
diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
index 6f5e404a446c..372619e3906d 100644
--- a/tools/testing/selftests/mm/uffd-unit-tests.c
+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -203,6 +203,62 @@ static int pagemap_open(void)
return fd;
}
+static long uffd_pagemap_scan_get_categories_raw(int fd, char *start,
+ struct page_region *r)
+{
+ struct pm_scan_arg arg = { 0 };
+
+ arg.start = (uintptr_t)start;
+ arg.end = (uintptr_t)(start + psize());
+ arg.vec = (uintptr_t)r;
+ arg.vec_len = 1;
+ arg.flags = 0;
+ arg.size = sizeof(struct pm_scan_arg);
+ arg.max_pages = 0;
+ arg.category_inverted = 0;
+ arg.category_mask = 0;
+ arg.category_anyof_mask = PAGE_IS_WPALLOWED | PAGE_IS_WRITTEN |
+ PAGE_IS_FILE | PAGE_IS_PRESENT |
+ PAGE_IS_SWAPPED | PAGE_IS_PFNZERO |
+ PAGE_IS_HUGE | PAGE_IS_SOFT_DIRTY;
+ arg.return_mask = arg.category_anyof_mask;
+
+ return ioctl(fd, PAGEMAP_SCAN, &arg);
+}
+
+static bool uffd_pagemap_scan_supported(int fd, char *start)
+{
+ static int supported = -1;
+ int ret;
+
+ if (supported != -1)
+ return supported;
+
+ ret = uffd_pagemap_scan_get_categories_raw(fd, start,
+ (struct page_region *)~0UL);
+ if (ret == 0)
+ err("PAGEMAP_SCAN succeeded unexpectedly");
+
+ supported = errno == EFAULT;
+ return supported;
+}
+
+static bool uffd_pagemap_scan_get_categories(int fd, char *start, uint64_t *categories)
+{
+ struct page_region r = { 0 };
+ long ret;
+
+ if (!uffd_pagemap_scan_supported(fd, start))
+ return false;
+
+ ret = uffd_pagemap_scan_get_categories_raw(fd, start, &r);
+ if (ret < 0)
+ err("PAGEMAP_SCAN failed: %s", strerror(errno));
+
+ *categories = ret ? r.categories : 0;
+ return true;
+}
+
/* This macro let __LINE__ works in err() */
#define pagemap_check_wp(value, wp) do { \
if (!!(value & PM_UFFD_WP) != wp) \
@@ -1227,6 +1283,119 @@ static void uffd_move_pmd_test(uffd_global_test_opts_t *gopts, uffd_test_args_t
uffd_move_pmd_handle_fault);
}
+static void uffd_move_pmd_huge_zeropage_test(uffd_global_test_opts_t *gopts,
+ uffd_test_args_t *targs)
+{
+ unsigned long pmd_size = read_pmd_pagesize();
+ unsigned long pmd_pages;
+ unsigned long bytes = gopts->nr_pages * gopts->page_size;
+ char *orig_area_src = gopts->area_src, *orig_area_dst = gopts->area_dst;
+ char *aligned_src, *aligned_dst;
+ unsigned long src_offs, dst_offs, max_offs;
+ pthread_t uffd_mon;
+ struct uffd_args args = { 0 };
+ char c = '\0';
+ int pagemap_fd;
+ uint64_t categories;
+ unsigned long i;
+
+ if (pmd_size <= gopts->page_size) {
+ uffd_test_skip("huge page size is 0, feature missing?");
+ return;
+ }
+ if (!detect_huge_zeropage()) {
+ uffd_test_skip("transparent huge zeropage disabled");
+ return;
+ }
+
+ pmd_pages = pmd_size / gopts->page_size;
+ if (bytes < pmd_size) {
+ uffd_test_skip("not enough pages for one PMD-sized move");
+ return;
+ }
+
+ aligned_src = ALIGN_UP(orig_area_src, pmd_size);
+ aligned_dst = ALIGN_UP(orig_area_dst, pmd_size);
+ src_offs = (aligned_src - orig_area_src) / gopts->page_size;
+ dst_offs = (aligned_dst - orig_area_dst) / gopts->page_size;
+ max_offs = src_offs > dst_offs ? src_offs : dst_offs;
+ if (max_offs + pmd_pages > gopts->nr_pages) {
+ uffd_test_skip("could not find aligned PMD-sized src/dst window");
+ return;
+ }
+
+ if (madvise(orig_area_dst, bytes, MADV_HUGEPAGE))
+ err("madvise(MADV_HUGEPAGE) failure");
+ if (madvise(orig_area_src, bytes, MADV_DONTFORK))
+ err("madvise(MADV_DONTFORK) failure");
+ if (madvise(aligned_src, pmd_size, MADV_DONTNEED))
+ err("madvise(MADV_DONTNEED) failure");
+
+ /* Materialise a PMD-sized huge zeropage mapping in the source. */
+ force_read_pages(aligned_src, pmd_pages, gopts->page_size);
+
+ pagemap_fd = pagemap_open();
+ if (!uffd_pagemap_scan_get_categories(pagemap_fd, aligned_src, &categories)) {
+ close(pagemap_fd);
+ uffd_test_skip("PAGEMAP_SCAN unsupported");
+ return;
+ }
+ if ((categories & (PAGE_IS_PRESENT | PAGE_IS_PFNZERO | PAGE_IS_HUGE)) !=
+ (PAGE_IS_PRESENT | PAGE_IS_PFNZERO | PAGE_IS_HUGE)) {
+ close(pagemap_fd);
+ uffd_test_skip("could not materialise a huge zeropage PMD mapping");
+ return;
+ }
+ gopts->area_src = aligned_src;
+ gopts->area_dst = aligned_dst;
+
+ if (uffd_register(gopts->uffd, gopts->area_dst, pmd_size, true, false, false))
+ err("register failure");
+
+ args.gopts = gopts;
+ args.handle_fault = uffd_move_pmd_handle_fault;
+ if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args))
+ err("uffd_poll_thread create");
+
+ /*
+ * One fault on dst should trigger a single PMD-sized UFFDIO_MOVE from
+ * the huge zeropage PMD we populated in the source.
+ */
+ force_read_pages(gopts->area_dst, pmd_pages, gopts->page_size);
+
+ if (write(gopts->pipefd[1], &c, sizeof(c)) != sizeof(c))
+ err("pipe write");
+ if (pthread_join(uffd_mon, NULL))
+ err("join() failed");
+
+ if (args.missing_faults != 1 || args.minor_faults != 0) {
+ uffd_test_fail("stats check error");
+ } else if (!uffd_pagemap_scan_get_categories(pagemap_fd, gopts->area_dst,
+ &categories)) {
+ uffd_test_fail("PAGEMAP_SCAN unsupported");
+ } else if ((categories & (PAGE_IS_PRESENT | PAGE_IS_PFNZERO |
+ PAGE_IS_HUGE)) !=
+ (PAGE_IS_PRESENT | PAGE_IS_PFNZERO | PAGE_IS_HUGE)) {
+ uffd_test_fail("moved destination is not a huge zeropage PMD");
+ } else if (!check_huge_anon(gopts->area_dst, 0, pmd_size)) {
+ /* vm_normal_page_pmd() must continue to treat the moved PMD as special. */
+ uffd_test_fail("moved huge zeropage PMD counted as AnonHugePages");
+ } else {
+ for (i = 0; i < pmd_size; i++) {
+ if (gopts->area_dst[i]) {
+ uffd_test_fail("moved huge zeropage PMD data is not zero");
+ goto out_restore;
+ }
+ }
+ uffd_test_pass();
+ }
+
+out_restore:
+ gopts->area_src = orig_area_src;
+ gopts->area_dst = orig_area_dst;
+ close(pagemap_fd);
+}
+
static void uffd_move_pmd_split_test(uffd_global_test_opts_t *gopts, uffd_test_args_t *targs)
{
if (madvise(gopts->area_dst, gopts->nr_pages * gopts->page_size, MADV_NOHUGEPAGE))
@@ -1550,6 +1719,13 @@ uffd_test_case_t uffd_tests[] = {
.uffd_feature_required = UFFD_FEATURE_MOVE,
.test_case_ops = &uffd_move_test_pmd_case_ops,
},
+ {
+ .name = "move-pmd-huge-zeropage",
+ .uffd_fn = uffd_move_pmd_huge_zeropage_test,
+ .mem_targets = MEM_ANON,
+ .uffd_feature_required = UFFD_FEATURE_MOVE,
+ .test_case_ops = &uffd_move_test_pmd_case_ops,
+ },
{
.name = "move-pmd-split",
.uffd_fn = uffd_move_pmd_split_test,
--
2.51.2
next reply other threads:[~2026-02-26 14:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-26 14:18 Chris Down [this message]
2026-02-26 16:29 ` David Hildenbrand (Arm)
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=aaBWG4fajXXbjpVN@chrisdown.name \
--to=chris@chrisdown.name \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=stable@vger.kernel.org \
--cc=willy@infradead.org \
/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