Skip to content

Commit b750708

Browse files
Matthew Wilcox (Oracle)gregkh
authored andcommitted
migrate: correct lock ordering for hugetlb file folios
commit b7880cb upstream. Syzbot has found a deadlock (analyzed by Lance Yang): 1) Task (5749): Holds folio_lock, then tries to acquire i_mmap_rwsem(read lock). 2) Task (5754): Holds i_mmap_rwsem(write lock), then tries to acquire folio_lock. migrate_pages() -> migrate_hugetlbs() -> unmap_and_move_huge_page() <- Takes folio_lock! -> remove_migration_ptes() -> __rmap_walk_file() -> i_mmap_lock_read() <- Waits for i_mmap_rwsem(read lock)! hugetlbfs_fallocate() -> hugetlbfs_punch_hole() <- Takes i_mmap_rwsem(write lock)! -> hugetlbfs_zero_partial_page() -> filemap_lock_hugetlb_folio() -> filemap_lock_folio() -> __filemap_get_folio <- Waits for folio_lock! The migration path is the one taking locks in the wrong order according to the documentation at the top of mm/rmap.c. So expand the scope of the existing i_mmap_lock to cover the calls to remove_migration_ptes() too. This is (mostly) how it used to be after commit c0d0381. That was removed by 336bf30 for both file & anon hugetlb pages when it should only have been removed for anon hugetlb pages. Link: https://lkml.kernel.org/r/20260109041345.3863089-2-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Fixes: 336bf30 ("hugetlbfs: fix anon huge page migration race") Reported-by: syzbot+2d9c96466c978346b55f@syzkaller.appspotmail.com Link: https://lore.kernel.org/all/68e9715a.050a0220.1186a4.000d.GAE@google.com Debugged-by: Lance Yang <lance.yang@linux.dev> Acked-by: David Hildenbrand (Red Hat) <david@kernel.org> Acked-by: Zi Yan <ziy@nvidia.com> Cc: Alistair Popple <apopple@nvidia.com> Cc: Byungchul Park <byungchul@sk.com> Cc: Gregory Price <gourry@gourry.net> Cc: Jann Horn <jannh@google.com> Cc: Joshua Hahn <joshua.hahnjy@gmail.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Matthew Brost <matthew.brost@intel.com> Cc: Rakie Kim <rakie.kim@sk.com> Cc: Rik van Riel <riel@surriel.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Ying Huang <ying.huang@linux.alibaba.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c775ea4 commit b750708

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

mm/migrate.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,
14391439
int page_was_mapped = 0;
14401440
struct anon_vma *anon_vma = NULL;
14411441
struct address_space *mapping = NULL;
1442+
enum ttu_flags ttu = 0;
14421443

14431444
if (folio_ref_count(src) == 1) {
14441445
/* page was freed from under us. So we are done. */
@@ -1479,8 +1480,6 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,
14791480
goto put_anon;
14801481

14811482
if (folio_mapped(src)) {
1482-
enum ttu_flags ttu = 0;
1483-
14841483
if (!folio_test_anon(src)) {
14851484
/*
14861485
* In shared mappings, try_to_unmap could potentially
@@ -1497,17 +1496,18 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,
14971496

14981497
try_to_migrate(src, ttu);
14991498
page_was_mapped = 1;
1500-
1501-
if (ttu & TTU_RMAP_LOCKED)
1502-
i_mmap_unlock_write(mapping);
15031499
}
15041500

15051501
if (!folio_mapped(src))
15061502
rc = move_to_new_folio(dst, src, mode);
15071503

15081504
if (page_was_mapped)
15091505
remove_migration_ptes(src,
1510-
rc == MIGRATEPAGE_SUCCESS ? dst : src, 0);
1506+
rc == MIGRATEPAGE_SUCCESS ? dst : src,
1507+
ttu ? RMP_LOCKED : 0);
1508+
1509+
if (ttu & TTU_RMAP_LOCKED)
1510+
i_mmap_unlock_write(mapping);
15111511

15121512
unlock_put_anon:
15131513
folio_unlock(dst);

0 commit comments

Comments
 (0)