An mTHP collapse can lose soft-dirty PTE bits if pages were written and the VMA was then made read-only, and not setting the PTE dirty in VMAs without VM_WRITE can interact with a later MADV_FREE on a COW-shared page such that all processes lose the data even though a single process MADV_FREE'ed it. 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. Further, after CoW-sharing such collapsed folios later, all PTEs will be clean and the folios will be clean. One process doing a MADV_FREE can mark the folios as lazyfree and result in all processes sharing it losing the data once memory reclaim zaps it. 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") Cc: stable@vger.kernel.org Reported-by: Chris Mason Reported-by: Daniel Wade Closes: https://lore.kernel.org/all/20261117075246.61336-1-danjwade95@gmail.com/ Reviewed-by: Daniel Wade Signed-off-by: David Hildenbrand (Arm) --- mm/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index d2f48d78b0d7b..45875d1d3b3df 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5522,8 +5522,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); --- base-commit: 1c2962a57377c9878cbefb747488324d4e678982 change-id: 20261117-khugepaged_mthp_dirty-067f734d38aa -- Cheers, David