|
@@ -35,15 +35,28 @@ static inline struct page *new_page_nodemask(struct page *page,
|
|
int preferred_nid, nodemask_t *nodemask)
|
|
int preferred_nid, nodemask_t *nodemask)
|
|
{
|
|
{
|
|
gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL;
|
|
gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL;
|
|
|
|
+ unsigned int order = 0;
|
|
|
|
+ struct page *new_page = NULL;
|
|
|
|
|
|
if (PageHuge(page))
|
|
if (PageHuge(page))
|
|
return alloc_huge_page_nodemask(page_hstate(compound_head(page)),
|
|
return alloc_huge_page_nodemask(page_hstate(compound_head(page)),
|
|
preferred_nid, nodemask);
|
|
preferred_nid, nodemask);
|
|
|
|
|
|
|
|
+ if (thp_migration_supported() && PageTransHuge(page)) {
|
|
|
|
+ order = HPAGE_PMD_ORDER;
|
|
|
|
+ gfp_mask |= GFP_TRANSHUGE;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE))
|
|
if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE))
|
|
gfp_mask |= __GFP_HIGHMEM;
|
|
gfp_mask |= __GFP_HIGHMEM;
|
|
|
|
|
|
- return __alloc_pages_nodemask(gfp_mask, 0, preferred_nid, nodemask);
|
|
|
|
|
|
+ new_page = __alloc_pages_nodemask(gfp_mask, order,
|
|
|
|
+ preferred_nid, nodemask);
|
|
|
|
+
|
|
|
|
+ if (new_page && PageTransHuge(page))
|
|
|
|
+ prep_transhuge_page(new_page);
|
|
|
|
+
|
|
|
|
+ return new_page;
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_MIGRATION
|
|
#ifdef CONFIG_MIGRATION
|