[PATCH v3 0/9] userfaultfd: assorted fixes (part 1)
From: Tal Zussman
Date: Tue Nov 17 2026 - 23:30:30 EST
This is a first batch of userfaultfd fixes, with more to come.
These were found by a mix of regular old LLM review and by having an LLM
write a TLA+ model of uffd interactions with PTE bits and other state
and seeing what issues fell out.
Most of these fix places where mm code loses uffd-wp or RWP protection
while moving or migrating an entry. Userspace then either misses writes
and accesses, or gets pages reported that nobody touched.
There is also a hang in UFFDIO_MOVE, and UFFDIO_ZEROPAGE modifying a
file through a private mapping.
Patches 1-2: UFFDIO_ZEROPAGE and UFFDIO_MOVE fixes, cc stable
Patch 3: PAGEMAP_SCAN write-protect vs. writable migration
entries, cc stable
Patch 4: warn on a writable migration entry with the uffd bit set
Patch 5: PAGEMAP_SCAN write-protect vs. device-private THPs
Patch 6: UFFDIO_MOVE of the huge zero page from an RWP source
Patch 7: mremap() losing uffd state when a move fails halfway
Patch 8: migrate_vma losing uffd state of a zero page
Patch 9: hugetlb alignment checks in UFFDIO_REGISTER and
UFFDIO_UNREGISTER
A few of the fixes change what userspace sees:
- UFFDIO_ZEROPAGE on a private file mapping no longer fails with
-EEXIST where the file already has a page, on an mm that cannot use
the zero page (patch 1)
- UFFDIO_MOVE returns -EEXIST for any huge destination PMD, not only
for a present THP (patch 2)
- UFFDIO_UNREGISTER with a misaligned hugetlb end fails before
unregistering anything, also if that hugetlb VMA is not registered
(patch 9)
- UFFDIO_REGISTER and UFFDIO_UNREGISTER accept a misaligned start that
lies in a gap before the first hugetlb VMA of the range (patch 9)
- UFFDIO_REGISTER returns -EINVAL rather than -EPERM for a misaligned
end in a hugetlb VMA without VM_MAYWRITE (patch 9)
Patch 6 has little user impact on its own. It is included because,
together with patch 7, it allows removing clear_uffd_wp_pmd().
Patch 7 adds spurious write faults on shmem and hugetlb after mremap():
when dropping uffd protection there, change_protection() makes writable
pages that were never protected read-only. UFFDIO_UNREGISTER and
UFFDIO_WRITEPROTECT already behave this way and lead to the same
spurious faults. This will be fixed in change_protection() in a separate
series.
Based on mm-new.
---
Changes in v3:
- Collect tags (Thanks David!)
- Patch 1: use vma_is_cow_mapping(), per David
- Patch 4: warn on a writable migration entry with the uffd bit set, and
make the PMD path match the PTE path, per David.
- Patch 4: Drop the Fixes: tag and the review tags due to changes
- Patch 8: add helpers and read the PMD once with pmdp_get(), per
David
- Patch 9: move the hugetlb alignment checks into a helper and use it in
both ioctls, per David
- Link to v2: https://patch.msgid.link/20261116-uffd-state-fixes-v2-0-4397a0196479@xxxxxxxxxxxx
Changes in v2:
- Collect tags (Thanks Kiryl, Lorenzo, Gregory, Alistair!)
- Patch 2: say "softleaf entry" in the commit message, per Lorenzo
- Patch 3: add softleaf_is_writable() and softleaf_mkreadable() to
leafops.h and rename the helpers to say softleaf, per Lorenzo
- Patch 3: add Reported-by and Closes for Breno's report, and cc stable
- Patch 4: explain in the commit message how PAGEMAP_SCAN set the uffd
bit on writable migration entries, per Lorenzo
- Patch 5: use pmd_is_valid_softleaf() rather than open-coding it, per
Lorenzo
- Patch 7: say "write faults" rather than "minor faults" in the commit
message, per Kiryl
- Patch 7: trim the commit message, per Lorenzo and Gregory
- Patch 8: trim the commit message, per Gregory
- Patch 8: Cc the GPU driver maintainers and lists, per Gregory and
Alistair
- Patch 9: use IS_ALIGNED() and a local variable for the VMA's ctx, and
shorten the comment, per Lorenzo
- Drop the three guard region patches, per Lorenzo
- Link to v1: https://patch.msgid.link/20261111-uffd-state-fixes-v1-0-00713d368976@xxxxxxxxxxxx
---
Tal Zussman (9):
userfaultfd: use anonymous memory for UFFDIO_ZEROPAGE on private file mappings
userfaultfd: refuse UFFDIO_MOVE into a non-present huge destination PMD
fs/proc/task_mmu: downgrade writable migration entries in PAGEMAP_SCAN write-protect
mm/migrate: warn on a writable migration entry with the uffd bit set
fs/proc/task_mmu: write-protect device-private THPs in PAGEMAP_SCAN
mm/huge_memory: build the moved huge zero PMD from the destination VMA
mm/mremap: resolve uffd state when the context is dropped, not during the move
mm/migrate_device: do not migrate a uffd-protected zero page
mm/userfaultfd: check the hugetlb alignment of every VMA in the pre-scan
fs/proc/task_mmu.c | 42 ++++++++++++++--
include/linux/leafops.h | 51 +++++++++++++++++++
include/linux/userfaultfd_k.h | 24 +++++++++
mm/huge_memory.c | 38 +++-----------
mm/hugetlb.c | 27 +---------
mm/migrate.c | 7 ++-
mm/migrate_device.c | 34 ++++++++++---
mm/mremap.c | 46 +----------------
mm/userfaultfd.c | 112 ++++++++++++++++--------------------------
9 files changed, 195 insertions(+), 186 deletions(-)
---
base-commit: 25fee5b1762b8799dd8b72c2f6d666eb01680cc7
change-id: 20261106-uffd-state-fixes-d2111e2abd48
Best regards,
--
Tal Zussman <tz2294@xxxxxxxxxxxx>