[PATCH v3 4/9] mm/migrate: warn on a writable migration entry with the uffd bit set

From: Tal Zussman

Date: Tue Nov 17 2026 - 23:29:51 EST


A writable migration entry must not have the uffd bit set. Every path
that sets the bit on a migration entry makes the entry read-only first.
PAGEMAP_SCAN was the one path that did not, and it now does as well.

remove_migration_pte() restores such an entry writable and drops the
uffd bit, while remove_migration_pmd() sets the bit and write-protects
the PMD.

Warn in both paths on a writable entry with the uffd bit set. Also make
the PMD path only set the uffd bit for a read-only entry, like the PTE
path, so that the two behave the same, as this should never happen.

Signed-off-by: Tal Zussman <tz2294@xxxxxxxxxxxx>
---
mm/huge_memory.c | 7 +++++--
mm/migrate.c | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 0d589be136d2..4a4e187ae3b1 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -5225,10 +5225,13 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct folio *folio

if (pmd_swp_soft_dirty(*pvmw->pmd))
pmde = pmd_mksoft_dirty(pmde);
- if (softleaf_is_migration_write(entry))
+ if (softleaf_is_migration_write(entry)) {
+ /* Setting the uffd bit must make the entry read-only. */
+ VM_WARN_ON_ONCE(pmd_swp_uffd(*pvmw->pmd));
pmde = pmd_mkwrite(pmde, vma);
- if (pmd_swp_uffd(*pvmw->pmd))
+ } else if (pmd_swp_uffd(*pvmw->pmd)) {
pmde = pmd_mkuffd(pmde);
+ }

/* See do_swap_page(): restore PAGE_NONE for RWP */
if (pmd_swp_uffd(*pvmw->pmd) && userfaultfd_rwp(vma))
diff --git a/mm/migrate.c b/mm/migrate.c
index 28a8d7734735..c5b0f57343ab 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -397,10 +397,13 @@ static bool remove_migration_pte(struct folio *folio,
else
pte = pte_clear_soft_dirty(pte);

- if (softleaf_is_migration_write(entry))
+ if (softleaf_is_migration_write(entry)) {
+ /* Setting the uffd bit must make the entry read-only. */
+ VM_WARN_ON_ONCE(pte_swp_uffd(old_pte));
pte = pte_mkwrite(pte, vma);
- else if (pte_swp_uffd(old_pte))
+ } else if (pte_swp_uffd(old_pte)) {
pte = pte_mkuffd(pte);
+ }

/* See do_swap_page(): restore PAGE_NONE for RWP */
if (pte_swp_uffd(old_pte) && userfaultfd_rwp(vma))

--
2.39.5