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>
Cc: David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
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 09/35] x86, lmb: Add get_free_all_memory_range()
Date: Thu, 13 May 2010 17:19:30 -0700 [thread overview]
Message-ID: <1273796396-29649-10-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1273796396-29649-1-git-send-email-yinghai@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, and those ranges will convert to slab pages.
-v4: increase range size
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jan Beulich <jbeulich@novell.com>
---
arch/x86/include/asm/lmb.h | 2 +
arch/x86/mm/lmb.c | 110 +++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 111 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
index bc85c1e..80e9e4c 100644
--- a/arch/x86/include/asm/lmb.h
+++ b/arch/x86/include/asm/lmb.h
@@ -9,5 +9,7 @@ void lmb_to_bootmem(u64 start, u64 end);
void lmb_reserve_area(u64 start, u64 end, char *name);
void lmb_free_area(u64 start, u64 end);
void lmb_add_memory(u64 start, u64 end);
+struct range;
+int get_free_all_memory_range(struct range **rangep, int nodeid);
#endif
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index 0dbe05b..65a9356 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -86,7 +86,115 @@ u64 __init lmb_find_area_size(u64 start, u64 *sizep, u64 align)
return LMB_ERROR;
}
-#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.current_limit;
+
+ mem = lmb_find_area(0, end, size, sizeof(struct range));
+ if (mem == -1ULL)
+ panic("can not find more space for range array");
+
+ /*
+ * This range is tempoaray, so don't reserve it, it will not be
+ * overlapped because We will not alloccate new buffer before
+ * We discard this one
+ */
+ 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.regions != lmb_reserved_init_regions)
+ lmb_free(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
+
+ count = lmb.reserved.cnt;
+
+ pr_info("Subtract (%d early reservations)\n", count);
+
+ for (i = 0; i < count; i++) {
+ struct lmb_region *r = &lmb.reserved.regions[i];
+ pr_info(" #%d [%010llx - %010llx]\n", i, (u64)r->base, (u64)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.regions != lmb_reserved_init_regions)
+ lmb_reserve(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
+}
+
+struct count_data {
+ int nr;
+};
+
+static int __init count_work_fn(unsigned long start_pfn,
+ unsigned long end_pfn, void *datax)
+{
+ struct count_data *data = datax;
+
+ data->nr++;
+
+ return 0;
+}
+
+static int __init count_early_node_map(int nodeid)
+{
+ struct count_data data;
+
+ data.nr = 0;
+ work_with_active_regions(nodeid, count_work_fn, &data);
+
+ return data.nr;
+}
+
+int __init get_free_all_memory_range(struct range **rangep, int nodeid)
+{
+ int count;
+ struct range *range;
+ int nr_range;
+
+ count = (lmb.reserved.cnt + count_early_node_map(nodeid)) * 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.regions[0], 0, sizeof(struct lmb_region) * lmb.reserved.max);
+ lmb.reserved.regions = NULL;
+ lmb.reserved.max = 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-05-14 0:24 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-14 0:19 [PATCH -v16 00/35] Use lmb with x86 Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 01/35] lmb: prepare x86 to use lmb to replace early_res Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:12 ` Benjamin Herrenschmidt
2010-05-14 2:12 ` Benjamin Herrenschmidt
2010-05-14 6:19 ` Yinghai
2010-05-14 8:09 ` Benjamin Herrenschmidt
2010-05-14 16:23 ` Yinghai Lu
2010-05-17 18:03 ` H. Peter Anvin
2010-05-17 22:02 ` Benjamin Herrenschmidt
2010-05-17 22:12 ` H. Peter Anvin
2010-05-14 7:03 ` Yinghai
2010-05-14 0:19 ` [PATCH 02/35] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-05-14 0:19 ` [PATCH 03/35] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:14 ` Benjamin Herrenschmidt
2010-05-14 6:21 ` Yinghai
2010-05-14 8:10 ` Benjamin Herrenschmidt
2010-05-14 8:10 ` Benjamin Herrenschmidt
2010-05-14 16:24 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 04/35] lmb: Add lmb_find_area() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:16 ` Benjamin Herrenschmidt
2010-05-14 6:25 ` Yinghai
2010-05-14 8:12 ` Benjamin Herrenschmidt
2010-05-14 16:28 ` Yinghai Lu
2010-05-14 16:28 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 05/35] x86, lmb: Add lmb_find_area_size() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:20 ` Benjamin Herrenschmidt
2010-05-14 6:28 ` Yinghai
2010-05-14 8:13 ` Benjamin Herrenschmidt
2010-05-14 16:33 ` Yinghai Lu
2010-05-14 22:20 ` Benjamin Herrenschmidt
2010-05-14 22:20 ` Benjamin Herrenschmidt
2010-05-14 0:19 ` [PATCH 06/35] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 07/35] x86, lmb: Add lmb_to_bootmem() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 08/35] x86,lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:26 ` Benjamin Herrenschmidt
2010-05-14 6:30 ` Yinghai
2010-05-14 8:15 ` Benjamin Herrenschmidt
2010-05-14 0:19 ` Yinghai Lu [this message]
2010-05-14 0:19 ` [PATCH 10/35] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-05-14 0:19 ` [PATCH 11/35] lmb: Add find_memory_core_early() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:29 ` Benjamin Herrenschmidt
2010-05-14 6:34 ` Yinghai
2010-05-14 8:16 ` Benjamin Herrenschmidt
2010-05-14 2:30 ` Benjamin Herrenschmidt
2010-05-14 6:39 ` Yinghai
2010-05-14 8:19 ` Benjamin Herrenschmidt
2010-05-14 8:30 ` David Miller
2010-05-14 16:44 ` Yinghai Lu
2010-05-14 22:34 ` Benjamin Herrenschmidt
2010-05-14 22:34 ` Benjamin Herrenschmidt
2010-05-14 23:51 ` lmb type features Yinghai
2010-05-17 0:46 ` Benjamin Herrenschmidt
2010-05-17 6:06 ` Yinghai
2010-05-14 0:19 ` [PATCH 12/35] x86, lmb: Add lmb_find_area_node() Yinghai Lu
2010-05-14 0:19 ` [PATCH 13/35] x86, lmb: Add lmb_free_memory_size() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:31 ` Benjamin Herrenschmidt
2010-05-14 6:42 ` Yinghai
2010-05-14 8:21 ` Benjamin Herrenschmidt
2010-05-14 16:37 ` Yinghai Lu
2010-05-14 22:20 ` Benjamin Herrenschmidt
2010-05-14 0:19 ` [PATCH 14/35] x86, lmb: Add lmb_memory_size() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 2:31 ` Benjamin Herrenschmidt
2010-05-14 0:19 ` [PATCH 15/35] x86, lmb: Add lmb_reserve_area_overlap_ok() Yinghai Lu
2010-05-14 2:32 ` Benjamin Herrenschmidt
2010-05-14 6:44 ` Yinghai
2010-05-14 8:30 ` Benjamin Herrenschmidt
2010-05-14 16:40 ` Yinghai Lu
2010-05-14 22:30 ` Benjamin Herrenschmidt
2010-05-15 7:32 ` Ingo Molnar
2010-05-15 7:32 ` Ingo Molnar
2010-05-17 0:39 ` Benjamin Herrenschmidt
2010-05-17 6:11 ` Yinghai
2010-05-17 6:40 ` H. Peter Anvin
2010-05-17 7:24 ` Benjamin Herrenschmidt
2010-05-17 17:18 ` Yinghai
2010-05-17 18:53 ` H. Peter Anvin
2010-05-17 22:01 ` Benjamin Herrenschmidt
2010-05-17 22:01 ` Benjamin Herrenschmidt
2010-05-17 22:19 ` Yinghai
2010-05-17 22:26 ` H. Peter Anvin
2010-05-17 22:26 ` H. Peter Anvin
2010-05-14 0:19 ` [PATCH 16/35] x86, lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-05-14 0:19 ` [PATCH 17/35] x86, lmb: Add x86 version of __lmb_find_area() Yinghai Lu
2010-05-14 2:34 ` Benjamin Herrenschmidt
2010-05-14 6:47 ` Yinghai
2010-05-14 8:31 ` Benjamin Herrenschmidt
2010-05-14 16:41 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 18/35] x86: Use lmb to replace early_res Yinghai Lu
2010-05-14 0:19 ` [PATCH 19/35] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-05-14 0:19 ` [PATCH 20/35] x86: Remove not used early_res code Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 21/35] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 22/35] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 23/35] mm: move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2010-05-14 0:19 ` [PATCH 24/35] lmb: Move __alloc_memory_core_early() to nobootmem.c Yinghai Lu
2010-05-14 2:36 ` Benjamin Herrenschmidt
2010-05-14 0:19 ` [PATCH 25/35] x86: Have nobootmem version setup_bootmem_allocator() Yinghai Lu
2010-05-14 0:19 ` [PATCH 26/35] x86: Put 64 bit numa node memmap above 16M Yinghai Lu
2010-05-14 0:19 ` [PATCH 27/35] swiotlb: Use page alignment for early buffer allocation Yinghai Lu
2010-05-14 0:19 ` [PATCH 28/35] x86: Add sanitize_e820_map() Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 29/35] x86: Change e820_saved to __initdata Yinghai Lu
2010-05-14 0:19 ` [PATCH 30/35] x86: Align e820 ram range to page Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 31/35] x86: Use wake_system_ram_range() instead of e820_any_mapped() in agp path Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 32/35] x86: Add get_centaur_ram_top() Yinghai Lu
2010-05-14 0:19 ` [PATCH 33/35] x86: Change e820_any_mapped() to __init Yinghai Lu
2010-05-14 0:19 ` Yinghai Lu
2010-05-14 0:19 ` [PATCH 34/35] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Yinghai Lu
2010-05-14 0:19 ` [PATCH 35/35] x86: make e820 to be __initdata Yinghai Lu
2010-05-14 0:19 ` 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=1273796396-29649-10-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.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 \
--cc=torvalds@linux-foundation.org \
/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: link
Be 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).