[PATCH 10/12] mm: set the uffd-wp bit on a guard marker when write-protecting

From: Tal Zussman

Date: Wed Nov 11 2026 - 13:01:39 EST


UFFDIO_WRITEPROTECT and PAGEMAP_SCAN with PM_SCAN_WP_MATCHING do not
write-protect an entry that holds a guard marker. change_softleaf_pte()
ignores guard markers, and make_uffd_wp_pte() only sets the swap uffd
bit on the marker PTE, which guard removal clears along with the marker.

On a file-backed VMA, the page is still in the page cache once the guard
is removed. It faults back in writable, and writes to it are not
reported.

To fix it, set the uffd-wp bit on a guard marker of a file-backed VMA in
both paths. A guard marker can carry that bit, and guard removal then
keeps the write protection by leaving a uffd-wp marker in its place.

Move is_guard_pte_marker() to leafops.h as pte_is_guard_marker(), next
to pte_is_uffd_wp_marker(), so that make_uffd_wp_pte() can use it.

A page that is write-protected while a guard is in place is now still
write-protected after the guard is removed.

Anonymous memory is left as it is. With UFFD_FEATURE_WP_UNPOPULATED, an
entry that is write-protected while a guard is in place is still
unprotected after the guard is removed.

Fixes: f807123d578d ("mm: allow guard regions in file-backed and read-only mappings")
Signed-off-by: Tal Zussman <tz2294@xxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 7 +++++++
include/linux/leafops.h | 14 ++++++++++++++
mm/madvise.c | 11 ++---------
mm/mprotect.c | 5 ++++-
4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 752f1b13d47a..7b1c843a4fd0 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -2439,6 +2439,13 @@ static void make_uffd_wp_pte(struct vm_area_struct *vma,
} else if (pte_none(ptent)) {
set_pte_at(vma->vm_mm, addr, pte,
make_pte_marker(PTE_MARKER_UFFD_WP));
+ } else if (!vma_is_anonymous(vma) && pte_is_guard_marker(ptent)) {
+ /* Keep the protection in the marker, as mprotect does. */
+ const softleaf_t entry = softleaf_from_pte(ptent);
+
+ set_pte_at(vma->vm_mm, addr, pte,
+ make_pte_marker(softleaf_to_marker(entry) |
+ PTE_MARKER_UFFD_WP));
} else {
ptent = set_uffd_wp_swp_pte(ptent);
set_pte_at(vma->vm_mm, addr, pte, ptent);
diff --git a/include/linux/leafops.h b/include/linux/leafops.h
index add4968ded44..831b85a184c4 100644
--- a/include/linux/leafops.h
+++ b/include/linux/leafops.h
@@ -547,6 +547,20 @@ static inline bool pte_is_marker(pte_t pte)
return softleaf_is_marker(softleaf_from_pte(pte));
}

+/**
+ * pte_is_guard_marker() - Does this PTE entry encode a guard region marker
+ * leaf entry?
+ * @pte: PTE entry.
+ *
+ * Returns: true if this PTE is a guard marker leaf entry, otherwise false.
+ */
+static inline bool pte_is_guard_marker(pte_t pte)
+{
+ const softleaf_t entry = softleaf_from_pte(pte);
+
+ return softleaf_is_guard_marker(entry);
+}
+
/**
* pte_is_uffd_wp_marker() - Does this PTE entry encode a userfaultfd write
* protect marker leaf entry?
diff --git a/mm/madvise.c b/mm/madvise.c
index e2c6b0f26672..e8b05dc899f1 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -1085,13 +1085,6 @@ static bool is_valid_guard_vma(const struct vm_area_struct *vma,
return true;
}

-static bool is_guard_pte_marker(pte_t ptent)
-{
- const softleaf_t entry = softleaf_from_pte(ptent);
-
- return softleaf_is_guard_marker(entry);
-}
-
static int guard_install_pud_entry(pud_t *pud, unsigned long addr,
unsigned long next, struct mm_walk *walk)
{
@@ -1117,7 +1110,7 @@ static int guard_install_pte_entry(pte_t *pte, unsigned long addr,
unsigned long *nr_pages = (unsigned long *)walk->private;

/* If there is already a guard page marker, we have nothing to do. */
- if (is_guard_pte_marker(pteval)) {
+ if (pte_is_guard_marker(pteval)) {
(*nr_pages)++;

return 0;
@@ -1275,7 +1268,7 @@ static int guard_remove_pte_entry(pte_t *pte, unsigned long addr,
{
pte_t ptent = ptep_get(pte);

- if (is_guard_pte_marker(ptent)) {
+ if (pte_is_guard_marker(ptent)) {
const softleaf_t entry = softleaf_from_pte(ptent);
const pte_marker marker = softleaf_to_marker(entry) &
~PTE_MARKER_GUARD;
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 6cc5b99b4185..3f2d6e3aca93 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -261,7 +261,10 @@ static long change_softleaf_pte(struct vm_area_struct *vma,
const pte_marker old = softleaf_to_marker(entry);
pte_marker marker = old;

- if (uffd_prot_resolve)
+ if ((cp_flags & MM_CP_UFFD_WP) &&
+ !vma_is_anonymous(vma))
+ marker |= PTE_MARKER_UFFD_WP;
+ else if (uffd_prot_resolve)
marker &= ~PTE_MARKER_UFFD_WP;

if (marker == old)

--
2.39.5