From: Michal Hocko <mhocko@kernel.org> To: <linux-mm@kvack.org> Cc: Andrew Morton <akpm@linux-foundation.org>, Vlastimil Babka <vbabka@suse.cz>, Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, Xishi Qiu <qiuxishi@huawei.com>, zhong jiang <zhongjiang@huawei.com>, Joonsoo Kim <js1304@gmail.com>, LKML <linux-kernel@vger.kernel.org>, Michal Hocko <mhocko@suse.com> Subject: [PATCH 1/4] mm, memory_hotplug: simplify empty node mask handling in new_node_page Date: Thu, 8 Jun 2017 09:45:50 +0200 [thread overview] Message-ID: <20170608074553.22152-2-mhocko@kernel.org> (raw) In-Reply-To: <20170608074553.22152-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> new_node_page tries to allocate the target page on a different NUMA node than the source page. This makes sense in most cases during the hotplug because we are likely to offline the whole numa node. But there are cases where there are no other nodes to fallback (e.g. when offlining parts of the only existing node) and we have to fallback to allocating from the source node. The current code does that but it can be simplified by checking the nmask and updating it before we even try to allocate rather than special casing it. This patch shouldn't introduce any functional change. Signed-off-by: Michal Hocko <mhocko@suse.com> --- mm/memory_hotplug.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index d61509752112..1ca373bdffbf 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1432,7 +1432,15 @@ static struct page *new_node_page(struct page *page, unsigned long private, gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE; int nid = page_to_nid(page); nodemask_t nmask = node_states[N_MEMORY]; - struct page *new_page = NULL; + + /* + * try to allocate from a different node but reuse this node if there + * are no other online nodes to be used (e.g. we are offlining a part + * of the only existing node) + */ + node_clear(nid, nmask); + if (nodes_empty(nmask)) + node_set(nid, nmask); /* * TODO: allocate a destination hugepage from a nearest neighbor node, @@ -1443,18 +1451,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)); - node_clear(nid, nmask); - if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE)) gfp_mask |= __GFP_HIGHMEM; - if (!nodes_empty(nmask)) - new_page = __alloc_pages_nodemask(gfp_mask, 0, nid, &nmask); - if (!new_page) - new_page = __alloc_pages(gfp_mask, 0, nid); - - return new_page; + return __alloc_pages_nodemask(gfp_mask, 0, nid, &nmask); } #define NR_OFFLINE_AT_ONCE_PAGES (256) -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, Vlastimil Babka <vbabka@suse.cz>, Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, Xishi Qiu <qiuxishi@huawei.com>, zhong jiang <zhongjiang@huawei.com>, Joonsoo Kim <js1304@gmail.com>, LKML <linux-kernel@vger.kernel.org>, Michal Hocko <mhocko@suse.com> Subject: [PATCH 1/4] mm, memory_hotplug: simplify empty node mask handling in new_node_page Date: Thu, 8 Jun 2017 09:45:50 +0200 [thread overview] Message-ID: <20170608074553.22152-2-mhocko@kernel.org> (raw) In-Reply-To: <20170608074553.22152-1-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> new_node_page tries to allocate the target page on a different NUMA node than the source page. This makes sense in most cases during the hotplug because we are likely to offline the whole numa node. But there are cases where there are no other nodes to fallback (e.g. when offlining parts of the only existing node) and we have to fallback to allocating from the source node. The current code does that but it can be simplified by checking the nmask and updating it before we even try to allocate rather than special casing it. This patch shouldn't introduce any functional change. Signed-off-by: Michal Hocko <mhocko@suse.com> --- mm/memory_hotplug.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index d61509752112..1ca373bdffbf 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1432,7 +1432,15 @@ static struct page *new_node_page(struct page *page, unsigned long private, gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE; int nid = page_to_nid(page); nodemask_t nmask = node_states[N_MEMORY]; - struct page *new_page = NULL; + + /* + * try to allocate from a different node but reuse this node if there + * are no other online nodes to be used (e.g. we are offlining a part + * of the only existing node) + */ + node_clear(nid, nmask); + if (nodes_empty(nmask)) + node_set(nid, nmask); /* * TODO: allocate a destination hugepage from a nearest neighbor node, @@ -1443,18 +1451,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)); - node_clear(nid, nmask); - if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE)) gfp_mask |= __GFP_HIGHMEM; - if (!nodes_empty(nmask)) - new_page = __alloc_pages_nodemask(gfp_mask, 0, nid, &nmask); - if (!new_page) - new_page = __alloc_pages(gfp_mask, 0, nid); - - return new_page; + return __alloc_pages_nodemask(gfp_mask, 0, nid, &nmask); } #define NR_OFFLINE_AT_ONCE_PAGES (256) -- 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-06-08 7:46 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-08 7:45 [PATCH 0/4] more sensible hugetlb migration for hotplug/CMA Michal Hocko 2017-06-08 7:45 ` Michal Hocko 2017-06-08 7:45 ` Michal Hocko [this message] 2017-06-08 7:45 ` [PATCH 1/4] mm, memory_hotplug: simplify empty node mask handling in new_node_page Michal Hocko 2017-06-08 8:15 ` Vlastimil Babka 2017-06-08 8:15 ` Vlastimil Babka 2017-06-08 7:45 ` [PATCH 2/4] hugetlb, memory_hotplug: prefer to use reserved pages for migration Michal Hocko 2017-06-08 7:45 ` Michal Hocko 2017-06-08 8:22 ` Vlastimil Babka 2017-06-08 8:22 ` Vlastimil Babka 2017-06-08 7:45 ` [PATCH 3/4] mm: unify new_node_page and alloc_migrate_target Michal Hocko 2017-06-08 7:45 ` Michal Hocko 2017-06-08 8:36 ` Vlastimil Babka 2017-06-08 8:36 ` Vlastimil Babka 2017-06-08 8:40 ` Michal Hocko 2017-06-08 8:40 ` Michal Hocko 2017-06-08 7:45 ` [RFC PATCH 4/4] hugetlb: add support for preferred node to alloc_huge_page_nodemask Michal Hocko 2017-06-08 7:45 ` Michal Hocko 2017-06-08 8:38 ` Vlastimil Babka 2017-06-08 8:38 ` Vlastimil Babka 2017-06-12 9:06 ` Michal Hocko 2017-06-12 9:06 ` Michal Hocko 2017-06-12 11:48 ` Michal Hocko 2017-06-12 11:48 ` Michal Hocko 2017-06-12 11:53 ` Vlastimil Babka 2017-06-12 11:53 ` Vlastimil Babka 2017-06-12 12:20 ` Michal Hocko 2017-06-12 12:20 ` Michal Hocko 2017-06-12 15:21 ` Michal Hocko 2017-06-12 15:21 ` Michal Hocko
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=20170608074553.22152-2-mhocko@kernel.org \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=js1304@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.com \ --cc=n-horiguchi@ah.jp.nec.com \ --cc=qiuxishi@huawei.com \ --cc=vbabka@suse.cz \ --cc=zhongjiang@huawei.com \ /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.