From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 08/29] lmb: Add get_free_all_memory_range() Date: Tue, 30 Mar 2010 04:19:42 -0700 Message-ID: <1269948003-17221-9-git-send-email-yinghai@kernel.org> References: <1269948003-17221-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1269948003-17221-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu , Jan Beulich List-Id: linux-arch.vger.kernel.org get_free_all_memory_range is for CONFIG_NO_BOOTMEM=y, and will be called by free_all_memory_core_early(). It will use early_node_map aka active ranges subtract lmb.reserved to get all free range. -v2: Update with Jan Beulich's patch "fix allocation done in get_free_all_memory_range()", that one is for early_res. Signed-off-by: Yinghai Lu Cc: Jan Beulich --- include/linux/lmb.h | 2 + mm/lmb.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 1e236d1..2ee2cc1 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -92,6 +92,8 @@ u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align); void lmb_to_bootmem(u64 start, u64 end); +struct range; +int get_free_all_memory_range(struct range **rangep, int nodeid); #include diff --git a/mm/lmb.c b/mm/lmb.c index bfe6c5f..134181a 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -630,7 +630,92 @@ void __init lmb_free_area(u64 start, u64 end) __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]); } -#ifndef CONFIG_NO_BOOTMEM +static __init struct range *find_range_array(int count) +{ + u64 end, size, mem; + struct range *range; + + size = sizeof(struct range) * count; + end = lmb.default_alloc_limit; + + mem = __lmb_alloc_base(size, sizeof(struct range), end); + if (mem == 0) + panic("can not find more space for range free"); + + /* + * this range is tempoaray, so free it, it will be overlapped + * because we will not alloccate new buffer before we dump it + */ + lmb_free(mem, size); + + range = __va(mem); + memset(range, 0, size); + + return range; +} + +#ifdef CONFIG_NO_BOOTMEM +static void __init subtract_lmb_reserved(struct range *range, int az) +{ + int i, count; + u64 final_start, final_end; + + /* Take out region array itself at first*/ + if (lmb.reserved.region != lmb_reserved_region) + lmb_free(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); + + count = lmb.reserved.cnt; + + pr_info("Subtract (%d early reservations)\n", count); + + for (i = 0; i < count; i++) { + struct lmb_property *r = &lmb.reserved.region[i]; + pr_info(" #%d [%010llx - %010llx]\n", i, r->base, r->base + r->size); + final_start = PFN_DOWN(r->base); + final_end = PFN_UP(r->base + r->size); + if (final_start >= final_end) + continue; + subtract_range(range, az, final_start, final_end); + } + /* Put region array back ? */ + if (lmb.reserved.region != lmb_reserved_region) + lmb_reserve(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); +} + +int __init get_free_all_memory_range(struct range **rangep, int nodeid) +{ + int count; + struct range *range; + int nr_range; + + count = lmb.reserved.cnt * 2; + + range = find_range_array(count); + nr_range = 0; + + /* + * Use early_node_map[] and lmb.reserved.region to get range array + * 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_lmb_reserved(range, count); + nr_range = clean_sort_range(range, count); + + /* Need to clear it ? */ + if (nodeid == MAX_NUMNODES) { + memset(&lmb.reserved.region[0], 0, sizeof(struct lmb_property) * lmb.reserved.nr_regions); + lmb.reserved.region = NULL; + lmb.reserved.nr_regions = 0; + lmb.reserved.cnt = 0; + } + + *rangep = range; + return nr_range; +} +#else void __init lmb_to_bootmem(u64 start, u64 end) { int i, count; -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet12.oracle.com ([148.87.113.124]:51565 "EHLO rcsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753938Ab0C3L10 (ORCPT ); Tue, 30 Mar 2010 07:27:26 -0400 From: Yinghai Lu Subject: [PATCH 08/29] lmb: Add get_free_all_memory_range() Date: Tue, 30 Mar 2010 04:19:42 -0700 Message-ID: <1269948003-17221-9-git-send-email-yinghai@kernel.org> In-Reply-To: <1269948003-17221-1-git-send-email-yinghai@kernel.org> References: <1269948003-17221-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt , Linus Torvalds Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu , Jan Beulich Message-ID: <20100330111942.ZCGDldsDEp8LO_xamyGLQJcfmLRvBNNl-p8xkEW4Qls@z> get_free_all_memory_range is for CONFIG_NO_BOOTMEM=y, and will be called by free_all_memory_core_early(). It will use early_node_map aka active ranges subtract lmb.reserved to get all free range. -v2: Update with Jan Beulich's patch "fix allocation done in get_free_all_memory_range()", that one is for early_res. Signed-off-by: Yinghai Lu Cc: Jan Beulich --- include/linux/lmb.h | 2 + mm/lmb.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 1e236d1..2ee2cc1 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -92,6 +92,8 @@ u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align); void lmb_to_bootmem(u64 start, u64 end); +struct range; +int get_free_all_memory_range(struct range **rangep, int nodeid); #include diff --git a/mm/lmb.c b/mm/lmb.c index bfe6c5f..134181a 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -630,7 +630,92 @@ void __init lmb_free_area(u64 start, u64 end) __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]); } -#ifndef CONFIG_NO_BOOTMEM +static __init struct range *find_range_array(int count) +{ + u64 end, size, mem; + struct range *range; + + size = sizeof(struct range) * count; + end = lmb.default_alloc_limit; + + mem = __lmb_alloc_base(size, sizeof(struct range), end); + if (mem == 0) + panic("can not find more space for range free"); + + /* + * this range is tempoaray, so free it, it will be overlapped + * because we will not alloccate new buffer before we dump it + */ + lmb_free(mem, size); + + range = __va(mem); + memset(range, 0, size); + + return range; +} + +#ifdef CONFIG_NO_BOOTMEM +static void __init subtract_lmb_reserved(struct range *range, int az) +{ + int i, count; + u64 final_start, final_end; + + /* Take out region array itself at first*/ + if (lmb.reserved.region != lmb_reserved_region) + lmb_free(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); + + count = lmb.reserved.cnt; + + pr_info("Subtract (%d early reservations)\n", count); + + for (i = 0; i < count; i++) { + struct lmb_property *r = &lmb.reserved.region[i]; + pr_info(" #%d [%010llx - %010llx]\n", i, r->base, r->base + r->size); + final_start = PFN_DOWN(r->base); + final_end = PFN_UP(r->base + r->size); + if (final_start >= final_end) + continue; + subtract_range(range, az, final_start, final_end); + } + /* Put region array back ? */ + if (lmb.reserved.region != lmb_reserved_region) + lmb_reserve(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); +} + +int __init get_free_all_memory_range(struct range **rangep, int nodeid) +{ + int count; + struct range *range; + int nr_range; + + count = lmb.reserved.cnt * 2; + + range = find_range_array(count); + nr_range = 0; + + /* + * Use early_node_map[] and lmb.reserved.region to get range array + * 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_lmb_reserved(range, count); + nr_range = clean_sort_range(range, count); + + /* Need to clear it ? */ + if (nodeid == MAX_NUMNODES) { + memset(&lmb.reserved.region[0], 0, sizeof(struct lmb_property) * lmb.reserved.nr_regions); + lmb.reserved.region = NULL; + lmb.reserved.nr_regions = 0; + lmb.reserved.cnt = 0; + } + + *rangep = range; + return nr_range; +} +#else void __init lmb_to_bootmem(u64 start, u64 end) { int i, count; -- 1.6.4.2