From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941676AbcIZPZS (ORCPT ); Mon, 26 Sep 2016 11:25:18 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:39428 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941615AbcIZPYO (ORCPT ); Mon, 26 Sep 2016 11:24:14 -0400 X-Sasl-enc: uC6IDw1RtjiWfcF5IyTnh9fHrY+31HG3ulZFveg4cl/p 1474903453 From: zi.yan@sent.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: benh@kernel.crashing.org, mgorman@techsingularity.net, kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, dave.hansen@linux.intel.com, n-horiguchi@ah.jp.nec.com Subject: [PATCH v1 10/12] mm: migrate: move_pages() supports thp migration Date: Mon, 26 Sep 2016 11:22:32 -0400 Message-Id: <20160926152234.14809-11-zi.yan@sent.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160926152234.14809-1-zi.yan@sent.com> References: <20160926152234.14809-1-zi.yan@sent.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Naoya Horiguchi This patch enables thp migration for move_pages(2). Signed-off-by: Naoya Horiguchi --- 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