From: Juergen Gross <jgross@suse.com>

Date: Thu, 14 Feb 2019 11:42:39 +0100

Patch-mainline: Queued in subsystem maintainer repository

Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git

Git-commit: 357b4da50a62e2fd70eacee21cdbd22d4c7a7b60

References: bsc#1117645

Subject: x86: respect memory size limiting via mem= parameter

When limiting memory size via kernel parameter "mem=" this should be

respected even in case of memory made accessible via a PCI card.

Today this kind of memory won't be made usable in initial memory

setup as the memory won't be visible in E820 map, but it might be

added when adding PCI devices due to corresponding ACPI table entries.

Not respecting "mem=" can be corrected by adding a global max_mem_size

variable set by parse_memopt() which will result in rejecting adding

memory areas resulting in a memory size above the allowed limit.

Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Ingo Molnar <mingo@kernel.org>

Reviewed-by: William Kucharski <william.kucharski@oracle.com>

Signed-off-by: Juergen Gross <jgross@suse.com>

---

 arch/x86/kernel/e820.c         | 5 +++++

 include/linux/memory_hotplug.h | 2 ++

 mm/memory_hotplug.c            | 6 ++++++

 3 files changed, 13 insertions(+)

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c

index 50895c2f937d..e67513e2cbbb 100644

--- a/arch/x86/kernel/e820.c

+++ b/arch/x86/kernel/e820.c

@@ -15,6 +15,7 @@

 #include <linux/firmware-map.h>

 #include <linux/memblock.h>

 #include <linux/sort.h>

+#include <linux/memory_hotplug.h>

 #include <asm/e820/api.h>

 #include <asm/setup.h>

@@ -859,6 +860,10 @@ static int __init parse_memopt(char *p)

 	e820__range_remove(mem_size, ULLONG_MAX - mem_size, E820_TYPE_RAM, 1);

+#ifdef CONFIG_MEMORY_HOTPLUG

+	max_mem_size = mem_size;

+#endif

+

 	return 0;

 }

 early_param("mem", parse_memopt);

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h

index 368267c1b71b..cfd12078172a 100644

--- a/include/linux/memory_hotplug.h

+++ b/include/linux/memory_hotplug.h

@@ -114,6 +114,8 @@ extern void __online_page_free(struct page *page);

 extern int try_online_node(int nid);

+extern u64 max_mem_size;

+

 extern bool memhp_auto_online;

 #ifdef CONFIG_MEMORY_HOTREMOVE

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c

index 124e794867c5..519f9db063ff 100644

--- a/mm/memory_hotplug.c

+++ b/mm/memory_hotplug.c

@@ -156,10 +156,16 @@ void mem_hotplug_done(void)

 	mutex_unlock(&memory_add_remove_lock);

 }

+u64 max_mem_size = U64_MAX;

+

 /* add this memory to iomem resource */

 static struct resource *register_memory_resource(u64 start, u64 size)

 {

 	struct resource *res, *conflict;

+

+	if (start + size > max_mem_size)

+		return ERR_PTR(-E2BIG);

+

 	res = kzalloc(sizeof(struct resource), GFP_KERNEL);

 	if (!res)

 		return ERR_PTR(-ENOMEM);

-- 

2.16.4