Skip to content

Commit 9658d69

Browse files
ioworker0akpm00
authored andcommitted
mm/rmap: fix soft-dirty and uffd-wp bit loss when remapping zero-filled mTHP subpage to shared zeropage
When splitting an mTHP and replacing a zero-filled subpage with the shared zeropage, try_to_map_unused_to_zeropage() currently drops several important PTE bits. For userspace tools like CRIU, which rely on the soft-dirty mechanism for incremental snapshots, losing the soft-dirty bit means modified pages are missed, leading to inconsistent memory state after restore. As pointed out by David, the more critical uffd-wp bit is also dropped. This breaks the userfaultfd write-protection mechanism, causing writes to be silently missed by monitoring applications, which can lead to data corruption. Preserve both the soft-dirty and uffd-wp bits from the old PTE when creating the new zeropage mapping to ensure they are correctly tracked. Link: https://lkml.kernel.org/r/[email protected] Fixes: b1f2020 ("mm: remap unused subpages to shared zeropage when splitting isolated thp") Signed-off-by: Lance Yang <[email protected]> Suggested-by: David Hildenbrand <[email protected]> Suggested-by: Dev Jain <[email protected]> Acked-by: David Hildenbrand <[email protected]> Reviewed-by: Dev Jain <[email protected]> Acked-by: Zi Yan <[email protected]> Reviewed-by: Liam R. Howlett <[email protected]> Reviewed-by: Harry Yoo <[email protected]> Cc: Alistair Popple <[email protected]> Cc: Baolin Wang <[email protected]> Cc: Barry Song <[email protected]> Cc: Byungchul Park <[email protected]> Cc: Gregory Price <[email protected]> Cc: "Huang, Ying" <[email protected]> Cc: Jann Horn <[email protected]> Cc: Joshua Hahn <[email protected]> Cc: Lorenzo Stoakes <[email protected]> Cc: Mariano Pache <[email protected]> Cc: Mathew Brost <[email protected]> Cc: Peter Xu <[email protected]> Cc: Rakie Kim <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: Usama Arif <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Yu Zhao <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1ce6473 commit 9658d69

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

mm/migrate.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,7 @@ bool isolate_folio_to_list(struct folio *folio, struct list_head *list)
296296
}
297297

298298
static bool try_to_map_unused_to_zeropage(struct page_vma_mapped_walk *pvmw,
299-
struct folio *folio,
300-
unsigned long idx)
299+
struct folio *folio, pte_t old_pte, unsigned long idx)
301300
{
302301
struct page *page = folio_page(folio, idx);
303302
pte_t newpte;
@@ -306,7 +305,7 @@ static bool try_to_map_unused_to_zeropage(struct page_vma_mapped_walk *pvmw,
306305
return false;
307306
VM_BUG_ON_PAGE(!PageAnon(page), page);
308307
VM_BUG_ON_PAGE(!PageLocked(page), page);
309-
VM_BUG_ON_PAGE(pte_present(ptep_get(pvmw->pte)), page);
308+
VM_BUG_ON_PAGE(pte_present(old_pte), page);
310309

311310
if (folio_test_mlocked(folio) || (pvmw->vma->vm_flags & VM_LOCKED) ||
312311
mm_forbids_zeropage(pvmw->vma->vm_mm))
@@ -322,6 +321,12 @@ static bool try_to_map_unused_to_zeropage(struct page_vma_mapped_walk *pvmw,
322321

323322
newpte = pte_mkspecial(pfn_pte(my_zero_pfn(pvmw->address),
324323
pvmw->vma->vm_page_prot));
324+
325+
if (pte_swp_soft_dirty(old_pte))
326+
newpte = pte_mksoft_dirty(newpte);
327+
if (pte_swp_uffd_wp(old_pte))
328+
newpte = pte_mkuffd_wp(newpte);
329+
325330
set_pte_at(pvmw->vma->vm_mm, pvmw->address, pvmw->pte, newpte);
326331

327332
dec_mm_counter(pvmw->vma->vm_mm, mm_counter(folio));
@@ -364,13 +369,13 @@ static bool remove_migration_pte(struct folio *folio,
364369
continue;
365370
}
366371
#endif
372+
old_pte = ptep_get(pvmw.pte);
367373
if (rmap_walk_arg->map_unused_to_zeropage &&
368-
try_to_map_unused_to_zeropage(&pvmw, folio, idx))
374+
try_to_map_unused_to_zeropage(&pvmw, folio, old_pte, idx))
369375
continue;
370376

371377
folio_get(folio);
372378
pte = mk_pte(new, READ_ONCE(vma->vm_page_prot));
373-
old_pte = ptep_get(pvmw.pte);
374379

375380
entry = pte_to_swp_entry(old_pte);
376381
if (!is_migration_entry_young(entry))

0 commit comments

Comments
 (0)