From: Naoya Horiguchi <[email protected]> This patch enables thp migration for move_pages(2).
Signed-off-by: Naoya Horiguchi <[email protected]> --- mm/migrate.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index dfca530..132e8db 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1417,7 +1417,17 @@ static struct page *new_page_node(struct page *p, unsigned long private, if (PageHuge(p)) return alloc_huge_page_node(page_hstate(compound_head(p)), pm->node); - else + else if (thp_migration_supported() && PageTransHuge(p)) { + struct page *thp; + + thp = alloc_pages_node(pm->node, + (GFP_TRANSHUGE | __GFP_THISNODE) & ~__GFP_RECLAIM, + HPAGE_PMD_ORDER); + if (!thp) + return NULL; + prep_transhuge_page(thp); + return thp; + } else return __alloc_pages_node(pm->node, GFP_HIGHUSER_MOVABLE | __GFP_THISNODE, 0); } @@ -1444,6 +1454,7 @@ static int do_move_page_to_node_array(struct mm_struct *mm, for (pp = pm; pp->node != MAX_NUMNODES; pp++) { struct vm_area_struct *vma; struct page *page; + unsigned int follflags; err = -EFAULT; vma = find_vma(mm, pp->addr); @@ -1451,8 +1462,10 @@ static int do_move_page_to_node_array(struct mm_struct *mm, goto set_status; /* FOLL_DUMP to ignore special (like zero) pages */ - page = follow_page(vma, pp->addr, - FOLL_GET | FOLL_SPLIT | FOLL_DUMP); + follflags = FOLL_GET | FOLL_SPLIT | FOLL_DUMP; + if (thp_migration_supported()) + follflags &= ~FOLL_SPLIT; + page = follow_page(vma, pp->addr, follflags); err = PTR_ERR(page); if (IS_ERR(page)) @@ -1480,6 +1493,11 @@ static int do_move_page_to_node_array(struct mm_struct *mm, if (PageHead(page)) isolate_huge_page(page, &pagelist); goto put_and_set; + } else if (PageTransCompound(page)) { + if (PageTail(page)) { + err = pp->node; + goto put_and_set; + } } err = isolate_lru_page(page); -- 2.9.3
