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>, Be Cc: Johannes Weiner <hannes@cmpxchg.org>, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org> Subject: [PATCH 10/31] lmb: Add lmb_to_bootmem() Date: Sun, 28 Mar 2010 19:43:03 -0700 [thread overview] Message-ID: <1269830604-26214-11-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> lmb_to_bootmem() will reserve lmb.reserved.region in bootmem We can use it to with all arches that support lmb. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 2 ++ mm/lmb.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 7301072..f5071e1 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -92,6 +92,8 @@ u64 find_lmb_area(u64 start, u64 end, u64 size, u64 align); u64 find_lmb_area_size(u64 start, u64 *sizep, u64 align); u64 get_max_mapped(void); +void lmb_to_bootmem(u64 start, u64 end); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index a91f48d..71a45b4 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -640,6 +640,38 @@ void __init free_lmb(u64 start, u64 end) lmb_free(start, end - start); } +#ifndef CONFIG_NO_BOOTMEM +void __init lmb_to_bootmem(u64 start, u64 end) +{ + int i, count; + u64 final_start, final_end; + + /* Take out region array itself */ + 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("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end); + for (i = 0; i < count; i++) { + struct lmb_property *r = &lmb.reserved.region[i]; + pr_info(" #%d [%010llx - %010llx] ", i, r->base, r->base + r->size); + final_start = max(start, r->base); + final_end = min(end, r->base + r->size); + if (final_start >= final_end) { + pr_cont("\n"); + continue; + } + pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end); + reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT); + } + /* Clear them to avoid misusing ? */ + 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; +} +#endif + static int __init find_overlapped_early(u64 start, u64 end) { int i; -- 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> Subject: [PATCH 10/31] lmb: Add lmb_to_bootmem() Date: Sun, 28 Mar 2010 19:43:03 -0700 [thread overview] Message-ID: <1269830604-26214-11-git-send-email-yinghai@kernel.org> (raw) Message-ID: <20100329024303.s1Sc3PFRp04kIvP2RGG-8O4xVrJu1452vBfQ_rMafH4@z> (raw) In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> lmb_to_bootmem() will reserve lmb.reserved.region in bootmem We can use it to with all arches that support lmb. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 2 ++ mm/lmb.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 7301072..f5071e1 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -92,6 +92,8 @@ u64 find_lmb_area(u64 start, u64 end, u64 size, u64 align); u64 find_lmb_area_size(u64 start, u64 *sizep, u64 align); u64 get_max_mapped(void); +void lmb_to_bootmem(u64 start, u64 end); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index a91f48d..71a45b4 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -640,6 +640,38 @@ void __init free_lmb(u64 start, u64 end) lmb_free(start, end - start); } +#ifndef CONFIG_NO_BOOTMEM +void __init lmb_to_bootmem(u64 start, u64 end) +{ + int i, count; + u64 final_start, final_end; + + /* Take out region array itself */ + 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("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end); + for (i = 0; i < count; i++) { + struct lmb_property *r = &lmb.reserved.region[i]; + pr_info(" #%d [%010llx - %010llx] ", i, r->base, r->base + r->size); + final_start = max(start, r->base); + final_end = min(end, r->base + r->size); + if (final_start >= final_end) { + pr_cont("\n"); + continue; + } + pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end); + reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT); + } + /* Clear them to avoid misusing ? */ + 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; +} +#endif + static int __init find_overlapped_early(u64 start, u64 end) { int i; -- 1.6.4.2
next prev parent reply other threads:[~2010-03-29 2:46 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-29 2:42 [PATCH -v9 00/31] use lmb with x86 Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 01/31] x86: Make smp_locks end with page alignment Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 02/31] x86: Make sure free_init_pages() free pages in boundary Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 16:57 ` Ingo Molnar 2010-03-29 16:59 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 03/31] x86: Do not free zero sized per cpu areas Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 04/31] lmb: Move lmb.c to mm/ Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 05/31] lmb: Seperate region array from lmb_region struct Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 06/31] lmb: Add find_lmb_area() Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 07/31] lmb: Add reserve_lmb/free_lmb Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 12:22 ` Michael Ellerman 2010-03-29 16:45 ` Yinghai Lu 2010-03-29 22:20 ` Michael Ellerman 2010-03-29 22:37 ` Yinghai Lu 2010-03-29 23:34 ` Benjamin Herrenschmidt 2010-03-29 23:53 ` Yinghai Lu 2010-03-30 4:13 ` Michael Ellerman 2010-03-30 4:21 ` Yinghai Lu 2010-03-30 5:29 ` Benjamin Herrenschmidt 2010-03-30 5:40 ` Yinghai Lu 2010-03-30 5:24 ` Benjamin Herrenschmidt 2010-03-29 23:31 ` Benjamin Herrenschmidt 2010-03-30 0:03 ` Yinghai Lu 2010-03-30 5:26 ` Benjamin Herrenschmidt 2010-03-30 6:12 ` Yinghai Lu 2010-03-30 6:46 ` Michael Ellerman 2010-03-30 6:57 ` Yinghai Lu 2010-03-30 21:30 ` Benjamin Herrenschmidt 2010-03-30 22:42 ` Yinghai Lu 2010-03-29 21:49 ` Benjamin Herrenschmidt 2010-03-29 2:43 ` [PATCH 08/31] lmb: Add find_lmb_area_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 09/31] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu [this message] 2010-03-29 2:43 ` [PATCH 10/31] lmb: Add lmb_to_bootmem() Yinghai Lu 2010-03-29 2:43 ` [PATCH 11/31] lmb: Add get_free_all_memory_range() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 12/31] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 13/31] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 14/31] lmb: Add find_memory_core_early() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 15/31] lmb: Add find_lmb_area_node() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 16/31] lmb: Add lmb_free_memory_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 17/31] lmb: Add lmb_memory_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 18/31] lmb: Add reserve_lmb_overlap_ok() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 19/31] lmb: Use lmb_debug to control debug message print out Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 20/31] lmb: Add __NOT_KEEP_LMB to put lmb code to .init Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 12:07 ` Michael Ellerman 2010-03-29 16:20 ` Yinghai Lu 2010-03-29 18:34 ` David Miller 2010-03-29 18:39 ` Yinghai Lu 2010-03-29 19:11 ` David Miller 2010-03-29 21:44 ` Benjamin Herrenschmidt 2010-03-29 2:43 ` [PATCH 21/31] x86: Add sanitize_e820_map() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 22/31] x86: Use lmb to replace early_res Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 23/31] x86: Replace e820_/_early string with lmb_ Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 24/31] x86: Remove not used early_res code Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 25/31] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 26/31] x86: Align e820 ram range to page Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 27/31] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 28/31] x86: Add get_centaur_ram_top() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 29/31] x86: Make e820_any_mapped to __init Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 30/31] x86: Use walk_system_ream_range()instead of e820.map directly Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 31/31] x86: make e820 to be __initdata Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 12:22 ` [PATCH -v9 00/31] use lmb with x86 Michael Ellerman 2010-03-29 12:22 ` Michael Ellerman 2010-03-29 16:52 ` Yinghai Lu 2010-03-29 20:39 ` Yinghai Lu 2010-03-29 22:10 ` Michael Ellerman 2010-03-29 22:17 ` Yinghai Lu 2010-03-29 22:32 ` Michael Ellerman 2010-03-29 22:32 ` Michael Ellerman 2010-03-29 22:41 ` Yinghai Lu 2010-03-29 23:33 ` Benjamin Herrenschmidt 2010-03-29 23:29 ` Benjamin Herrenschmidt 2010-03-29 23:47 ` 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=1269830604-26214-11-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=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).