Skip to content

Commit 04fa5d6

Browse files
Mel Gormantorvalds
authored andcommitted
mm: migrate: check page_count of THP before migrating
Hugh Dickins pointed out that migrate_misplaced_transhuge_page() does not check page_count before migrating like base page migration and khugepage. He could not see why this was safe and he is right. The potential impact of the bug is avoided due to the limitations of NUMA balancing. The page_mapcount() check ensures that only a single address space is using this page and as THPs are typically private it should not be possible for another address space to fault it in parallel. If the address space has one associated task then it's difficult to have both a GUP pin and be referencing the page at the same time. If there are multiple tasks then a buggy scenario requires that another thread be accessing the page while the direct IO is in flight. This is dodgy behaviour as there is a possibility of corruption with or without THP migration. It would be While we happen to be safe for the most part it is shoddy to depend on such "safety" so this patch checks the page count similar to anonymous pages. Note that this does not mean that the page_mapcount() check can go away. If we were to remove the page_mapcount() check the the THP would have to be unmapped from all referencing PTEs, replaced with migration PTEs and restored properly afterwards. Signed-off-by: Mel Gorman <mgorman@suse.de> Reported-by: Hugh Dickins <hughd@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Andrea Arcangeli <aarcange@redhat.com> Acked-by: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 0a1af1d commit 04fa5d6

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

mm/migrate.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,9 +1679,21 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
16791679
page_xchg_last_nid(new_page, page_last_nid(page));
16801680

16811681
isolated = numamigrate_isolate_page(pgdat, page);
1682-
if (!isolated) {
1682+
1683+
/*
1684+
* Failing to isolate or a GUP pin prevents migration. The expected
1685+
* page count is 2. 1 for anonymous pages without a mapping and 1
1686+
* for the callers pin. If the page was isolated, the page will
1687+
* need to be put back on the LRU.
1688+
*/
1689+
if (!isolated || page_count(page) != 2) {
16831690
count_vm_events(PGMIGRATE_FAIL, HPAGE_PMD_NR);
16841691
put_page(new_page);
1692+
if (isolated) {
1693+
putback_lru_page(page);
1694+
isolated = 0;
1695+
goto out;
1696+
}
16851697
goto out_keep_locked;
16861698
}
16871699

0 commit comments

Comments
 (0)