Skip to content

Commit be9581e

Browse files
Hugh Dickinsakpm00
Hugh Dickins
authored andcommitted
mm: fix crashes from deferred split racing folio migration
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]>
1 parent 2fe29fe commit be9581e

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
@@ -7823,17 +7823,6 @@ void mem_cgroup_migrate(struct folio *old, struct folio *new)
78237823

78247824
/* Transfer the charge and the css ref */
78257825
commit_charge(new, memcg);
7826-
/*
7827-
* If the old folio is a large folio and is in the split queue, it needs
7828-
* to be removed from the split queue now, in case getting an incorrect
7829-
* split queue in destroy_large_folio() after the memcg of the old folio
7830-
* is cleared.
7831-
*
7832-
* In addition, the old folio is about to be freed after migration, so
7833-
* removing from the split queue a bit earlier seems reasonable.
7834-
*/
7835-
if (folio_test_large(old) && folio_test_large_rmappable(old))
7836-
folio_undo_large_rmappable(old);
78377826
old->memcg_data = 0;
78387827
}
78397828

mm/migrate.c

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

418+
/* Take off deferred split queue while frozen and memcg set */
419+
if (folio_test_large(folio) &&
420+
folio_test_large_rmappable(folio)) {
421+
if (!folio_ref_freeze(folio, expected_count))
422+
return -EAGAIN;
423+
folio_undo_large_rmappable(folio);
424+
folio_ref_unfreeze(folio, expected_count);
425+
}
426+
418427
/* No turning back from here */
419428
newfolio->index = folio->index;
420429
newfolio->mapping = folio->mapping;
@@ -433,6 +442,10 @@ int folio_migrate_mapping(struct address_space *mapping,
433442
return -EAGAIN;
434443
}
435444

445+
/* Take off deferred split queue while frozen and memcg set */
446+
if (folio_test_large(folio) && folio_test_large_rmappable(folio))
447+
folio_undo_large_rmappable(folio);
448+
436449
/*
437450
* Now we know that no one else is looking at the folio:
438451
* no turning back from here.

0 commit comments

Comments
 (0)