Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

migrate: correct lock ordering for hugetlb file folios

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 c0d0381ade79. That was
removed by 336bf30eb765 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: 336bf30eb765 ("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>

authored by

Matthew Wilcox (Oracle) and committed by
Andrew Morton
b7880cb1 90f3c123

+6 -6
+6 -6
mm/migrate.c
··· 1458 1458 int page_was_mapped = 0; 1459 1459 struct anon_vma *anon_vma = NULL; 1460 1460 struct address_space *mapping = NULL; 1461 + enum ttu_flags ttu = 0; 1461 1462 1462 1463 if (folio_ref_count(src) == 1) { 1463 1464 /* page was freed from under us. So we are done. */ ··· 1499 1498 goto put_anon; 1500 1499 1501 1500 if (folio_mapped(src)) { 1502 - enum ttu_flags ttu = 0; 1503 - 1504 1501 if (!folio_test_anon(src)) { 1505 1502 /* 1506 1503 * In shared mappings, try_to_unmap could potentially ··· 1515 1516 1516 1517 try_to_migrate(src, ttu); 1517 1518 page_was_mapped = 1; 1518 - 1519 - if (ttu & TTU_RMAP_LOCKED) 1520 - i_mmap_unlock_write(mapping); 1521 1519 } 1522 1520 1523 1521 if (!folio_mapped(src)) 1524 1522 rc = move_to_new_folio(dst, src, mode); 1525 1523 1526 1524 if (page_was_mapped) 1527 - remove_migration_ptes(src, !rc ? dst : src, 0); 1525 + remove_migration_ptes(src, !rc ? dst : src, 1526 + ttu ? RMP_LOCKED : 0); 1527 + 1528 + if (ttu & TTU_RMAP_LOCKED) 1529 + i_mmap_unlock_write(mapping); 1528 1530 1529 1531 unlock_put_anon: 1530 1532 folio_unlock(dst);