Skip to content

Commit 49100c0

Browse files
x-y-zgregkh
authored andcommitted
mm/migrate: fix shmem xarray update during migration
commit 60cf233b585cdf1f3c5e52d1225606b86acd08b0 upstream. A shmem folio can be either in page cache or in swap cache, but not at the same time. Namely, once it is in swap cache, folio->mapping should be NULL, and the folio is no longer in a shmem mapping. In __folio_migrate_mapping(), to determine the number of xarray entries to update, folio_test_swapbacked() is used, but that conflates shmem in page cache case and shmem in swap cache case. It leads to xarray multi-index entry corruption, since it turns a sibling entry to a normal entry during xas_store() (see [1] for a userspace reproduction). Fix it by only using folio_test_swapcache() to determine whether xarray is storing swap cache entries or not to choose the right number of xarray entries to update. [1] https://lore.kernel.org/linux-mm/[email protected]/ Note: In __split_huge_page(), folio_test_anon() && folio_test_swapcache() is used to get swap_cache address space, but that ignores the shmem folio in swap cache case. It could lead to NULL pointer dereferencing when a in-swap-cache shmem folio is split at __xa_store(), since !folio_test_anon() is true and folio->mapping is NULL. But fortunately, its caller split_huge_page_to_list_to_order() bails out early with EBUSY when folio->mapping is NULL. So no need to take care of it here. Link: https://lkml.kernel.org/r/[email protected] Fixes: fc346d0a70a1 ("mm: migrate high-order folios in swap cache correctly") Signed-off-by: Zi Yan <[email protected]> Reported-by: Liu Shixin <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Suggested-by: Hugh Dickins <[email protected]> Reviewed-by: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Baolin Wang <[email protected]> Cc: Barry Song <[email protected]> Cc: Charan Teja Kalla <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Lance Yang <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 4903303 commit 49100c0

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

mm/migrate.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -420,19 +420,17 @@ int folio_migrate_mapping(struct address_space *mapping,
420420
newfolio->index = folio->index;
421421
newfolio->mapping = folio->mapping;
422422
folio_ref_add(newfolio, nr); /* add cache reference */
423-
if (folio_test_swapbacked(folio)) {
423+
if (folio_test_swapbacked(folio))
424424
__folio_set_swapbacked(newfolio);
425-
if (folio_test_swapcache(folio)) {
426-
int i;
425+
if (folio_test_swapcache(folio)) {
426+
int i;
427427

428-
folio_set_swapcache(newfolio);
429-
for (i = 0; i < nr; i++)
430-
set_page_private(folio_page(newfolio, i),
431-
page_private(folio_page(folio, i)));
432-
}
428+
folio_set_swapcache(newfolio);
429+
for (i = 0; i < nr; i++)
430+
set_page_private(folio_page(newfolio, i),
431+
page_private(folio_page(folio, i)));
433432
entries = nr;
434433
} else {
435-
VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio);
436434
entries = 1;
437435
}
438436

0 commit comments

Comments
 (0)