[PATCH 10/33] lmb: Add lmb_register_active_regions() and lmb_hole_size()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Tuesday, March 30, 2010 - 7:16 pm

lmb_register_active_regions() will be used to fill early_node_map,
the result will be lmb.memory.region AND numa data

lmb_hole_size will be used to find hole size on lmb.memory.region
with specified range.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 include/linux/lmb.h |    4 +++
 mm/lmb.c            |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 0 deletions(-)

diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index 2ee2cc1..cf8f7ca 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -95,6 +95,10 @@ void lmb_to_bootmem(u64 start, u64 end);
 struct range;
 int get_free_all_memory_range(struct range **rangep, int nodeid);
 
+void lmb_register_active_regions(int nid, unsigned long start_pfn,
+					 unsigned long last_pfn);
+u64 lmb_hole_size(u64 start, u64 end);
+
 #include <asm/lmb.h>
 
 #endif /* __KERNEL__ */
diff --git a/mm/lmb.c b/mm/lmb.c
index 62efdb4..72448a5 100644
--- a/mm/lmb.c
+++ b/mm/lmb.c
@@ -790,3 +790,71 @@ u64 __init lmb_find_area(u64 start, u64 end, u64 size, u64 align)
 	}
 	return -1ULL;
 }
+/*
+ * Finds an active region in the address range from start_pfn to last_pfn and
+ * returns its range in ei_startpfn and ei_endpfn for the lmb entry.
+ */
+static int __init lmb_find_active_region(const struct lmb_property *ei,
+				  unsigned long start_pfn,
+				  unsigned long last_pfn,
+				  unsigned long *ei_startpfn,
+				  unsigned long *ei_endpfn)
+{
+	u64 align = PAGE_SIZE;
+
+	*ei_startpfn = round_up(ei->base, align) >> PAGE_SHIFT;
+	*ei_endpfn = round_down(ei->base + ei->size, align) >> PAGE_SHIFT;
+
+	/* Skip map entries smaller than a page */
+	if (*ei_startpfn >= *ei_endpfn)
+		return 0;
+
+	/* Skip if map is outside the node */
+	if (*ei_endpfn <= start_pfn || *ei_startpfn >= last_pfn)
+		return 0;
+
+	/* Check for overlaps */
+	if (*ei_startpfn < start_pfn)
+		*ei_startpfn = start_pfn;
+	if (*ei_endpfn > last_pfn)
+		*ei_endpfn = last_pfn;
+
+	return 1;
+}
+
+/* Walk the lmb.memory map and register active regions within a node */
+void __init lmb_register_active_regions(int nid, unsigned long start_pfn,
+					 unsigned long last_pfn)
+{
+	unsigned long ei_startpfn;
+	unsigned long ei_endpfn;
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt; i++)
+		if (lmb_find_active_region(&lmb.memory.region[i],
+					    start_pfn, last_pfn,
+					    &ei_startpfn, &ei_endpfn))
+			add_active_range(nid, ei_startpfn, ei_endpfn);
+}
+
+/*
+ * Find the hole size (in bytes) in the memory range.
+ * @start: starting address of the memory range to scan
+ * @end: ending address of the memory range to scan
+ */
+u64 __init lmb_hole_size(u64 start, u64 end)
+{
+	unsigned long start_pfn = start >> PAGE_SHIFT;
+	unsigned long last_pfn = end >> PAGE_SHIFT;
+	unsigned long ei_startpfn, ei_endpfn, ram = 0;
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt; i++) {
+		if (lmb_find_active_region(&lmb.memory.region[i],
+					    start_pfn, last_pfn,
+					    &ei_startpfn, &ei_endpfn))
+			ram += ei_endpfn - ei_startpfn;
+	}
+	return end - start - ((u64)ram << PAGE_SHIFT);
+}
+
-- 
1.6.4.2

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

Messages in current thread:
[PATCH -v11 00/33] use lmb with x86, Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 02/33] lmb: Move lmb.c to mm/, Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 05/33] lmb: Add lmb_find_area(), Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 08/33] lmb: Add lmb_to_bootmem(), Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 09/33] lmb: Add get_free_all_memory_range(), Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 10/33] lmb: Add lmb_register_active_regions() and l ..., Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 12/33] lmb: Add find_memory_core_early(), Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 13/33] lmb: Add lmb_find_area_node(), Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 14/33] lmb: Add lmb_free_memory_size(), Yinghai Lu, (Tue Mar 30, 7:16 pm)
[PATCH 15/33] lmb: Add lmb_memory_size(), Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 19/33] x86: Add sanitize_e820_map(), Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 20/33] x86, lmb: Add lmb_find_area_size(), Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 22/33] x86: Use lmb to replace early_res, Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA, Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 26/33] x86: Remove not used early_res code, Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 28/33] x86: Align e820 ram range to page, Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 30/33] x86: Add get_centaur_ram_top(), Yinghai Lu, (Tue Mar 30, 7:17 pm)
[PATCH 33/33] x86: make e820 to be __initdata, Yinghai Lu, (Tue Mar 30, 7:17 pm)
Re: [PATCH 06/33] lmb: Add lmb_reserve_area/lmb_free_area, Michael Ellerman, (Wed Apr 7, 4:35 pm)
Re: [PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA, Michael Ellerman, (Wed Apr 7, 4:38 pm)