[PATCH 11/39] lmb: Add get_free_all_memory_range()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Thursday, April 8, 2010 - 11:03 pm

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.

-v3: use __lmb_find_base() to get range free buffer.

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 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 <asm/lmb.h>
 
diff --git a/mm/lmb.c b/mm/lmb.c
index ee3d945..f11df14 100644
--- a/mm/lmb.c
+++ b/mm/lmb.c
@@ -630,7 +630,91 @@ 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_find_base(size, sizeof(struct range), end);
+	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.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

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH -v12 00/39] use lmb with x86, Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 02/39] x86: Add sanitize_e820_map(), Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 03/39] x86: Align e820 ram range to page, Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 04/39] lmb: Move lmb.c to mm/, Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 07/39] lmb: Add lmb_find_area(), Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 10/39] lmb: Add lmb_to_bootmem(), Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 11/39] lmb: Add get_free_all_memory_range(), Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 14/39] lmb: Add find_memory_core_early(), Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 22/39] x86, lmb: Add lmb_find_area_size(), Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 24/39] x86: Use lmb to replace early_res, Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 27/39] x86, lmb: turn off ARCH_LMB_FIND_AREA, Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 28/39] x86: Remove not used early_res code, Yinghai Lu, (Thu Apr 8, 11:03 pm)
[PATCH 32/39] x86: Add get_centaur_ram_top(), Yinghai Lu, (Thu Apr 8, 11:04 pm)
[PATCH 35/39] x86: make e820 to be __initdata, Yinghai Lu, (Thu Apr 8, 11:04 pm)
Re: [PATCH -v12 00/39] use lmb with x86, Benjamin Herrenschmidt, (Mon Apr 12, 8:41 pm)
Re: [PATCH 04/39] lmb: Move lmb.c to mm/, Benjamin Herrenschmidt, (Mon Apr 12, 8:52 pm)
Re: [PATCH 05/39] lmb: Seperate region array from lmb_regi ..., Benjamin Herrenschmidt, (Mon Apr 12, 8:56 pm)
Re: [PATCH 07/39] lmb: Add lmb_find_area(), Benjamin Herrenschmidt, (Mon Apr 12, 9:05 pm)
Re: [PATCH 08/39] lmb: Add lmb_reserve_area/lmb_free_area, Benjamin Herrenschmidt, (Mon Apr 12, 9:15 pm)
Re: [PATCH 26/39] nobootmem: use lmb.default_alloc_limit i ..., Benjamin Herrenschmidt, (Mon Apr 12, 9:23 pm)
Re: [PATCH 07/39] lmb: Add lmb_find_area(), Yinghai, (Mon Apr 12, 9:29 pm)
Re: [PATCH 07/39] lmb: Add lmb_find_area(), Benjamin Herrenschmidt, (Mon Apr 12, 10:07 pm)
Re: [PATCH 26/39] nobootmem: use lmb.default_alloc_limit i ..., Benjamin Herrenschmidt, (Mon Apr 12, 10:13 pm)
Re: [PATCH 07/39] lmb: Add lmb_find_area(), Yinghai, (Mon Apr 12, 10:26 pm)
Re: [PATCH 07/39] lmb: Add lmb_find_area(), H. Peter Anvin, (Mon Apr 12, 10:46 pm)
Re: [PATCH 07/39] lmb: Add lmb_find_area(), Benjamin Herrenschmidt, (Tue Apr 13, 3:15 am)