From: Zi Yan <zi.yan@sent.com> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, minchan@kernel.org, vbabka@suse.cz, mgorman@techsingularity.net, mhocko@kernel.org, n-horiguchi@ah.jp.nec.com, khandual@linux.vnet.ibm.com, zi.yan@cs.rutgers.edu, dnellans@nvidia.com Subject: [PATCH v4 11/11] mm: memory_hotplug: memory hotremove supports thp migration Date: Mon, 13 Mar 2017 11:45:07 -0400 [thread overview] Message-ID: <20170313154507.3647-12-zi.yan@sent.com> (raw) In-Reply-To: <20170313154507.3647-1-zi.yan@sent.com> From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> This patch enables thp migration for memory hotremove. Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> --- ChangeLog v1->v2: - base code switched from alloc_migrate_target to new_node_page() --- include/linux/huge_mm.h | 8 ++++++++ mm/memory_hotplug.c | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 6f44a2352597..92c2161704c3 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -189,6 +189,13 @@ static inline int hpage_nr_pages(struct page *page) return 1; } +static inline int hpage_order(struct page *page) +{ + if (unlikely(PageTransHuge(page))) + return HPAGE_PMD_ORDER; + return 0; +} + struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd, int flags); struct page *follow_devmap_pud(struct vm_area_struct *vma, unsigned long addr, @@ -233,6 +240,7 @@ static inline bool thp_migration_supported(void) #define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; }) #define hpage_nr_pages(x) 1 +#define hpage_order(x) 0 #define transparent_hugepage_enabled(__vma) 0 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6fb6bd2df787..2b014017a217 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1566,6 +1566,7 @@ static struct page *new_node_page(struct page *page, unsigned long private, int nid = page_to_nid(page); nodemask_t nmask = node_states[N_MEMORY]; struct page *new_page = NULL; + unsigned int order = 0; /* * TODO: allocate a destination hugepage from a nearest neighbor node, @@ -1576,6 +1577,11 @@ static struct page *new_node_page(struct page *page, unsigned long private, return alloc_huge_page_node(page_hstate(compound_head(page)), next_node_in(nid, nmask)); + if (thp_migration_supported() && PageTransHuge(page)) { + order = hpage_order(page); + gfp_mask |= GFP_TRANSHUGE; + } + node_clear(nid, nmask); if (PageHighMem(page) @@ -1583,12 +1589,15 @@ static struct page *new_node_page(struct page *page, unsigned long private, gfp_mask |= __GFP_HIGHMEM; if (!nodes_empty(nmask)) - new_page = __alloc_pages_nodemask(gfp_mask, 0, + new_page = __alloc_pages_nodemask(gfp_mask, order, node_zonelist(nid, gfp_mask), &nmask); if (!new_page) - new_page = __alloc_pages(gfp_mask, 0, + new_page = __alloc_pages(gfp_mask, order, node_zonelist(nid, gfp_mask)); + if (new_page && order == hpage_order(page)) + prep_transhuge_page(new_page); + return new_page; } @@ -1618,7 +1627,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
WARNING: multiple messages have this Message-ID (diff)
From: Zi Yan <zi.yan@sent.com> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, minchan@kernel.org, vbabka@suse.cz, mgorman@techsingularity.net, mhocko@kernel.org, n-horiguchi@ah.jp.nec.com, khandual@linux.vnet.ibm.com, zi.yan@cs.rutgers.edu, dnellans@nvidia.com Subject: [PATCH v4 11/11] mm: memory_hotplug: memory hotremove supports thp migration Date: Mon, 13 Mar 2017 11:45:07 -0400 [thread overview] Message-ID: <20170313154507.3647-12-zi.yan@sent.com> (raw) In-Reply-To: <20170313154507.3647-1-zi.yan@sent.com> From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> This patch enables thp migration for memory hotremove. Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> --- ChangeLog v1->v2: - base code switched from alloc_migrate_target to new_node_page() --- include/linux/huge_mm.h | 8 ++++++++ mm/memory_hotplug.c | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 6f44a2352597..92c2161704c3 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -189,6 +189,13 @@ static inline int hpage_nr_pages(struct page *page) return 1; } +static inline int hpage_order(struct page *page) +{ + if (unlikely(PageTransHuge(page))) + return HPAGE_PMD_ORDER; + return 0; +} + struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd, int flags); struct page *follow_devmap_pud(struct vm_area_struct *vma, unsigned long addr, @@ -233,6 +240,7 @@ static inline bool thp_migration_supported(void) #define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; }) #define hpage_nr_pages(x) 1 +#define hpage_order(x) 0 #define transparent_hugepage_enabled(__vma) 0 diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6fb6bd2df787..2b014017a217 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1566,6 +1566,7 @@ static struct page *new_node_page(struct page *page, unsigned long private, int nid = page_to_nid(page); nodemask_t nmask = node_states[N_MEMORY]; struct page *new_page = NULL; + unsigned int order = 0; /* * TODO: allocate a destination hugepage from a nearest neighbor node, @@ -1576,6 +1577,11 @@ static struct page *new_node_page(struct page *page, unsigned long private, return alloc_huge_page_node(page_hstate(compound_head(page)), next_node_in(nid, nmask)); + if (thp_migration_supported() && PageTransHuge(page)) { + order = hpage_order(page); + gfp_mask |= GFP_TRANSHUGE; + } + node_clear(nid, nmask); if (PageHighMem(page) @@ -1583,12 +1589,15 @@ static struct page *new_node_page(struct page *page, unsigned long private, gfp_mask |= __GFP_HIGHMEM; if (!nodes_empty(nmask)) - new_page = __alloc_pages_nodemask(gfp_mask, 0, + new_page = __alloc_pages_nodemask(gfp_mask, order, node_zonelist(nid, gfp_mask), &nmask); if (!new_page) - new_page = __alloc_pages(gfp_mask, 0, + new_page = __alloc_pages(gfp_mask, order, node_zonelist(nid, gfp_mask)); + if (new_page && order == hpage_order(page)) + prep_transhuge_page(new_page); + return new_page; } @@ -1618,7 +1627,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 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-03-13 15:49 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-13 15:44 [PATCH v4 00/11] mm: page migration enhancement for thp Zi Yan 2017-03-13 15:44 ` Zi Yan 2017-03-13 15:44 ` [PATCH v4 01/11] mm: x86: move _PAGE_SWP_SOFT_DIRTY from bit 7 to bit 1 Zi Yan 2017-03-13 15:44 ` Zi Yan 2017-03-24 18:23 ` Tim Chen 2017-03-24 18:23 ` Tim Chen 2017-03-24 18:30 ` Zi Yan 2017-03-24 18:30 ` Zi Yan 2017-03-13 15:44 ` [PATCH v4 02/11] mm: mempolicy: add queue_pages_node_check() Zi Yan 2017-03-13 15:44 ` Zi Yan 2017-03-13 15:44 ` [PATCH v4 03/11] mm: thp: introduce separate TTU flag for thp freezing Zi Yan 2017-03-13 15:44 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 04/11] mm: thp: introduce CONFIG_ARCH_ENABLE_THP_MIGRATION Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-24 14:10 ` Kirill A. Shutemov 2017-03-24 14:10 ` Kirill A. Shutemov 2017-03-24 14:21 ` Zi Yan 2017-03-24 14:21 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 05/11] mm: thp: enable thp migration in generic path Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-14 21:19 ` kbuild test robot 2017-03-14 21:55 ` Zi Yan 2017-03-14 21:55 ` Zi Yan 2017-03-15 9:01 ` Geert Uytterhoeven 2017-03-15 9:01 ` Geert Uytterhoeven 2017-03-15 16:00 ` Zi Yan 2017-03-15 16:00 ` Zi Yan 2017-03-14 21:26 ` kbuild test robot 2017-03-24 14:28 ` Kirill A. Shutemov 2017-03-24 14:28 ` Kirill A. Shutemov 2017-03-24 15:30 ` Zi Yan 2017-03-24 15:30 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 06/11] mm: thp: check pmd migration entry in common path Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-24 14:50 ` Kirill A. Shutemov 2017-03-24 14:50 ` Kirill A. Shutemov 2017-03-24 16:09 ` Zi Yan 2017-03-24 16:09 ` Zi Yan 2017-03-24 16:50 ` Kirill A. Shutemov 2017-03-24 16:50 ` Kirill A. Shutemov 2017-03-24 17:09 ` Zi Yan 2017-03-24 17:09 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 07/11] mm: soft-dirty: keep soft-dirty bits over thp migration Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 08/11] mm: hwpoison: soft offline supports " Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 09/11] mm: mempolicy: mbind and migrate_pages support " Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-13 15:45 ` [PATCH v4 10/11] mm: migrate: move_pages() supports " Zi Yan 2017-03-13 15:45 ` Zi Yan 2017-03-13 15:45 ` Zi Yan [this message] 2017-03-13 15:45 ` [PATCH v4 11/11] mm: memory_hotplug: memory hotremove " Zi Yan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170313154507.3647-12-zi.yan@sent.com \ --to=zi.yan@sent.com \ --cc=akpm@linux-foundation.org \ --cc=dnellans@nvidia.com \ --cc=khandual@linux.vnet.ibm.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@techsingularity.net \ --cc=mhocko@kernel.org \ --cc=minchan@kernel.org \ --cc=n-horiguchi@ah.jp.nec.com \ --cc=vbabka@suse.cz \ --cc=zi.yan@cs.rutgers.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.