* memblock vs early_res
@ 2010-09-17 20:47 Jeremy Fitzhardinge
2010-09-17 22:47 ` Yinghai Lu
0 siblings, 1 reply; 6+ messages in thread
From: Jeremy Fitzhardinge @ 2010-09-17 20:47 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Linux Kernel Mailing List, the arch/x86 maintainers
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
Hi Yinghai,
I have the patch below floating around in my tree to make sure that
early-reserved highmem is honoured when freeing unreserved memory. I
was trying to rebase it to current linux-next and noticed that all the
early_res stuff has been replaced with memblock.
Is this still an issue? What would the memblock version of this patch
look like?
Thanks,
J
[-- Attachment #2: early_res-highmem.patch --]
[-- Type: text/plain, Size: 3760 bytes --]
From 0a1c234a9fabcc2e71dc7a6da7ae1cb073207281 Mon Sep 17 00:00:00 2001
From: Gianluca Guida <gianluca.guida@citrix.com>
Date: Sun, 2 Aug 2009 01:25:48 +0100
Subject: [PATCH] x86/32: honor reservations of high memory
Make high memory initialization honor early reserved ranges.
Signed-off-by: Gianluca Guida <gianluca.guida@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index bca7909..573bc7f 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -432,22 +432,45 @@ static int __init add_highpages_work_fn(unsigned long start_pfn,
{
int node_pfn;
struct page *page;
+ phys_addr_t chunk_end, chunk_max;
unsigned long final_start_pfn, final_end_pfn;
- struct add_highpages_data *data;
-
- data = (struct add_highpages_data *)datax;
+ struct add_highpages_data *data = (struct add_highpages_data *)datax;
final_start_pfn = max(start_pfn, data->start_pfn);
final_end_pfn = min(end_pfn, data->end_pfn);
if (final_start_pfn >= final_end_pfn)
return 0;
- for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;
- node_pfn++) {
- if (!pfn_valid(node_pfn))
- continue;
- page = pfn_to_page(node_pfn);
- add_one_highpage_init(page);
+ chunk_end = PFN_PHYS(final_start_pfn);
+ chunk_max = PFN_PHYS(final_end_pfn);
+
+ /*
+ * Check for reserved areas.
+ */
+ for (;;) {
+ phys_addr_t chunk_start;
+ chunk_start = early_res_next_free(chunk_end);
+
+ /*
+ * Reserved area. Just count high mem pages.
+ */
+ for (node_pfn = PFN_DOWN(chunk_end);
+ node_pfn < PFN_DOWN(chunk_start); node_pfn++) {
+ if (pfn_valid(node_pfn))
+ totalhigh_pages++;
+ }
+
+ if (chunk_start >= chunk_max)
+ break;
+
+ chunk_end = early_res_next_reserved(chunk_start, chunk_max);
+ for (node_pfn = PFN_DOWN(chunk_start);
+ node_pfn < PFN_DOWN(chunk_end); node_pfn++) {
+ if (!pfn_valid(node_pfn))
+ continue;
+ page = pfn_to_page(node_pfn);
+ add_one_highpage_init(page);
+ }
}
return 0;
@@ -461,7 +484,6 @@ void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
data.start_pfn = start_pfn;
data.end_pfn = end_pfn;
-
work_with_active_regions(nid, add_highpages_work_fn, &data);
}
diff --git a/include/linux/early_res.h b/include/linux/early_res.h
index 29c09f5..37317e1 100644
--- a/include/linux/early_res.h
+++ b/include/linux/early_res.h
@@ -8,6 +8,9 @@ extern void free_early(u64 start, u64 end);
void free_early_partial(u64 start, u64 end);
extern void early_res_to_bootmem(u64 start, u64 end);
+extern u64 early_res_next_free(u64 start);
+extern u64 early_res_next_reserved(u64 addr, u64 max);
+
void reserve_early_without_check(u64 start, u64 end, char *name);
u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align);
diff --git a/kernel/early_res.c b/kernel/early_res.c
index 7bfae88..b663c62 100644
--- a/kernel/early_res.c
+++ b/kernel/early_res.c
@@ -44,6 +44,36 @@ static int __init find_overlapped_early(u64 start, u64 end)
return i;
}
+u64 __init early_res_next_free(u64 addr)
+{
+ int i;
+ u64 end = addr;
+ struct early_res *r;
+
+ for (i = 0; i < max_early_res; i++) {
+ r = &early_res[i];
+ if (addr >= r->start && addr < r->end) {
+ end = r->end;
+ break;
+ }
+ }
+ return end;
+}
+
+u64 __init early_res_next_reserved(u64 addr, u64 max)
+{
+ int i;
+ struct early_res *r;
+ u64 next_res = max;
+
+ for (i = 0; i < max_early_res && early_res[i].end; i++) {
+ r = &early_res[i];
+ if ((r->start >= addr) && (r->start < next_res))
+ next_res = r->start;
+ }
+ return next_res;
+}
+
/*
* Drop the i-th range from the early reservation map,
* by copying any higher ranges down one over it, and
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: memblock vs early_res
2010-09-17 20:47 memblock vs early_res Jeremy Fitzhardinge
@ 2010-09-17 22:47 ` Yinghai Lu
2010-09-17 23:11 ` Jeremy Fitzhardinge
0 siblings, 1 reply; 6+ messages in thread
From: Yinghai Lu @ 2010-09-17 22:47 UTC (permalink / raw)
To: Jeremy Fitzhardinge
Cc: Ingo Molnar, Linux Kernel Mailing List, the arch/x86 maintainers
On 09/17/2010 01:47 PM, Jeremy Fitzhardinge wrote:
> Hi Yinghai,
>
> I have the patch below floating around in my tree to make sure that
> early-reserved highmem is honoured when freeing unreserved memory. I
> was trying to rebase it to current linux-next and noticed that all the
> early_res stuff has been replaced with memblock.
>
> Is this still an issue? What would the memblock version of this patch
> look like?
>
Not sure why this patch is needed.
For the early reserve ranges, that could be overlapped with high pages, is "KVA RAM",
but We do remove those range in active ranges array. [ in calculate_numa_remap_pages() ].
[
...
memblock_x86_reserve_range(node_kva_final,
node_kva_final+(((u64)size)<<PAGE_SHIFT),
"KVA RAM");
node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
remove_active_range(nid, node_remap_start_pfn[nid],
node_remap_start_pfn[nid] + size);
...
]
Can you check if Gianluca Guida still can duplicate the problem that will need his patch ?
Thanks
Yinghai Lu
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: memblock vs early_res
2010-09-17 22:47 ` Yinghai Lu
@ 2010-09-17 23:11 ` Jeremy Fitzhardinge
2010-09-18 6:10 ` Yinghai Lu
0 siblings, 1 reply; 6+ messages in thread
From: Jeremy Fitzhardinge @ 2010-09-17 23:11 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Linux Kernel Mailing List, the arch/x86 maintainers
On 09/17/2010 03:47 PM, Yinghai Lu wrote:
> On 09/17/2010 01:47 PM, Jeremy Fitzhardinge wrote:
>> Hi Yinghai,
>>
>> I have the patch below floating around in my tree to make sure that
>> early-reserved highmem is honoured when freeing unreserved memory. I
>> was trying to rebase it to current linux-next and noticed that all the
>> early_res stuff has been replaced with memblock.
>>
>> Is this still an issue? What would the memblock version of this patch
>> look like?
>>
> Not sure why this patch is needed.
>
> For the early reserve ranges, that could be overlapped with high pages, is "KVA RAM",
> but We do remove those range in active ranges array. [ in calculate_numa_remap_pages() ].
> [
> ...
> memblock_x86_reserve_range(node_kva_final,
> node_kva_final+(((u64)size)<<PAGE_SHIFT),
> "KVA RAM");
>
> node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
> remove_active_range(nid, node_remap_start_pfn[nid],
> node_remap_start_pfn[nid] + size);
> ...
> ]
>
> Can you check if Gianluca Guida still can duplicate the problem that will need his patch ?
The specific motivation for this patch is to handle Xen ballooning where
the domain can be built with X pages of memory available to it
initially, but Y pages are presented in the E820 map (Y >= X). The
extra pages in the E820 are not physically present, but I want the
kernel to allocate page structures for them, so I reserve_early() them
to stop them from being used. Later on, the balloon driver can
incrementally populate these pfns and return them to the kernel for use
as real memory.
Without this patch, the reservations of the highmem pages are ignored
and the kernel ends up trying to use these non-resident pages. (At
least that's what used to happen, and I didn't see any changes which
looked like they would address this.)
Does the code you quote above address this case?
Thanks,
J
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: memblock vs early_res
2010-09-17 23:11 ` Jeremy Fitzhardinge
@ 2010-09-18 6:10 ` Yinghai Lu
2010-09-18 6:21 ` Jeremy Fitzhardinge
2010-09-22 0:09 ` Jeremy Fitzhardinge
0 siblings, 2 replies; 6+ messages in thread
From: Yinghai Lu @ 2010-09-18 6:10 UTC (permalink / raw)
To: Jeremy Fitzhardinge
Cc: Ingo Molnar, Linux Kernel Mailing List, the arch/x86 maintainers
On 09/17/2010 04:11 PM, Jeremy Fitzhardinge wrote:
> On 09/17/2010 03:47 PM, Yinghai Lu wrote:
>> On 09/17/2010 01:47 PM, Jeremy Fitzhardinge wrote:
>>> Hi Yinghai,
>>>
>>> I have the patch below floating around in my tree to make sure that
>>> early-reserved highmem is honoured when freeing unreserved memory. I
>>> was trying to rebase it to current linux-next and noticed that all the
>>> early_res stuff has been replaced with memblock.
>>>
>>> Is this still an issue? What would the memblock version of this patch
>>> look like?
>>>
>> Not sure why this patch is needed.
>>
>> For the early reserve ranges, that could be overlapped with high pages, is "KVA RAM",
>> but We do remove those range in active ranges array. [ in calculate_numa_remap_pages() ].
>> [
>> ...
>> memblock_x86_reserve_range(node_kva_final,
>> node_kva_final+(((u64)size)<<PAGE_SHIFT),
>> "KVA RAM");
>>
>> node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
>> remove_active_range(nid, node_remap_start_pfn[nid],
>> node_remap_start_pfn[nid] + size);
>> ...
>> ]
>>
>> Can you check if Gianluca Guida still can duplicate the problem that will need his patch ?
>
> The specific motivation for this patch is to handle Xen ballooning where
> the domain can be built with X pages of memory available to it
> initially, but Y pages are presented in the E820 map (Y >= X). The
> extra pages in the E820 are not physically present, but I want the
> kernel to allocate page structures for them, so I reserve_early() them
> to stop them from being used. Later on, the balloon driver can
> incrementally populate these pfns and return them to the kernel for use
> as real memory.
>
> Without this patch, the reservations of the highmem pages are ignored
> and the kernel ends up trying to use these non-resident pages. (At
> least that's what used to happen, and I didn't see any changes which
> looked like they would address this.)
>
> Does the code you quote above address this case?
please check
[PATCH] x86, mm, memblock, 32bit: Make higepages honor early reserved ranges
Originally the only early reserved range that is overlapped with high pages :
"KVA RAM", but We do remove them from active ranges.
It turns out xen could have that kind of overlapping to support memory bollaon.
So We need to make add_highpage_with_active_regions() to subtract memblock
reserved just like low ram.
In this patch, refactering get_freel_all_memory_range() to make it can be used
by add_highpage_with_active_regions().
Also we don't need to remove "KVA RAM" from active ranges.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/include/asm/memblock.h | 2 +
arch/x86/mm/init_32.c | 59 ++++++++++++----------------------------
arch/x86/mm/memblock.c | 19 ++++++++++--
arch/x86/mm/numa_32.c | 2 -
4 files changed, 36 insertions(+), 46 deletions(-)
Index: linux-2.6/arch/x86/include/asm/memblock.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/memblock.h
+++ linux-2.6/arch/x86/include/asm/memblock.h
@@ -9,6 +9,8 @@ void memblock_x86_to_bootmem(u64 start,
void memblock_x86_reserve_range(u64 start, u64 end, char *name);
void memblock_x86_free_range(u64 start, u64 end);
struct range;
+int __get_free_all_memory_range(struct range **range, int nodeid,
+ unsigned long start_pfn, unsigned long end_pfn);
int get_free_all_memory_range(struct range **rangep, int nodeid);
void memblock_x86_register_active_regions(int nid, unsigned long start_pfn,
Index: linux-2.6/arch/x86/mm/init_32.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/init_32.c
+++ linux-2.6/arch/x86/mm/init_32.c
@@ -426,49 +426,28 @@ static void __init add_one_highpage_init
totalhigh_pages++;
}
-struct add_highpages_data {
- unsigned long start_pfn;
- unsigned long end_pfn;
-};
-
-static int __init add_highpages_work_fn(unsigned long start_pfn,
- unsigned long end_pfn, void *datax)
+void __init add_highpages_with_active_regions(int nid,
+ unsigned long start_pfn, unsigned long end_pfn)
{
- int node_pfn;
- struct page *page;
- unsigned long final_start_pfn, final_end_pfn;
- struct add_highpages_data *data;
-
- data = (struct add_highpages_data *)datax;
-
- final_start_pfn = max(start_pfn, data->start_pfn);
- final_end_pfn = min(end_pfn, data->end_pfn);
- if (final_start_pfn >= final_end_pfn)
- return 0;
-
- for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;
- node_pfn++) {
- if (!pfn_valid(node_pfn))
- continue;
- page = pfn_to_page(node_pfn);
- add_one_highpage_init(page);
+ struct range *range;
+ int nr_range;
+ int i;
+
+ nr_range = __get_free_all_memory_range(&range, nid, start_pfn, end_pfn);
+
+ for (i = 0; i < nr_range; i++) {
+ struct page *page;
+ int node_pfn;
+
+ for (node_pfn = range[i].start; node_pfn < range[i].end;
+ node_pfn++) {
+ if (!pfn_valid(node_pfn))
+ continue;
+ page = pfn_to_page(node_pfn);
+ add_one_highpage_init(page);
+ }
}
-
- return 0;
-
}
-
-void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
- unsigned long end_pfn)
-{
- struct add_highpages_data data;
-
- data.start_pfn = start_pfn;
- data.end_pfn = end_pfn;
-
- work_with_active_regions(nid, add_highpages_work_fn, &data);
-}
-
#else
static inline void permanent_kmaps_init(pgd_t *pgd_base)
{
Index: linux-2.6/arch/x86/mm/memblock.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/memblock.c
+++ linux-2.6/arch/x86/mm/memblock.c
@@ -139,7 +139,8 @@ static int __init count_early_node_map(i
return data.nr;
}
-int __init get_free_all_memory_range(struct range **rangep, int nodeid)
+int __init __get_free_all_memory_range(struct range **rangep, int nodeid,
+ unsigned long start_pfn, unsigned long end_pfn)
{
int count;
struct range *range;
@@ -155,9 +156,9 @@ int __init get_free_all_memory_range(str
* at first
*/
nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
-#ifdef CONFIG_X86_32
- subtract_range(range, count, max_low_pfn, -1ULL);
-#endif
+ subtract_range(range, count, 0, start_pfn);
+ subtract_range(range, count, end_pfn, -1ULL);
+
memblock_x86_subtract_reserved(range, count);
nr_range = clean_sort_range(range, count);
@@ -165,6 +166,16 @@ int __init get_free_all_memory_range(str
return nr_range;
}
+int __init get_free_all_memory_range(struct range **rangep, int nodeid)
+{
+ unsigned long end_pfn = -1ULL;
+
+#ifdef CONFIG_X86_32
+ end_pfn = max_low_pfn;
+#endif
+ return __get_free_all_memory_range(rangep, nodeid, 0, end_pfn);
+}
+
static u64 __init __memblock_x86_memory_in_range(u64 addr, u64 limit, bool get_free)
{
int i, count;
Index: linux-2.6/arch/x86/mm/numa_32.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/numa_32.c
+++ linux-2.6/arch/x86/mm/numa_32.c
@@ -326,8 +326,6 @@ static __init unsigned long calculate_nu
"KVA RAM");
node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
- remove_active_range(nid, node_remap_start_pfn[nid],
- node_remap_start_pfn[nid] + size);
}
printk(KERN_INFO "Reserving total of %lx pages for numa KVA remap\n",
reserve_pages);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: memblock vs early_res
2010-09-18 6:10 ` Yinghai Lu
@ 2010-09-18 6:21 ` Jeremy Fitzhardinge
2010-09-22 0:09 ` Jeremy Fitzhardinge
1 sibling, 0 replies; 6+ messages in thread
From: Jeremy Fitzhardinge @ 2010-09-18 6:21 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Linux Kernel Mailing List, the arch/x86 maintainers
On 09/17/2010 11:10 PM, Yinghai Lu wrote:
> On 09/17/2010 04:11 PM, Jeremy Fitzhardinge wrote:
>> On 09/17/2010 03:47 PM, Yinghai Lu wrote:
>>> On 09/17/2010 01:47 PM, Jeremy Fitzhardinge wrote:
>>>> Hi Yinghai,
>>>>
>>>> I have the patch below floating around in my tree to make sure that
>>>> early-reserved highmem is honoured when freeing unreserved memory. I
>>>> was trying to rebase it to current linux-next and noticed that all the
>>>> early_res stuff has been replaced with memblock.
>>>>
>>>> Is this still an issue? What would the memblock version of this patch
>>>> look like?
>>>>
>>> Not sure why this patch is needed.
>>>
>>> For the early reserve ranges, that could be overlapped with high pages, is "KVA RAM",
>>> but We do remove those range in active ranges array. [ in calculate_numa_remap_pages() ].
>>> [
>>> ...
>>> memblock_x86_reserve_range(node_kva_final,
>>> node_kva_final+(((u64)size)<<PAGE_SHIFT),
>>> "KVA RAM");
>>>
>>> node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
>>> remove_active_range(nid, node_remap_start_pfn[nid],
>>> node_remap_start_pfn[nid] + size);
>>> ...
>>> ]
>>>
>>> Can you check if Gianluca Guida still can duplicate the problem that will need his patch ?
>> The specific motivation for this patch is to handle Xen ballooning where
>> the domain can be built with X pages of memory available to it
>> initially, but Y pages are presented in the E820 map (Y >= X). The
>> extra pages in the E820 are not physically present, but I want the
>> kernel to allocate page structures for them, so I reserve_early() them
>> to stop them from being used. Later on, the balloon driver can
>> incrementally populate these pfns and return them to the kernel for use
>> as real memory.
>>
>> Without this patch, the reservations of the highmem pages are ignored
>> and the kernel ends up trying to use these non-resident pages. (At
>> least that's what used to happen, and I didn't see any changes which
>> looked like they would address this.)
>>
>> Does the code you quote above address this case?
> please check
Thanks, I'll try this out tomorrow.
J
> [PATCH] x86, mm, memblock, 32bit: Make higepages honor early reserved ranges
>
> Originally the only early reserved range that is overlapped with high pages :
> "KVA RAM", but We do remove them from active ranges.
>
> It turns out xen could have that kind of overlapping to support memory bollaon.
>
> So We need to make add_highpage_with_active_regions() to subtract memblock
> reserved just like low ram.
>
> In this patch, refactering get_freel_all_memory_range() to make it can be used
> by add_highpage_with_active_regions().
> Also we don't need to remove "KVA RAM" from active ranges.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> ---
> arch/x86/include/asm/memblock.h | 2 +
> arch/x86/mm/init_32.c | 59 ++++++++++++----------------------------
> arch/x86/mm/memblock.c | 19 ++++++++++--
> arch/x86/mm/numa_32.c | 2 -
> 4 files changed, 36 insertions(+), 46 deletions(-)
>
> Index: linux-2.6/arch/x86/include/asm/memblock.h
> ===================================================================
> --- linux-2.6.orig/arch/x86/include/asm/memblock.h
> +++ linux-2.6/arch/x86/include/asm/memblock.h
> @@ -9,6 +9,8 @@ void memblock_x86_to_bootmem(u64 start,
> void memblock_x86_reserve_range(u64 start, u64 end, char *name);
> void memblock_x86_free_range(u64 start, u64 end);
> struct range;
> +int __get_free_all_memory_range(struct range **range, int nodeid,
> + unsigned long start_pfn, unsigned long end_pfn);
> int get_free_all_memory_range(struct range **rangep, int nodeid);
>
> void memblock_x86_register_active_regions(int nid, unsigned long start_pfn,
> Index: linux-2.6/arch/x86/mm/init_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/init_32.c
> +++ linux-2.6/arch/x86/mm/init_32.c
> @@ -426,49 +426,28 @@ static void __init add_one_highpage_init
> totalhigh_pages++;
> }
>
> -struct add_highpages_data {
> - unsigned long start_pfn;
> - unsigned long end_pfn;
> -};
> -
> -static int __init add_highpages_work_fn(unsigned long start_pfn,
> - unsigned long end_pfn, void *datax)
> +void __init add_highpages_with_active_regions(int nid,
> + unsigned long start_pfn, unsigned long end_pfn)
> {
> - int node_pfn;
> - struct page *page;
> - unsigned long final_start_pfn, final_end_pfn;
> - struct add_highpages_data *data;
> -
> - data = (struct add_highpages_data *)datax;
> -
> - final_start_pfn = max(start_pfn, data->start_pfn);
> - final_end_pfn = min(end_pfn, data->end_pfn);
> - if (final_start_pfn >= final_end_pfn)
> - return 0;
> -
> - for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;
> - node_pfn++) {
> - if (!pfn_valid(node_pfn))
> - continue;
> - page = pfn_to_page(node_pfn);
> - add_one_highpage_init(page);
> + struct range *range;
> + int nr_range;
> + int i;
> +
> + nr_range = __get_free_all_memory_range(&range, nid, start_pfn, end_pfn);
> +
> + for (i = 0; i < nr_range; i++) {
> + struct page *page;
> + int node_pfn;
> +
> + for (node_pfn = range[i].start; node_pfn < range[i].end;
> + node_pfn++) {
> + if (!pfn_valid(node_pfn))
> + continue;
> + page = pfn_to_page(node_pfn);
> + add_one_highpage_init(page);
> + }
> }
> -
> - return 0;
> -
> }
> -
> -void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
> - unsigned long end_pfn)
> -{
> - struct add_highpages_data data;
> -
> - data.start_pfn = start_pfn;
> - data.end_pfn = end_pfn;
> -
> - work_with_active_regions(nid, add_highpages_work_fn, &data);
> -}
> -
> #else
> static inline void permanent_kmaps_init(pgd_t *pgd_base)
> {
> Index: linux-2.6/arch/x86/mm/memblock.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/memblock.c
> +++ linux-2.6/arch/x86/mm/memblock.c
> @@ -139,7 +139,8 @@ static int __init count_early_node_map(i
> return data.nr;
> }
>
> -int __init get_free_all_memory_range(struct range **rangep, int nodeid)
> +int __init __get_free_all_memory_range(struct range **rangep, int nodeid,
> + unsigned long start_pfn, unsigned long end_pfn)
> {
> int count;
> struct range *range;
> @@ -155,9 +156,9 @@ int __init get_free_all_memory_range(str
> * at first
> */
> nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
> -#ifdef CONFIG_X86_32
> - subtract_range(range, count, max_low_pfn, -1ULL);
> -#endif
> + subtract_range(range, count, 0, start_pfn);
> + subtract_range(range, count, end_pfn, -1ULL);
> +
> memblock_x86_subtract_reserved(range, count);
> nr_range = clean_sort_range(range, count);
>
> @@ -165,6 +166,16 @@ int __init get_free_all_memory_range(str
> return nr_range;
> }
>
> +int __init get_free_all_memory_range(struct range **rangep, int nodeid)
> +{
> + unsigned long end_pfn = -1ULL;
> +
> +#ifdef CONFIG_X86_32
> + end_pfn = max_low_pfn;
> +#endif
> + return __get_free_all_memory_range(rangep, nodeid, 0, end_pfn);
> +}
> +
> static u64 __init __memblock_x86_memory_in_range(u64 addr, u64 limit, bool get_free)
> {
> int i, count;
> Index: linux-2.6/arch/x86/mm/numa_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/numa_32.c
> +++ linux-2.6/arch/x86/mm/numa_32.c
> @@ -326,8 +326,6 @@ static __init unsigned long calculate_nu
> "KVA RAM");
>
> node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
> - remove_active_range(nid, node_remap_start_pfn[nid],
> - node_remap_start_pfn[nid] + size);
> }
> printk(KERN_INFO "Reserving total of %lx pages for numa KVA remap\n",
> reserve_pages);
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: memblock vs early_res
2010-09-18 6:10 ` Yinghai Lu
2010-09-18 6:21 ` Jeremy Fitzhardinge
@ 2010-09-22 0:09 ` Jeremy Fitzhardinge
1 sibling, 0 replies; 6+ messages in thread
From: Jeremy Fitzhardinge @ 2010-09-22 0:09 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Linux Kernel Mailing List, the arch/x86 maintainers
On 09/17/2010 11:10 PM, Yinghai Lu wrote:
> On 09/17/2010 04:11 PM, Jeremy Fitzhardinge wrote:
>> On 09/17/2010 03:47 PM, Yinghai Lu wrote:
>>> On 09/17/2010 01:47 PM, Jeremy Fitzhardinge wrote:
>>>> Hi Yinghai,
>>>>
>>>> I have the patch below floating around in my tree to make sure that
>>>> early-reserved highmem is honoured when freeing unreserved memory. I
>>>> was trying to rebase it to current linux-next and noticed that all the
>>>> early_res stuff has been replaced with memblock.
>>>>
>>>> Is this still an issue? What would the memblock version of this patch
>>>> look like?
>>>>
>>> Not sure why this patch is needed.
>>>
>>> For the early reserve ranges, that could be overlapped with high pages, is "KVA RAM",
>>> but We do remove those range in active ranges array. [ in calculate_numa_remap_pages() ].
>>> [
>>> ...
>>> memblock_x86_reserve_range(node_kva_final,
>>> node_kva_final+(((u64)size)<<PAGE_SHIFT),
>>> "KVA RAM");
>>>
>>> node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
>>> remove_active_range(nid, node_remap_start_pfn[nid],
>>> node_remap_start_pfn[nid] + size);
>>> ...
>>> ]
>>>
>>> Can you check if Gianluca Guida still can duplicate the problem that will need his patch ?
>> The specific motivation for this patch is to handle Xen ballooning where
>> the domain can be built with X pages of memory available to it
>> initially, but Y pages are presented in the E820 map (Y >= X). The
>> extra pages in the E820 are not physically present, but I want the
>> kernel to allocate page structures for them, so I reserve_early() them
>> to stop them from being used. Later on, the balloon driver can
>> incrementally populate these pfns and return them to the kernel for use
>> as real memory.
>>
>> Without this patch, the reservations of the highmem pages are ignored
>> and the kernel ends up trying to use these non-resident pages. (At
>> least that's what used to happen, and I didn't see any changes which
>> looked like they would address this.)
>>
>> Does the code you quote above address this case?
> please check
>
> [PATCH] x86, mm, memblock, 32bit: Make higepages honor early reserved ranges
It isn't working yet, but I don't think its related to this patch, which
seems basically sound.
However, I also needed another patch to allow memblock_init() to be
called early.
Thanks,
J
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Tue, 21 Sep 2010 17:05:35 -0700
Subject: [PATCH] memblock: allow memblock_init to be called early
The Xen setup code needs to call memblock_x86_reserve_range() very early,
so allow it to initialize the memblock subsystem before doing so. The
second memblock_init() is ignored.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 7d46c84..63b83ce 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -30,6 +30,7 @@
#include <linux/console.h>
#include <linux/pci.h>
#include <linux/gfp.h>
+#include <linux/memblock.h>
#include <xen/xen.h>
#include <xen/interface/xen.h>
@@ -1183,6 +1184,8 @@ asmlinkage void __init xen_start_kernel(void)
local_irq_disable();
early_boot_irqs_off();
+ memblock_init();
+
xen_raw_console_write("mapping kernel into physical memory\n");
pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
diff --git a/mm/memblock.c b/mm/memblock.c
index d5d63ac..66bb0c5 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -747,6 +747,12 @@ void __init memblock_analyze(void)
void __init memblock_init(void)
{
+ static int init_done __initdata = 0;
+
+ if (init_done)
+ return;
+ init_done = 1;
+
/* Hookup the initial arrays */
memblock.memory.regions = memblock_memory_init_regions;
memblock.memory.max = INIT_MEMBLOCK_REGIONS;
> Originally the only early reserved range that is overlapped with high pages :
> "KVA RAM", but We do remove them from active ranges.
>
> It turns out xen could have that kind of overlapping to support memory bollaon.
>
> So We need to make add_highpage_with_active_regions() to subtract memblock
> reserved just like low ram.
>
> In this patch, refactering get_freel_all_memory_range() to make it can be used
> by add_highpage_with_active_regions().
> Also we don't need to remove "KVA RAM" from active ranges.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> ---
> arch/x86/include/asm/memblock.h | 2 +
> arch/x86/mm/init_32.c | 59 ++++++++++++----------------------------
> arch/x86/mm/memblock.c | 19 ++++++++++--
> arch/x86/mm/numa_32.c | 2 -
> 4 files changed, 36 insertions(+), 46 deletions(-)
>
> Index: linux-2.6/arch/x86/include/asm/memblock.h
> ===================================================================
> --- linux-2.6.orig/arch/x86/include/asm/memblock.h
> +++ linux-2.6/arch/x86/include/asm/memblock.h
> @@ -9,6 +9,8 @@ void memblock_x86_to_bootmem(u64 start,
> void memblock_x86_reserve_range(u64 start, u64 end, char *name);
> void memblock_x86_free_range(u64 start, u64 end);
> struct range;
> +int __get_free_all_memory_range(struct range **range, int nodeid,
> + unsigned long start_pfn, unsigned long end_pfn);
> int get_free_all_memory_range(struct range **rangep, int nodeid);
>
> void memblock_x86_register_active_regions(int nid, unsigned long start_pfn,
> Index: linux-2.6/arch/x86/mm/init_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/init_32.c
> +++ linux-2.6/arch/x86/mm/init_32.c
> @@ -426,49 +426,28 @@ static void __init add_one_highpage_init
> totalhigh_pages++;
> }
>
> -struct add_highpages_data {
> - unsigned long start_pfn;
> - unsigned long end_pfn;
> -};
> -
> -static int __init add_highpages_work_fn(unsigned long start_pfn,
> - unsigned long end_pfn, void *datax)
> +void __init add_highpages_with_active_regions(int nid,
> + unsigned long start_pfn, unsigned long end_pfn)
> {
> - int node_pfn;
> - struct page *page;
> - unsigned long final_start_pfn, final_end_pfn;
> - struct add_highpages_data *data;
> -
> - data = (struct add_highpages_data *)datax;
> -
> - final_start_pfn = max(start_pfn, data->start_pfn);
> - final_end_pfn = min(end_pfn, data->end_pfn);
> - if (final_start_pfn >= final_end_pfn)
> - return 0;
> -
> - for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;
> - node_pfn++) {
> - if (!pfn_valid(node_pfn))
> - continue;
> - page = pfn_to_page(node_pfn);
> - add_one_highpage_init(page);
> + struct range *range;
> + int nr_range;
> + int i;
> +
> + nr_range = __get_free_all_memory_range(&range, nid, start_pfn, end_pfn);
> +
> + for (i = 0; i < nr_range; i++) {
> + struct page *page;
> + int node_pfn;
> +
> + for (node_pfn = range[i].start; node_pfn < range[i].end;
> + node_pfn++) {
> + if (!pfn_valid(node_pfn))
> + continue;
> + page = pfn_to_page(node_pfn);
> + add_one_highpage_init(page);
> + }
> }
> -
> - return 0;
> -
> }
> -
> -void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,
> - unsigned long end_pfn)
> -{
> - struct add_highpages_data data;
> -
> - data.start_pfn = start_pfn;
> - data.end_pfn = end_pfn;
> -
> - work_with_active_regions(nid, add_highpages_work_fn, &data);
> -}
> -
> #else
> static inline void permanent_kmaps_init(pgd_t *pgd_base)
> {
> Index: linux-2.6/arch/x86/mm/memblock.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/memblock.c
> +++ linux-2.6/arch/x86/mm/memblock.c
> @@ -139,7 +139,8 @@ static int __init count_early_node_map(i
> return data.nr;
> }
>
> -int __init get_free_all_memory_range(struct range **rangep, int nodeid)
> +int __init __get_free_all_memory_range(struct range **rangep, int nodeid,
> + unsigned long start_pfn, unsigned long end_pfn)
> {
> int count;
> struct range *range;
> @@ -155,9 +156,9 @@ int __init get_free_all_memory_range(str
> * at first
> */
> nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
> -#ifdef CONFIG_X86_32
> - subtract_range(range, count, max_low_pfn, -1ULL);
> -#endif
> + subtract_range(range, count, 0, start_pfn);
> + subtract_range(range, count, end_pfn, -1ULL);
> +
> memblock_x86_subtract_reserved(range, count);
> nr_range = clean_sort_range(range, count);
>
> @@ -165,6 +166,16 @@ int __init get_free_all_memory_range(str
> return nr_range;
> }
>
> +int __init get_free_all_memory_range(struct range **rangep, int nodeid)
> +{
> + unsigned long end_pfn = -1ULL;
> +
> +#ifdef CONFIG_X86_32
> + end_pfn = max_low_pfn;
> +#endif
> + return __get_free_all_memory_range(rangep, nodeid, 0, end_pfn);
> +}
> +
> static u64 __init __memblock_x86_memory_in_range(u64 addr, u64 limit, bool get_free)
> {
> int i, count;
> Index: linux-2.6/arch/x86/mm/numa_32.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/mm/numa_32.c
> +++ linux-2.6/arch/x86/mm/numa_32.c
> @@ -326,8 +326,6 @@ static __init unsigned long calculate_nu
> "KVA RAM");
>
> node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
> - remove_active_range(nid, node_remap_start_pfn[nid],
> - node_remap_start_pfn[nid] + size);
> }
> printk(KERN_INFO "Reserving total of %lx pages for numa KVA remap\n",
> reserve_pages);
>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-22 0:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-17 20:47 memblock vs early_res Jeremy Fitzhardinge
2010-09-17 22:47 ` Yinghai Lu
2010-09-17 23:11 ` Jeremy Fitzhardinge
2010-09-18 6:10 ` Yinghai Lu
2010-09-18 6:21 ` Jeremy Fitzhardinge
2010-09-22 0:09 ` Jeremy Fitzhardinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox