Re: [PATCH] mm/khugepaged: mark a collapsed mTHP dirty
From: David Hildenbrand (Arm)
Date: Tue Nov 17 2026 - 03:13:20 EST
On 11/17/26 08:52, Daniel Wade wrote:
> When khugepaged collapses an anonymous range into a folio below PMD
> size, collapse_huge_page() copies the pages in, but
> map_anon_folio_pte_nopf() marks the PTEs dirty only when the VMA has
> VM_WRITE and nothing marks the folio itself dirty. After
> mprotect(PROT_READ) the folio therefore holds the only copy of the data
> while looking clean, so MADV_FREE in one mapping marks it lazyfree,
> reclaim frees it, and another process that maps it reads zeroes. Mark
> the folio dirty before mapping it.
>
> Found by static analysis with an AI coding assistant and reproduced with
> a test program on an unmodified kernel.
>
> Fixes: e22f2fe72c74 ("mm/khugepaged: generalize collapse_huge_page for mTHP collapse")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Daniel Wade <danjwade95@xxxxxxxxx>
> ---
I have a different patch on my queue here that fixes this as well I think. Please review.
commit b835defd5b9b0fb8cd89997fd4a11c27b28bbef7
Author: David Hildenbrand (Arm) <david@xxxxxxxxxx>
Date: Wed Nov 11 21:09:26 2026 +0100
mm/khugepaged: do not lose soft-dirty in an mTHP collapse
An mTHP collapse can lose soft-dirty PTE bits if pages were written and
the VMA was then made read-only.
Collapse does not preserve the soft-dirty bits of the old PTEs, so the
new entries must be marked soft-dirty. map_anon_folio_pte_nopf() relies
on pte_mkdirty() to do that, but only calls it if the VMA has VM_WRITE.
In map_anon_folio_pte_nopf(), call pte_mkdirty() unconditionally, just
like map_anon_folio_pmd_nopf() already does with pmd_mkdirty().
Consequently, we always mark these PTEs dirty (including soft-dirty) but
only set them writable if the VMA has VM_WRITE.
This essentially reverts Hugh's commit 1ac0cb5d0e22 ("mm: fix anonymous
dirtying") that back then touched do_anonymous_page() to avoid forcing
clean anonymous pages through swap instead of discarding them. This no
longer applies as shrink_folio_list() allocates swap for ordinary
anonymous folios and unconditionally marks them dirty before unmapping,
regardless of PTE dirty state. Keeping their PTEs clean does not make
them discardable.
This now also marks fresh anonymous PTEs dirty and soft-dirty in read-only
VMAs when page faults allocate real pages.
This has low urgency.
Fixes: e22f2fe72c74 ("mm/khugepaged: generalize collapse_huge_page for mTHP collapse")
Reported-by: Chris Mason <mason@xxxxxxxxxx>
Signed-off-by: David Hildenbrand (Arm) <david@xxxxxxxxxx>
diff --git a/mm/memory.c b/mm/memory.c
index 24144892c2803..8b4a62722a0b1 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5518,8 +5518,7 @@ void map_anon_folio_pte_nopf(struct folio *folio, pte_t *pte,
entry = pte_sw_mkyoung(entry);
- if (vma->vm_flags & VM_WRITE)
- entry = pte_mkwrite(pte_mkdirty(entry), vma);
+ entry = maybe_mkwrite(pte_mkdirty(entry), vma);
if (uffd_wp)
entry = pte_mkuffd(entry);
--
Cheers,
David