From: Yinghai Lu <yinghai@kernel.org> To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, David Miller <davem@davemloft.net> Cc: Johannes Weiner <hannes@cmpxchg.org>, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>, Jan Beulich <jbeulich@novell.com> Subject: [PATCH 11/24] lmb: Add get_free_all_memory_range() Date: Fri, 26 Mar 2010 15:21:41 -0700 [thread overview] Message-ID: <1269642114-16588-12-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1269642114-16588-1-git-send-email-yinghai@kernel.org> get_free_all_memory_range is for CONFIG_NO_BOOTMEM, 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 <yinghai@kernel.org> Cc: Jan Beulich <jbeulich@novell.com> --- include/linux/lmb.h | 2 + mm/lmb.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index f5071e1..9e2dcf5 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -93,6 +93,8 @@ u64 find_lmb_area_size(u64 start, u64 *sizep, u64 align); u64 get_max_mapped(void); void lmb_to_bootmem(u64 start, u64 end); +struct range; +int get_free_all_memory_range(struct range **rangep, int nodeid); #include <asm/lmb.h> diff --git a/mm/lmb.c b/mm/lmb.c index 7a34f4a..f687a42 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -640,7 +640,91 @@ void __init free_lmb(u64 start, u64 end) lmb_free(start, end - start); } -#ifndef CONFIG_NO_BOOTMEM +static __init struct range *find_range_array(int count) +{ + u64 end, size, mem = -1ULL; + struct range *range; + + size = sizeof(struct range) * count; + end = get_max_mapped(); +#ifdef MAX_DMA32_PFN + if (end > (MAX_DMA32_PFN << PAGE_SHIFT)) + mem = find_lmb_area(MAX_DMA32_PFN << PAGE_SHIFT, end, + size, sizeof(struct range)); +#endif + if (mem == -1ULL) + mem = find_lmb_area(0, end, size, sizeof(struct range)); + if (mem == -1ULL) + panic("can not find more space for range free"); + + 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
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org> To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, David Miller <davem@davemloft.net>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Linus Torvalds <torvalds@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org>, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>, Jan Beulich <jbeulich@novell.com> Subject: [PATCH 11/24] lmb: Add get_free_all_memory_range() Date: Fri, 26 Mar 2010 15:21:41 -0700 [thread overview] Message-ID: <1269642114-16588-12-git-send-email-yinghai@kernel.org> (raw) Message-ID: <20100326222141.-twr_ggaPh8RU51mmmvddy3h1itpdZLgpvAmqKCEBeo@z> (raw) In-Reply-To: <1269642114-16588-1-git-send-email-yinghai@kernel.org> get_free_all_memory_range is for CONFIG_NO_BOOTMEM, 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 <yinghai@kernel.org> Cc: Jan Beulich <jbeulich@novell.com> --- include/linux/lmb.h | 2 + mm/lmb.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index f5071e1..9e2dcf5 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -93,6 +93,8 @@ u64 find_lmb_area_size(u64 start, u64 *sizep, u64 align); u64 get_max_mapped(void); void lmb_to_bootmem(u64 start, u64 end); +struct range; +int get_free_all_memory_range(struct range **rangep, int nodeid); #include <asm/lmb.h> diff --git a/mm/lmb.c b/mm/lmb.c index 7a34f4a..f687a42 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -640,7 +640,91 @@ void __init free_lmb(u64 start, u64 end) lmb_free(start, end - start); } -#ifndef CONFIG_NO_BOOTMEM +static __init struct range *find_range_array(int count) +{ + u64 end, size, mem = -1ULL; + struct range *range; + + size = sizeof(struct range) * count; + end = get_max_mapped(); +#ifdef MAX_DMA32_PFN + if (end > (MAX_DMA32_PFN << PAGE_SHIFT)) + mem = find_lmb_area(MAX_DMA32_PFN << PAGE_SHIFT, end, + size, sizeof(struct range)); +#endif + if (mem == -1ULL) + mem = find_lmb_area(0, end, size, sizeof(struct range)); + if (mem == -1ULL) + panic("can not find more space for range free"); + + 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
next prev parent reply other threads:[~2010-03-26 22:21 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-26 22:21 [PATCH -v8 00/24] use lmb with x86 Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 01/24] x86: Make smp_locks end with page alignment Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 23:33 ` Johannes Weiner 2010-03-26 22:21 ` [PATCH 02/24] x86: Make sure free_init_pages() free pages in boundary Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 23:06 ` Johannes Weiner 2010-03-26 23:06 ` Johannes Weiner 2010-03-26 23:45 ` Yinghai Lu 2010-03-27 0:07 ` Johannes Weiner 2010-03-27 0:07 ` Johannes Weiner 2010-03-27 0:17 ` Yinghai Lu 2010-03-27 0:17 ` Yinghai Lu 2010-03-27 1:19 ` [PATCH -v3] " Yinghai Lu 2010-03-28 0:03 ` Johannes Weiner 2010-03-28 0:50 ` Yinghai Lu 2010-03-28 1:01 ` Johannes Weiner 2010-03-28 1:58 ` Yinghai Lu 2010-03-28 23:35 ` [patch v5] x86: page-alin initrd area size Johannes Weiner 2010-03-29 0:41 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 03/24] x86: Do not free zero sized per cpu areas Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 23:42 ` Johannes Weiner 2010-03-26 23:42 ` Johannes Weiner 2010-03-26 23:49 ` Yinghai Lu 2010-03-26 23:49 ` Yinghai Lu 2010-03-26 23:54 ` Johannes Weiner 2010-03-26 23:56 ` Yinghai Lu 2010-03-27 1:18 ` [PATCH -v8] " Yinghai Lu 2010-03-26 22:21 ` [PATCH 04/24] lmb: Move lmb.c to mm/ Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 05/24] lmb: Seperate region array from lmb_region struct Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 06/24] lmb: Add find_lmb_area() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 07/24] lmb: Add reserve_lmb/free_lmb Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 08/24] lmb: Add find_lmb_area_size() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 09/24] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 10/24] lmb: Add lmb_to_bootmem() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu [this message] 2010-03-26 22:21 ` [PATCH 11/24] lmb: Add get_free_all_memory_range() Yinghai Lu 2010-03-26 22:21 ` [PATCH 12/24] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 13/24] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 14/24] lmb: Add find_memory_core_early() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 15/24] lmb: Add find_lmb_area_node() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 16/24] lmb: Add lmb_free_memory_size() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 17/24] lmb: Add lmb_memory_size() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 18/24] lmb: Add reserve_lmb_overlap_ok() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 19/24] x86: Add sanitize_e820_map() Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 20/24] x86: Use lmb to replace early_res Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 21/24] x86: Replace e820_/_early string with lmb_ Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 22/24] x86: Remove not used early_res code Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 23/24] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu 2010-03-26 22:21 ` [PATCH 24/24] x86: Align e820 ram range to page Yinghai Lu 2010-03-26 22:21 ` Yinghai Lu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1269642114-16588-12-git-send-email-yinghai@kernel.org \ --to=yinghai@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=davem@davemloft.net \ --cc=hannes@cmpxchg.org \ --cc=hpa@zytor.com \ --cc=jbeulich@novell.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).