Skip to content

Commit e3c54fd

Browse files
author
Rafael Aquini
committed
mm/migrate: fix shmem xarray update during migration
JIRA: https://issues.redhat.com/browse/RHEL-84184 Conflicts: * notable context difference due to RHEL-9 missing support for mTHP and its follow-up commits This patch is a backport of the following upstream commit: commit 60cf233 Author: Zi Yan <ziy@nvidia.com> Date: Wed Mar 5 15:04:03 2025 -0500 mm/migrate: fix shmem xarray update during migration 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/Z8idPCkaJW1IChjT@casper.infradead.org/ 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/20250305200403.2822855-1-ziy@nvidia.com Fixes: fc346d0 ("mm: migrate high-order folios in swap cache correctly") Signed-off-by: Zi Yan <ziy@nvidia.com> Reported-by: Liu Shixin <liushixin2@huawei.com> Closes: https://lore.kernel.org/all/28546fb4-5210-bf75-16d6-43e1f8646080@huawei.com/ Suggested-by: Hugh Dickins <hughd@google.com> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Barry Song <baohua@kernel.org> Cc: Charan Teja Kalla <quic_charante@quicinc.com> Cc: David Hildenbrand <david@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Kefeng Wang <wangkefeng.wang@huawei.com> Cc: Lance Yang <ioworker0@gmail.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Rafael Aquini <raquini@redhat.com>
1 parent 737fb31 commit e3c54fd

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

mm/migrate.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,13 @@ int folio_migrate_mapping(struct address_space *mapping,
437437
newfolio->index = folio->index;
438438
newfolio->mapping = folio->mapping;
439439
folio_ref_add(newfolio, nr); /* add cache reference */
440-
if (folio_test_swapbacked(folio)) {
440+
if (folio_test_swapbacked(folio))
441441
__folio_set_swapbacked(newfolio);
442-
if (folio_test_swapcache(folio)) {
443-
folio_set_swapcache(newfolio);
444-
newfolio->private = folio_get_private(folio);
445-
}
442+
if (folio_test_swapcache(folio)) {
443+
folio_set_swapcache(newfolio);
444+
newfolio->private = folio_get_private(folio);
446445
entries = nr;
447446
} else {
448-
VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio);
449447
entries = 1;
450448
}
451449

0 commit comments

Comments
 (0)