From: Haicheng Li <[email protected]>
Subject: hotplug emulator: add function to hide memory region via e820 table.
NUMA hotplug emulator needs to hide memory regions at the very
beginning of kernel booting. Then emulator will use these
memory regions to fake offlined numa nodes.
Signed-off-by: Haicheng Li <[email protected]>
Signed-off-by: Shaohui Zheng <[email protected]>
---
arch/x86/include/asm/e820.h | 1 +
arch/x86/kernel/e820.c | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 0e22296..027bbb1 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -124,6 +124,7 @@ extern int e820_find_active_region(const struct e820entry *ei,
extern void e820_register_active_regions(int nid, unsigned long start_pfn,
unsigned long end_pfn);
extern u64 e820_hole_size(u64 start, u64 end);
+extern u64 e820_hide_mem(u64 mem_size);
extern void finish_e820_parsing(void);
extern void e820_reserve_resources(void);
extern void e820_reserve_resources_late(void);
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 7bca3c6..1993275 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -971,6 +971,7 @@ static void early_panic(char *msg)
}
static int userdef __initdata;
+static u64 max_mem_size __initdata = ULLONG_MAX;
/* "mem=nopentium" disables the 4MB page tables. */
static int __init parse_memopt(char *p)
@@ -989,12 +990,28 @@ static int __init parse_memopt(char *p)
userdef = 1;
mem_size = memparse(p, &p);
- e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
+ e820_remove_range(mem_size, max_mem_size - mem_size, E820_RAM, 1);
+ max_mem_size = mem_size;
return 0;
}
early_param("mem", parse_memopt);
+#ifdef CONFIG_NODE_HOTPLUG_EMU
+u64 __init e820_hide_mem(u64 mem_size)
+{
+ u64 start, end_pfn;
+
+ userdef = 1;
+ end_pfn = e820_end_of_ram_pfn();
+ start = (end_pfn << PAGE_SHIFT) - mem_size;
+ e820_remove_range(start, max_mem_size - start, E820_RAM, 1);
+ max_mem_size = start;
+
+ return start;
+}
+#endif
+
static int __init parse_memmap_opt(char *p)
{
char *oldp;
--
1.6.0.rc1
--
Thanks & Regards,
Shaohui
On Sat, Nov 13, 2010 at 02:14:16PM +0800, Shaohui Zheng wrote:
> diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
> index 7bca3c6..1993275 100644
> --- a/arch/x86/kernel/e820.c
> +++ b/arch/x86/kernel/e820.c
> @@ -971,6 +971,7 @@ static void early_panic(char *msg)
> }
>
> static int userdef __initdata;
> +static u64 max_mem_size __initdata = ULLONG_MAX;
>
> /* "mem=nopentium" disables the 4MB page tables. */
> static int __init parse_memopt(char *p)
> @@ -989,12 +990,28 @@ static int __init parse_memopt(char *p)
>
> userdef = 1;
> mem_size = memparse(p, &p);
> - e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
> + e820_remove_range(mem_size, max_mem_size - mem_size, E820_RAM, 1);
> + max_mem_size = mem_size;
>
> return 0;
> }
> early_param("mem", parse_memopt);
>
> +#ifdef CONFIG_NODE_HOTPLUG_EMU
> +u64 __init e820_hide_mem(u64 mem_size)
> +{
> + u64 start, end_pfn;
> +
> + userdef = 1;
> + end_pfn = e820_end_of_ram_pfn();
> + start = (end_pfn << PAGE_SHIFT) - mem_size;
> + e820_remove_range(start, max_mem_size - start, E820_RAM, 1);
> + max_mem_size = start;
> +
> + return start;
> +}
> +#endif
> +
All of this could be done with the memblock API, it would be nice if
people would start building on top of that rather than constantly adding
pointless e820 wrappers.
As I also noted in my review of the first iteration of this patch series,
almost everything you have here is completely generic, please do not go
out of your way to create architectural dependence where none exists.