diff options
| author | Jérôme Glisse <jglisse@redhat.com> | 2016-08-19 15:29:19 -0400 |
|---|---|---|
| committer | Jérôme Glisse <jglisse@redhat.com> | 2016-11-14 16:00:18 -0500 |
| commit | ae77519245722aa2911bc95eb48127890c387c0d (patch) | |
| tree | 131bb1599d790bbf2adf36c85280d35b248ffa90 /include | |
| parent | dcb43a79ff15a91cb9bb48f78e55f689c8b7806e (diff) | |
mm/memory/hotplug: convert device parameter bool to set of flags
Only usefull for arch where we support ZONE_DEVICE and where we want to
also support un-addressable device memory. We need struct page for such
un-addressable memory. But we should avoid populating the kernel linear
mapping for the physical address range because there is no real memory
or anything behind those physical address.
Hence we need more flags than just knowing if it is device memory or not.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memory_hotplug.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 01033fadea47..ba9b12e6d749 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -103,7 +103,7 @@ extern bool memhp_auto_online; #ifdef CONFIG_MEMORY_HOTREMOVE extern bool is_pageblock_removable_nolock(struct page *page); -extern int arch_remove_memory(u64 start, u64 size); +extern int arch_remove_memory(u64 start, u64 size, int flags); extern int __remove_pages(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages); #endif /* CONFIG_MEMORY_HOTREMOVE */ @@ -275,7 +275,20 @@ extern int add_memory(int nid, u64 start, u64 size); extern int add_memory_resource(int nid, struct resource *resource, bool online); extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default, bool for_device); -extern int arch_add_memory(int nid, u64 start, u64 size, bool for_device); + +/* + * For device memory we want more informations than just knowing it is device + * memory. We want to know if we can migrate it (ie it is not storage memory + * use by DAX). Is it addressable by the CPU ? Some device memory like GPU + * memory can not be access by CPU but we still want struct page so that we + * can use it like regular memory. + */ +#define MEMORY_FLAGS_NONE 0 +#define MEMORY_DEVICE (1 << 0) +#define MEMORY_MOVABLE (1 << 1) +#define MEMORY_UNADDRESSABLE (1 << 2) + +extern int arch_add_memory(int nid, u64 start, u64 size, int flags); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern bool is_memblock_offlined(struct memory_block *mem); extern void remove_memory(int nid, u64 start, u64 size); |