From: osalvador@techadventures.net
To: akpm@linux-foundation.org
Cc: pasha.tatashin@oracle.com, mhocko@suse.com, vbabka@suse.cz,
iamjoonsoo.kim@lge.com, aaron.lu@intel.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Oscar Salvador <osalvador@suse.de>
Subject: [PATCH 3/3] mm/page_alloc: Split context in free_area_init_node
Date: Wed, 18 Jul 2018 14:47:22 +0200 [thread overview]
Message-ID: <20180718124722.9872-4-osalvador@techadventures.net> (raw)
In-Reply-To: <20180718124722.9872-1-osalvador@techadventures.net>
From: Oscar Salvador <osalvador@suse.de>
If free_area_init_node gets called from memhotplug code,
we do not need to call calculate_node_totalpages(),
as the node has no pages.
The same goes for the deferred initialization, as
memmap_init_zone skips that when the context is MEMMAP_HOTPLUG.
Signed-off-by: Oscar Salvador <osalvador@suse.de>
---
mm/page_alloc.c | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d652a3ad720c..99c342eeb5db 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6388,12 +6388,28 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)
static void __ref alloc_node_mem_map(struct pglist_data *pgdat) { }
#endif /* CONFIG_FLAT_NODE_MEM_MAP */
+#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
+static void pgdat_set_deferred_range(pg_data_t *pgdat)
+{
+ /*
+ * We start only with one section of pages, more pages are added as
+ * needed until the rest of deferred pages are initialized.
+ */
+ pgdat->static_init_pgcnt = min_t(unsigned long, PAGES_PER_SECTION,
+ pgdat->node_spanned_pages);
+ pgdat->first_deferred_pfn = ULONG_MAX;
+}
+#else
+static void pgdat_set_deferred_range(pg_data_t *pgdat) {}
+#endif
+
void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
unsigned long node_start_pfn, unsigned long *zholes_size)
{
pg_data_t *pgdat = NODE_DATA(nid);
unsigned long start_pfn = 0;
unsigned long end_pfn = 0;
+ bool no_hotplug_context = node_online(nid);
/* pg_data_t should be reset to zero when it's allocated */
WARN_ON(pgdat->nr_zones || pgdat->kswapd_classzone_idx);
@@ -6409,20 +6425,17 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
#else
start_pfn = node_start_pfn;
#endif
- calculate_node_totalpages(pgdat, start_pfn, end_pfn,
- zones_size, zholes_size);
- alloc_node_mem_map(pgdat);
-
-#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
- /*
- * We start only with one section of pages, more pages are added as
- * needed until the rest of deferred pages are initialized.
+ /* Memhotplug is the only place where free_area_init_node gets called
+ * with the node being still offline.
*/
- pgdat->static_init_pgcnt = min_t(unsigned long, PAGES_PER_SECTION,
- pgdat->node_spanned_pages);
- pgdat->first_deferred_pfn = ULONG_MAX;
-#endif
+ if (no_hotplug_context) {
+ calculate_node_totalpages(pgdat, start_pfn, end_pfn,
+ zones_size, zholes_size);
+ alloc_node_mem_map(pgdat);
+ pgdat_set_deferred_range(pgdat);
+ }
+
free_area_init_core(pgdat);
}
--
2.13.6
next prev parent reply other threads:[~2018-07-18 12:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 12:47 [PATCH 0/3] Re-structure free_area_init_node / free_area_init_core osalvador
2018-07-18 12:47 ` [PATCH 1/3] mm/page_alloc: Move ifdefery out of free_area_init_core osalvador
2018-07-18 13:37 ` Michal Hocko
2018-07-18 14:11 ` Pavel Tatashin
2018-07-18 15:15 ` Oscar Salvador
2018-07-19 12:19 ` Oscar Salvador
2018-07-19 13:18 ` Pavel Tatashin
2018-07-18 12:47 ` [PATCH 2/3] mm/page_alloc: Refactor free_area_init_core osalvador
2018-07-18 13:36 ` Michal Hocko
2018-07-18 14:12 ` Oscar Salvador
2018-07-18 15:11 ` Oscar Salvador
2018-07-18 12:47 ` osalvador [this message]
2018-07-18 14:34 ` [PATCH 3/3] mm/page_alloc: Split context in free_area_init_node Pavel Tatashin
2018-07-19 7:35 ` Oscar Salvador
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=20180718124722.9872-4-osalvador@techadventures.net \
--to=osalvador@techadventures.net \
--cc=aaron.lu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=iamjoonsoo.kim@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=osalvador@suse.de \
--cc=pasha.tatashin@oracle.com \
--cc=vbabka@suse.cz \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).