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: 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>
Subject: [PATCH 13/25] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size()
Date: Tue, 22 Jun 2010 10:26:42 -0700 [thread overview]
Message-ID: <1277227614-11581-14-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1277227614-11581-1-git-send-email-yinghai@kernel.org>
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>
---
arch/x86/include/asm/lmb.h | 4 ++
arch/x86/mm/lmb.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
index 63bb597..763fb52 100644
--- a/arch/x86/include/asm/lmb.h
+++ b/arch/x86/include/asm/lmb.h
@@ -11,4 +11,8 @@ void lmb_free_range(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);
+
#endif
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index 3954103..b7e42bc 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -238,3 +238,70 @@ void __init lmb_free_range(u64 start, u64 end)
lmb_free(start, end - start);
}
+
+/*
+ * 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_region *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;
+ struct lmb_region *r;
+
+ for_each_lmb(memory, r)
+ if (lmb_find_active_region(r, 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;
+ struct lmb_region *r;
+
+ for_each_lmb(memory, r)
+ if (lmb_find_active_region(r, start_pfn, last_pfn,
+ &ei_startpfn, &ei_endpfn))
+ ram += ei_endpfn - ei_startpfn;
+
+ return end - start - ((u64)ram << PAGE_SHIFT);
+}
+
--
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>
Cc: 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>
Subject: [PATCH 13/25] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size()
Date: Tue, 22 Jun 2010 10:26:42 -0700 [thread overview]
Message-ID: <1277227614-11581-14-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100622172642.AZ4Y5oIXbziBpPT6l31YoHwpa960aVv7TbmSJDjJlwc@z> (raw)
In-Reply-To: <1277227614-11581-1-git-send-email-yinghai@kernel.org>
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>
---
arch/x86/include/asm/lmb.h | 4 ++
arch/x86/mm/lmb.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
index 63bb597..763fb52 100644
--- a/arch/x86/include/asm/lmb.h
+++ b/arch/x86/include/asm/lmb.h
@@ -11,4 +11,8 @@ void lmb_free_range(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);
+
#endif
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index 3954103..b7e42bc 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -238,3 +238,70 @@ void __init lmb_free_range(u64 start, u64 end)
lmb_free(start, end - start);
}
+
+/*
+ * 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_region *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;
+ struct lmb_region *r;
+
+ for_each_lmb(memory, r)
+ if (lmb_find_active_region(r, 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;
+ struct lmb_region *r;
+
+ for_each_lmb(memory, r)
+ if (lmb_find_active_region(r, start_pfn, last_pfn,
+ &ei_startpfn, &ei_endpfn))
+ ram += ei_endpfn - ei_startpfn;
+
+ return end - start - ((u64)ram << PAGE_SHIFT);
+}
+
--
1.6.4.2
next prev parent reply other threads:[~2010-06-22 17:26 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-22 17:26 [PATCH -v19 00/25] Use lmb with x86 Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 01/25] lmb: lmb_find_base() should return LMB_ERROR on failing path Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 02/25] lmb: Prepare x86 to use lmb to replace early_res Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 03/25] lmb: Print new doubled array location info Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 17:44 ` Bjorn Helgaas
2010-06-29 18:38 ` H. Peter Anvin
2010-06-29 18:48 ` Bjorn Helgaas
2010-06-29 20:03 ` Yinghai Lu
2010-06-29 20:58 ` Bjorn Helgaas
2010-06-22 17:26 ` [PATCH 04/25] lmb: Export LMB_ERROR again Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 05/25] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 18:45 ` Sam Ravnborg
2010-06-22 18:45 ` Sam Ravnborg
2010-06-22 17:26 ` [PATCH 06/25] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 07/25] lmb: Add lmb_find_in_range() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 08/25] x86, lmb: Add lmb_find_in_range_size() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 09/25] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 10/25] x86, lmb: Add lmb_to_bootmem() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 17:47 ` Bjorn Helgaas
2010-06-22 17:26 ` [PATCH 11/25] x86,lmb: Add lmb_reserve_range/lmb_free_range Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 17:52 ` Bjorn Helgaas
2010-06-22 17:26 ` [PATCH 12/25] x86, lmb: Add get_free_all_memory_range() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 17:56 ` Bjorn Helgaas
2010-06-22 17:26 ` Yinghai Lu [this message]
2010-06-22 17:26 ` [PATCH 13/25] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-06-22 17:26 ` [PATCH 14/25] lmb: Add find_memory_core_early() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 15/25] x86, lmb: Add lmb_find_in_range_node() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 16/25] x86, lmb: Add lmb_free_memory_in_range() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 17/25] x86, lmb: Add lmb_memory_in_range() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 18/25] x86, lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 17:58 ` Bjorn Helgaas
2010-06-22 17:26 ` [PATCH 19/25] x86: Use lmb to replace early_res Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 20/25] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 21/25] x86: Remove not used early_res code Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 22/25] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 23/25] x86: Have nobootmem version setup_bootmem_allocator() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 18:02 ` Bjorn Helgaas
2010-06-22 17:26 ` [PATCH 24/25] x86: Put 64 bit numa node memmap above 16M Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` [PATCH 25/25] swiotlb: Use page alignment for early buffer allocation Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-29 18:06 ` [PATCH -v19 00/25] Use lmb with x86 Bjorn Helgaas
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=1277227614-11581-14-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 \
--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).