From: "Alastair D'Silva" <alastair@au1.ibm.com>
To: alastair@d-silva.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@redhat.com>,
Oscar Salvador <osalvador@suse.com>,
Michal Hocko <mhocko@suse.com>,
Pavel Tatashin <pasha.tatashin@soleen.com>,
Wei Yang <richard.weiyang@gmail.com>,
Arun KS <arunks@codeaurora.org>, Qian Cai <cai@lca.pw>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Jiri Kosina <jkosina@suse.cz>, Mukesh Ojha <mojha@codeaurora.org>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Baoquan He <bhe@redhat.com>,
Logan Gunthorpe <logang@deltatee.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] mm/hotplug: export try_online_node
Date: Mon, 17 Jun 2019 14:36:31 +1000 [thread overview]
Message-ID: <20190617043635.13201-6-alastair@au1.ibm.com> (raw)
In-Reply-To: <20190617043635.13201-1-alastair@au1.ibm.com>
From: Alastair D'Silva <alastair@d-silva.org>
If an external driver module supplies physical memory and needs to expose
the memory on a specific NUMA node, it needs to be able to call
try_online_node to allocate the data structures for the node.
The previous assertion that all callers want to online the node, and that
the provided memory address starts at 0 is no longer true, so these
parameters must alse be exposed.
Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
include/linux/memory_hotplug.h | 4 ++--
kernel/cpu.c | 2 +-
mm/memory_hotplug.c | 20 +++++++++++++++-----
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index ae892eef8b82..9272e7955541 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -109,7 +109,7 @@ extern void __online_page_set_limits(struct page *page);
extern void __online_page_increment_counters(struct page *page);
extern void __online_page_free(struct page *page);
-extern int try_online_node(int nid);
+int try_online_node(int nid, u64 start, bool set_node_online);
extern int arch_add_memory(int nid, u64 start, u64 size,
struct mhp_restrictions *restrictions);
@@ -274,7 +274,7 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
{
}
-static inline int try_online_node(int nid)
+static inline int try_online_node(int nid, u64 start, bool set_node_online)
{
return 0;
}
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 077fde6fb953..ffe5f7239a5c 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1167,7 +1167,7 @@ static int do_cpu_up(unsigned int cpu, enum cpuhp_state target)
return -EINVAL;
}
- err = try_online_node(cpu_to_node(cpu));
+ err = try_online_node(cpu_to_node(cpu), 0, true);
if (err)
return err;
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 382b3a0c9333..9c2784f89e60 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1004,7 +1004,7 @@ static void rollback_node_hotadd(int nid)
/**
- * try_online_node - online a node if offlined
+ * __try_online_node - online a node if offlined
* @nid: the node ID
* @start: start addr of the node
* @set_node_online: Whether we want to online the node
@@ -1039,18 +1039,28 @@ static int __try_online_node(int nid, u64 start, bool set_node_online)
return ret;
}
-/*
- * Users of this function always want to online/register the node
+/**
+ * try_online_node - online a node if offlined
+ * @nid: the node ID
+ * @start: start addr of the node
+ * @set_node_online: Whether we want to online the node
+ * called by cpu_up() to online a node without onlined memory.
+ *
+ * Returns:
+ * 1 -> a new node has been allocated
+ * 0 -> the node is already online
+ * -ENOMEM -> the node could not be allocated
*/
-int try_online_node(int nid)
+int try_online_node(int nid, u64 start, bool set_node_online)
{
int ret;
mem_hotplug_begin();
- ret = __try_online_node(nid, 0, true);
+ ret = __try_online_node(nid, start, set_node_online);
mem_hotplug_done();
return ret;
}
+EXPORT_SYMBOL_GPL(try_online_node);
static int check_hotplug_memory_range(u64 start, u64 size)
{
--
2.21.0
next prev parent reply other threads:[~2019-06-17 4:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 4:36 [PATCH 0/5] mm: Cleanup & allow modules to hotplug memory Alastair D'Silva
2019-06-17 4:36 ` [PATCH 1/5] mm: Trigger bug on if a section is not found in __section_nr Alastair D'Silva
2019-06-17 6:46 ` Mike Rapoport
2019-06-17 4:36 ` [PATCH 2/5] mm: don't hide potentially null memmap pointer in sparse_remove_one_section Alastair D'Silva
2019-06-17 6:49 ` Mike Rapoport
2019-06-17 7:26 ` David Hildenbrand
2019-06-17 4:36 ` [PATCH 3/5] mm: Don't manually decrement num_poisoned_pages Alastair D'Silva
2019-06-17 6:52 ` Mike Rapoport
2019-06-17 7:17 ` David Hildenbrand
2019-06-17 4:36 ` [PATCH 4/5] mm/hotplug: Avoid RCU stalls when removing large amounts of memory Alastair D'Silva
2019-06-17 6:53 ` Mike Rapoport
2019-06-17 6:58 ` Alastair D'Silva
2019-06-17 7:47 ` Michal Hocko
2019-06-17 7:57 ` Alastair D'Silva
2019-06-17 8:21 ` Michal Hocko
2019-06-17 15:49 ` Oscar Salvador
2019-06-17 4:36 ` Alastair D'Silva [this message]
2019-06-17 6:59 ` [PATCH 5/5] mm/hotplug: export try_online_node Peter Zijlstra
2019-06-17 7:05 ` Alastair D'Silva
2019-06-17 7:15 ` Christoph Hellwig
2019-06-17 8:00 ` Alastair D'Silva
2019-06-17 13:14 ` 'Christoph Hellwig'
2019-06-17 7:16 ` 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=20190617043635.13201-6-alastair@au1.ibm.com \
--to=alastair@au1.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=alastair@d-silva.org \
--cc=arunks@codeaurora.org \
--cc=bhe@redhat.com \
--cc=cai@lca.pw \
--cc=david@redhat.com \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=logang@deltatee.com \
--cc=mhocko@suse.com \
--cc=mingo@kernel.org \
--cc=mojha@codeaurora.org \
--cc=osalvador@suse.com \
--cc=pasha.tatashin@soleen.com \
--cc=peterz@infradead.org \
--cc=richard.weiyang@gmail.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
/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