* [PATCH] mm/khugepaged: mark a collapsed mTHP dirty
@ 2026-11-17 7:52 Daniel Wade
2026-11-17 8:13 ` David Hildenbrand (Arm)
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Wade @ 2026-11-17 7:52 UTC (permalink / raw)
To: David Hildenbrand, Zi Yan, Andrew Morton
Cc: Baolin Wang, Liam R . Howlett, Nico Pache, Ryan Roberts, Dev Jain,
Barry Song, Lance Yang, Usama Arif, Kiryl Shutsemau, linux-mm,
linux-kernel, stable
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@vger.kernel.org
Signed-off-by: Daniel Wade <danjwade95@gmail.com>
---
Claude (claude-mythos-5-2) found the bug and wrote the fix, this
description and the test program, which is available on request.
Tested on b3dfbde62cf1 with KASAN and lockdep: as uid 65534, write
64 KiB, mprotect(PROT_READ), wait for khugepaged, fork, MADV_FREE in
the parent. Unpatched the child reads 65536 wrong bytes; patched it is
intact.
mm/khugepaged.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 4bbe319..8a81cab 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1422,6 +1422,11 @@ static enum scan_result collapse_huge_page(struct mm_struct *mm,
if (pte_ptl != pmd_ptl)
spin_lock_nested(pte_ptl, SINGLE_DEPTH_NESTING);
pmd_populate(mm, pmd, pmd_pgtable(_pmd));
+ /*
+ * The PTEs are clean in a read-only VMA, but the folio holds
+ * copied data: mark it dirty so reclaim cannot drop it.
+ */
+ folio_set_dirty(folio);
map_anon_folio_pte_nopf(folio, pte, vma, start_addr,
/*uffd_wp=*/ false);
if (pte_ptl != pmd_ptl)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mm/khugepaged: mark a collapsed mTHP dirty
2026-11-17 7:52 [PATCH] mm/khugepaged: mark a collapsed mTHP dirty Daniel Wade
@ 2026-11-17 8:13 ` David Hildenbrand (Arm)
0 siblings, 0 replies; 2+ messages in thread
From: David Hildenbrand (Arm) @ 2026-11-17 8:13 UTC (permalink / raw)
To: Daniel Wade, Zi Yan, Andrew Morton
Cc: Baolin Wang, Liam R . Howlett, Nico Pache, Ryan Roberts, Dev Jain,
Barry Song, Lance Yang, Usama Arif, Kiryl Shutsemau, linux-mm,
linux-kernel, stable
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@vger.kernel.org
> Signed-off-by: Daniel Wade <danjwade95@gmail.com>
> ---
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@kernel.org>
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@kernel.org>
Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-17 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17 7:52 [PATCH] mm/khugepaged: mark a collapsed mTHP dirty Daniel Wade
2026-11-17 8:13 ` David Hildenbrand (Arm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox