Skip to content

Commit d858180

Browse files
committed
mm: fix crashes from deferred split racing folio migration
jira LE-3262 cve CVE-2024-42234 Rebuild_History Non-Buildable kernel-5.14.0-570.22.1.el9_6 commit-author Hugh Dickins <[email protected]> commit be9581e Even on 6.10-rc6, I've been seeing elusive "Bad page state"s (often on flags when freeing, yet the flags shown are not bad: PG_locked had been set and cleared??), and VM_BUG_ON_PAGE(page_ref_count(page) == 0)s from deferred_split_scan()'s folio_put(), and a variety of other BUG and WARN symptoms implying double free by deferred split and large folio migration. 6.7 commit 9bcef59 ("mm: memcg: fix split queue list crash when large folio migration") was right to fix the memcg-dependent locking broken in 85ce2c5 ("memcontrol: only transfer the memcg data for migration"), but missed a subtlety of deferred_split_scan(): it moves folios to its own local list to work on them without split_queue_lock, during which time folio->_deferred_list is not empty, but even the "right" lock does nothing to secure the folio and the list it is on. Fortunately, deferred_split_scan() is careful to use folio_try_get(): so folio_migrate_mapping() can avoid the race by folio_undo_large_rmappable() while the old folio's reference count is temporarily frozen to 0 - adding such a freeze in the !mapping case too (originally, folio lock and unmapping and no swap cache left an anon folio unreachable, so no freezing was needed there: but the deferred split queue offers a way to reach it). Link: https://lkml.kernel.org/r/[email protected] Fixes: 9bcef59 ("mm: memcg: fix split queue list crash when large folio migration") Signed-off-by: Hugh Dickins <[email protected]> Reviewed-by: Baolin Wang <[email protected]> Cc: Barry Song <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Nhat Pham <[email protected]> Cc: Yang Shi <[email protected]> Cc: Zi Yan <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> (cherry picked from commit be9581e) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 0c8d63e commit d858180

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

mm/memcontrol.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7695,17 +7695,6 @@ void mem_cgroup_migrate(struct folio *old, struct folio *new)
76957695

76967696
/* Transfer the charge and the css ref */
76977697
commit_charge(new, memcg);
7698-
/*
7699-
* If the old folio is a large folio and is in the split queue, it needs
7700-
* to be removed from the split queue now, in case getting an incorrect
7701-
* split queue in destroy_large_folio() after the memcg of the old folio
7702-
* is cleared.
7703-
*
7704-
* In addition, the old folio is about to be freed after migration, so
7705-
* removing from the split queue a bit earlier seems reasonable.
7706-
*/
7707-
if (folio_test_large(old) && folio_test_large_rmappable(old))
7708-
folio_undo_large_rmappable(old);
77097698
old->memcg_data = 0;
77107699
}
77117700

mm/migrate.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,15 @@ int folio_migrate_mapping(struct address_space *mapping,
412412
if (folio_ref_count(folio) != expected_count)
413413
return -EAGAIN;
414414

415+
/* Take off deferred split queue while frozen and memcg set */
416+
if (folio_test_large(folio) &&
417+
folio_test_large_rmappable(folio)) {
418+
if (!folio_ref_freeze(folio, expected_count))
419+
return -EAGAIN;
420+
folio_undo_large_rmappable(folio);
421+
folio_ref_unfreeze(folio, expected_count);
422+
}
423+
415424
/* No turning back from here */
416425
newfolio->index = folio->index;
417426
newfolio->mapping = folio->mapping;
@@ -430,6 +439,10 @@ int folio_migrate_mapping(struct address_space *mapping,
430439
return -EAGAIN;
431440
}
432441

442+
/* Take off deferred split queue while frozen and memcg set */
443+
if (folio_test_large(folio) && folio_test_large_rmappable(folio))
444+
folio_undo_large_rmappable(folio);
445+
433446
/*
434447
* Now we know that no one else is looking at the folio:
435448
* no turning back from here.

0 commit comments

Comments
 (0)