mm-rmap-batch-unmap-file-folios-belonging-to-uffd-wp-vmas.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: batch unmap file folios belonging to uffd-wp VMAs
has been removed from the -mm tree. Its filename was
mm-rmap-batch-unmap-file-folios-belonging-to-uffd-wp-vmas.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Dev Jain <[email protected]>
Subject: mm/rmap: batch unmap file folios belonging to uffd-wp VMAs
Date: Mon, 20 Jul 2026 06:55:07 +0000
Commit a67fe41e214f ("mm: rmap: support batched unmapping for file large folios") extended batched unmapping for file folios. That also required making pte_install_uffd_wp_if_needed() support batching, but that was left out for the time being. Correctness was maintained by stopping batching if the VMA the folio belongs to is marked uffd-wp.
Now that cond_install_uffd_wp_ptes() supports batching, call it with the full batch length and allow folio_unmap_pte_batch() to batch file folios belonging to uffd-wp VMAs.
For file folios, if the uffd-wp bit is set, unmapping converts present PTEs into uffd-wp markers. We must ensure that the same PTE range is not reprocessed by the try_to_unmap_one() loop.
The page_vma_mapped_walk API ensures this: check_pte() only returns true if any PFN in [pvmw->pfn, pvmw->pfn + nr_pages) is mapped by the PTE. There is no PFN underlying a uffd-wp marker PTE, so check_pte() returns false and the walk skips ahead until it reaches a present entry again.
---
mm/rmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
mm/rmap.c renamed from mm/rmap.c~mm-rmap-batch-unmap-file-folios-belonging-to-uffd-wp-vmas +2 -4
@@ -1965,9 +1965,6 @@ static inline unsigned int folio_unmap_pif (pte_unused (pte))return 1 ; -if (userfaultfd_protected (vma)) -return 1 ; -/* * If unmap fails, we need to restore the ptes. To avoid accidentally * upgrading write permissions for ptes that were not originally
@@ -2345,7 +2342,8 @@ static bool try_to_unmap_one(struct foli* we may want to replace a none pte with a marker pte if * it's file-backed, so we don't lose the tracking info. */ -cond_install_uffd_wp_ptes (vma, address, pvmw.pte, pteval,1 ); +cond_install_uffd_wp_ptes (vma, address, pvmw.pte, pteval, + nr_pages);/* Update high watermark before we lower rss */ update_hiwater_rss (mm);
_
Patches currently in -mm which might be from [email protected] are