From: David Vrabel <david.vrabel@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Daniel Kiper <daniel.kiper@oracle.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
David Vrabel <david.vrabel@citrix.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCHv2 01/10] mm: memory hotplug with an existing resource
Date: Fri, 24 Jul 2015 12:47:39 +0100 [thread overview]
Message-ID: <1437738468-24110-2-git-send-email-david.vrabel__20730.5832919248$1437738574$gmane$org@citrix.com> (raw)
In-Reply-To: <1437738468-24110-1-git-send-email-david.vrabel@citrix.com>
Add add_memory_resource() to add memory using an existing "System RAM"
resource. This is useful if the memory region is being located by
finding a free resource slot with allocate_resource().
Xen guests will make use of this in their balloon driver to hotplug
arbitrary amounts of memory in response to toolstack requests.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memory_hotplug.h | 2 ++
mm/memory_hotplug.c | 28 +++++++++++++++++++++-------
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 6ffa0ac..c76d371 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -11,6 +11,7 @@ struct zone;
struct pglist_data;
struct mem_section;
struct memory_block;
+struct resource;
#ifdef CONFIG_MEMORY_HOTPLUG
@@ -266,6 +267,7 @@ static inline void remove_memory(int nid, u64 start, u64 size) {}
extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
void *arg, int (*func)(struct memory_block *, void *));
extern int add_memory(int nid, u64 start, u64 size);
+extern int add_memory_resource(int nid, struct resource *resource);
extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default);
extern int arch_add_memory(int nid, u64 start, u64 size);
extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 26fbba7..460d0fe 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1216,23 +1216,21 @@ int zone_for_memory(int nid, u64 start, u64 size, int zone_default)
}
/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
-int __ref add_memory(int nid, u64 start, u64 size)
+int __ref add_memory_resource(int nid, struct resource *res)
{
+ u64 start, size;
pg_data_t *pgdat = NULL;
bool new_pgdat;
bool new_node;
- struct resource *res;
int ret;
+ start = res->start;
+ size = resource_size(res);
+
ret = check_hotplug_memory_range(start, size);
if (ret)
return ret;
- res = register_memory_resource(start, size);
- ret = -EEXIST;
- if (!res)
- return ret;
-
{ /* Stupid hack to suppress address-never-null warning */
void *p = NODE_DATA(nid);
new_pgdat = !p;
@@ -1282,6 +1280,22 @@ out:
mem_hotplug_done();
return ret;
}
+EXPORT_SYMBOL_GPL(add_memory_resource);
+
+int __ref add_memory(int nid, u64 start, u64 size)
+{
+ struct resource *res;
+ int ret;
+
+ res = register_memory_resource(start, size);
+ if (!res)
+ return -EEXIST;
+
+ ret = add_memory_resource(nid, res);
+ if (ret < 0)
+ release_memory_resource(res);
+ return ret;
+}
EXPORT_SYMBOL_GPL(add_memory);
#ifdef CONFIG_MEMORY_HOTREMOVE
--
2.1.4
next parent reply other threads:[~2015-07-24 11:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1437738468-24110-1-git-send-email-david.vrabel@citrix.com>
2015-07-24 11:47 ` David Vrabel [this message]
2015-07-24 11:47 ` [PATCHv2 02/10] xen/balloon: remove scratch page left overs David Vrabel
2015-07-24 11:47 ` [PATCHv2 03/10] x86/xen: discard RAM regions above the maximum reservation David Vrabel
2015-07-24 11:47 ` [PATCHv2 04/10] xen/balloon: find non-conflicting regions to place hotplugged memory David Vrabel
2015-07-24 11:47 ` [PATCHv2 05/10] xen/balloon: rationalize memory hotplug stats David Vrabel
2015-07-24 11:47 ` [PATCHv2 06/10] xen/balloon: only hotplug additional memory if required David Vrabel
2015-07-24 11:47 ` [PATCHv2 07/10] xen/balloon: make alloc_xenballoon_pages() always allocate low pages David Vrabel
2015-07-24 11:47 ` [PATCHv2 08/10] xen/balloon: use hotplugged pages for foreign mappings etc David Vrabel
2015-07-24 11:47 ` [PATCHv2 09/10] x86/xen: export xen_alloc_p2m_entry() David Vrabel
2015-07-24 11:47 ` [PATCHv2 10/10] xen/balloon: pre-allocate p2m entries for ballooned pages David Vrabel
[not found] ` <1437738468-24110-10-git-send-email-david.vrabel@citrix.com>
2015-07-24 18:51 ` [PATCHv2 09/10] x86/xen: export xen_alloc_p2m_entry() Konrad Rzeszutek Wilk
2015-07-29 16:10 ` Daniel Kiper
[not found] ` <1437738468-24110-6-git-send-email-david.vrabel@citrix.com>
2015-07-24 18:54 ` [PATCHv2 05/10] xen/balloon: rationalize memory hotplug stats Konrad Rzeszutek Wilk
2015-07-28 15:22 ` Daniel Kiper
[not found] ` <1437738468-24110-9-git-send-email-david.vrabel@citrix.com>
2015-07-24 18:55 ` [PATCHv2 08/10] xen/balloon: use hotplugged pages for foreign mappings etc Konrad Rzeszutek Wilk
[not found] ` <20150724185545.GD12824@l.oracle.com>
2015-07-27 10:18 ` David Vrabel
[not found] ` <1437738468-24110-11-git-send-email-david.vrabel@citrix.com>
2015-07-24 23:21 ` [PATCHv2 10/10] xen/balloon: pre-allocate p2m entries for ballooned pages Julien Grall
[not found] ` <55B2C882.8050903@citrix.com>
2015-07-27 9:30 ` David Vrabel
[not found] ` <55B5FA39.8000401@citrix.com>
2015-07-27 11:01 ` Julien Grall
[not found] ` <55B60F6E.3040901@citrix.com>
2015-07-27 12:40 ` David Vrabel
2015-07-27 19:37 ` [PATCHv2 00/10] mm, xen/balloon: memory hotplug improvements Daniel Kiper
[not found] ` <1437738468-24110-2-git-send-email-david.vrabel@citrix.com>
2015-07-28 14:54 ` [PATCHv2 01/10] mm: memory hotplug with an existing resource Daniel Kiper
[not found] ` <1437738468-24110-7-git-send-email-david.vrabel@citrix.com>
2015-07-29 15:55 ` [PATCHv2 06/10] xen/balloon: only hotplug additional memory if required Daniel Kiper
[not found] ` <20150729155535.GL3492@olila.local.net-space.pl>
2015-07-29 16:02 ` David Vrabel
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='1437738468-24110-2-git-send-email-david.vrabel__20730.5832919248$1437738574$gmane$org@citrix.com' \
--to=david.vrabel@citrix.com \
--cc=akpm@linux-foundation.org \
--cc=boris.ostrovsky@oracle.com \
--cc=daniel.kiper@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=xen-devel@lists.xenproject.org \
/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).