From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752900AbdFTXQ3 (ORCPT ); Tue, 20 Jun 2017 19:16:29 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:52113 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752678AbdFTXP7 (ORCPT ); Tue, 20 Jun 2017 19:15:59 -0400 X-ME-Sender: X-Sasl-enc: qw4UaSVY0627ecVKvC3zwlM4ZdLDZi1PAP4RTNTT6vaW 1498000071 From: Zi Yan To: kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, minchan@kernel.org, vbabka@suse.cz, mgorman@techsingularity.net, mhocko@kernel.org, khandual@linux.vnet.ibm.com, zi.yan@cs.rutgers.edu, dnellans@nvidia.com, dave.hansen@intel.com, n-horiguchi@ah.jp.nec.com Subject: [PATCH v7 10/10] mm: memory_hotplug: memory hotremove supports thp migration Date: Tue, 20 Jun 2017 19:07:15 -0400 Message-Id: <20170620230715.81590-11-zi.yan@sent.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170620230715.81590-1-zi.yan@sent.com> References: <20170620230715.81590-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 memory hotremove. --- ChangeLog v1->v2: - base code switched from alloc_migrate_target to new_node_page() Signed-off-by: Naoya Horiguchi ChangeLog v2->v7: - base code switched from new_node_page() new_page_nodemask() Signed-off-by: Zi Yan --- include/linux/migrate.h | 15 ++++++++++++++- mm/memory_hotplug.c | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index f80c9882403a..f67755ae72c9 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -35,16 +35,29 @@ static inline struct page *new_page_nodemask(struct page *page, int preferred_ni nodemask_t *nodemask) { gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE; + unsigned int order = 0; + struct page *new_page = NULL; if (PageHuge(page)) return alloc_huge_page_nodemask(page_hstate(compound_head(page)), 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)) 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 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 567a1dcafa1a..1975acfc7326 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1483,7 +1483,9 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) if (isolate_huge_page(page, &source)) move_pages -= 1 << compound_order(head); continue; - } + } else if (thp_migration_supported() && PageTransHuge(page)) + pfn = page_to_pfn(compound_head(page)) + + hpage_nr_pages(page) - 1; if (!get_page_unless_zero(page)) continue; -- 2.11.0