* [PATCH] mm/khugepaged: mark ptes dirty and soft-dirty on mTHP collapse
@ 2026-11-17 9:28 David Hildenbrand (Arm)
2026-11-17 9:40 ` Lorenzo Stoakes (ARM)
0 siblings, 1 reply; 2+ messages in thread
From: David Hildenbrand (Arm) @ 2026-11-17 9:28 UTC (permalink / raw)
To: Lorenzo Stoakes, Liam R. Howlett, Vlastimil Babka, Mike Rapoport,
Suren Baghdasaryan, Michal Hocko, Andrew Morton, Nico Pache,
Lance Yang
Cc: linux-mm, linux-kernel, stable, Chris Mason, Daniel Wade,
David Hildenbrand (Arm)
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 <mason@kernel.org>
Reported-by: Daniel Wade <danjwade95@gmail.com>
Closes: https://lore.kernel.org/all/20261117075246.61336-1-danjwade95@gmail.com/
Reviewed-by: Daniel Wade <danjwade95@gmail.com>
Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] mm/khugepaged: mark ptes dirty and soft-dirty on mTHP collapse
2026-11-17 9:28 [PATCH] mm/khugepaged: mark ptes dirty and soft-dirty on mTHP collapse David Hildenbrand (Arm)
@ 2026-11-17 9:40 ` Lorenzo Stoakes (ARM)
0 siblings, 0 replies; 2+ messages in thread
From: Lorenzo Stoakes (ARM) @ 2026-11-17 9:40 UTC (permalink / raw)
To: David Hildenbrand (Arm)
Cc: Liam R. Howlett, Vlastimil Babka, Mike Rapoport,
Suren Baghdasaryan, Michal Hocko, Andrew Morton, Nico Pache,
Lance Yang, linux-mm, linux-kernel, stable, Chris Mason,
Daniel Wade
On Tue, Nov 17, 2026 at 10:28:18AM +0100, David Hildenbrand (Arm) wrote:
> 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 <mason@kernel.org>
> Reported-by: Daniel Wade <danjwade95@gmail.com>
> Closes: https://lore.kernel.org/all/20261117075246.61336-1-danjwade95@gmail.com/
> Reviewed-by: Daniel Wade <danjwade95@gmail.com>
> Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
LGTM and:
Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
> ---
> 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
>
--
Cheers, Lorenzo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-17 9:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17 9:28 [PATCH] mm/khugepaged: mark ptes dirty and soft-dirty on mTHP collapse David Hildenbrand (Arm)
2026-11-17 9:40 ` Lorenzo Stoakes (ARM)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®