2013-03-10 06:33:17

by Jiang Liu

Subject: [PATCH v2, part1 25/29] mm/x86: use common help functions to free reserved pages

Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
---
arch/x86/mm/init.c | 5 +----
arch/x86/mm/init_64.c | 5 ++---
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 4903a03..4a705e6 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -516,11 +516,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);

for (; addr < end; addr += PAGE_SIZE) {
- ClearPageReserved(virt_to_page(addr));
- init_page_count(virt_to_page(addr));
memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
- free_page(addr);
- totalram_pages++;
+ free_reserved_page(virt_to_page(addr));
}
#endif
}
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 474e28f..2ef81f1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1067,10 +1067,9 @@ void __init mem_init(void)

/* clear_bss() already clear the empty_zero_page */

- reservedpages = 0;
-
- /* this will put all low memory onto the freelists */
register_page_bootmem_info();
+
+ /* this will put all memory onto the freelists */
totalram_pages = free_all_bootmem();

absent_pages = absent_pages_in_range(0, max_pfn);
--
1.7.9.5

2013-03-13 05:38:56

by Yasuaki Ishimatsu

Subject: Re: [PATCH v2, part1 25/29] mm/x86: use common help functions to free reserved pages

Hi Jiang,

2013/03/10 15:27, Jiang Liu wrote:
> Use common help functions to free reserved pages.
>
> Signed-off-by: Jiang Liu <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: "H. Peter Anvin" <[email protected]>
> ---
> arch/x86/mm/init.c | 5 +----
> arch/x86/mm/init_64.c | 5 ++---
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
> index 4903a03..4a705e6 100644
> --- a/arch/x86/mm/init.c
> +++ b/arch/x86/mm/init.c
> @@ -516,11 +516,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)

> printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
>
> for (; addr < end; addr += PAGE_SIZE) {
> - ClearPageReserved(virt_to_page(addr));
> - init_page_count(virt_to_page(addr));
> memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
> - free_page(addr);
> - totalram_pages++;
> + free_reserved_page(virt_to_page(addr));
> }

If I don't misread your code, avobe codes can replace to free_reserved_area()
as follow:

free_reserved_area(addr, end, POISON_FREE_INITMEM, what)

Am I wrong?

Thanks,
Yasuaki Ishimatsu

> #endif
> }
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index 474e28f..2ef81f1 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -1067,10 +1067,9 @@ void __init mem_init(void)
>
> /* clear_bss() already clear the empty_zero_page */
>
> - reservedpages = 0;
> -
> - /* this will put all low memory onto the freelists */
> register_page_bootmem_info();
> +
> + /* this will put all memory onto the freelists */
> totalram_pages = free_all_bootmem();
>
> absent_pages = absent_pages_in_range(0, max_pfn);
>

2013-03-13 16:45:46

by Jiang Liu

Subject: Re: [PATCH v2, part1 25/29] mm/x86: use common help functions to free reserved pages

On 03/13/2013 01:38 PM, Yasuaki Ishimatsu wrote:
> Hi Jiang,
>
> 2013/03/10 15:27, Jiang Liu wrote:
>> Use common help functions to free reserved pages.
>>
>> Signed-off-by: Jiang Liu <[email protected]>
>> Cc: Thomas Gleixner <[email protected]>
>> Cc: Ingo Molnar <[email protected]>
>> Cc: "H. Peter Anvin" <[email protected]>
>> ---
>> arch/x86/mm/init.c | 5 +----
>> arch/x86/mm/init_64.c | 5 ++---
>> 2 files changed, 3 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
>> index 4903a03..4a705e6 100644
>> --- a/arch/x86/mm/init.c
>> +++ b/arch/x86/mm/init.c
>> @@ -516,11 +516,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
>
>> printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
>>
>> for (; addr < end; addr += PAGE_SIZE) {
>> - ClearPageReserved(virt_to_page(addr));
>> - init_page_count(virt_to_page(addr));
>> memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
>> - free_page(addr);
>> - totalram_pages++;
>> + free_reserved_page(virt_to_page(addr));
>> }
>
> If I don't misread your code, avobe codes can replace to free_reserved_area()
> as follow:
>
> free_reserved_area(addr, end, POISON_FREE_INITMEM, what)
>
> Am I wrong?
Hi Yasuaki,
Good catch, will enhance it in following patches.
Thanks!

>
> Thanks,
> Yasuaki Ishimatsu
>
>> #endif
>> }
>> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
>> index 474e28f..2ef81f1 100644
>> --- a/arch/x86/mm/init_64.c
>> +++ b/arch/x86/mm/init_64.c
>> @@ -1067,10 +1067,9 @@ void __init mem_init(void)
>>
>> /* clear_bss() already clear the empty_zero_page */
>>
>> - reservedpages = 0;
>> -
>> - /* this will put all low memory onto the freelists */
>> register_page_bootmem_info();
>> +
>> + /* this will put all memory onto the freelists */
>> totalram_pages = free_all_bootmem();
>>
>> absent_pages = absent_pages_in_range(0, max_pfn);
>>
>
>