Skip to content

Commit a04cd16

Browse files
x-y-ztorvalds
authored andcommitted
mm: migrate: use thp_order instead of HPAGE_PMD_ORDER for new page allocation.
Fix a VM_BUG_ON_FOLIO(folio_nr_pages(old) != nr_pages) crash. With folios support, it is possible to have other than HPAGE_PMD_ORDER THPs, in the form of folios, in the system. Use thp_order() to correctly determine the source page order during migration. Link: https://lkml.kernel.org/r/20220404165325.1883267-1-zi.yan@sent.com Link: https://lore.kernel.org/linux-mm/20220404132908.GA785673@u2004/ Fixes: d68ecca ("mm/filemap: Allow large folios to be added to the page cache") Reported-by: Naoya Horiguchi <naoya.horiguchi@linux.dev> Signed-off-by: Zi Yan <ziy@nvidia.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Michal Hocko <mhocko@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent d00c50b commit a04cd16

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

mm/mempolicy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ static struct page *new_page(struct page *page, unsigned long start)
12091209
struct page *thp;
12101210

12111211
thp = alloc_hugepage_vma(GFP_TRANSHUGE, vma, address,
1212-
HPAGE_PMD_ORDER);
1212+
thp_order(page));
12131213
if (!thp)
12141214
return NULL;
12151215
prep_transhuge_page(thp);

mm/migrate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,7 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
15471547
*/
15481548
gfp_mask &= ~__GFP_RECLAIM;
15491549
gfp_mask |= GFP_TRANSHUGE;
1550-
order = HPAGE_PMD_ORDER;
1550+
order = thp_order(page);
15511551
}
15521552
zidx = zone_idx(page_zone(page));
15531553
if (is_highmem_idx(zidx) || zidx == ZONE_MOVABLE)

0 commit comments

Comments
 (0)