linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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/37] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size()
Date: Fri, 14 May 2010 12:45:39 -0700	[thread overview]
Message-ID: <1273866363-14249-14-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1273866363-14249-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          |   69 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
index 80e9e4c..d0ae19f 100644
--- a/arch/x86/include/asm/lmb.h
+++ b/arch/x86/include/asm/lmb.h
@@ -12,4 +12,8 @@ void lmb_add_memory(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 9a5e21e..11b76d0 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -252,3 +252,72 @@ void __init lmb_free_area(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;
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt; i++)
+		if (lmb_find_active_region(&lmb.memory.regions[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.regions[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

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/37] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size()
Date: Fri, 14 May 2010 12:45:39 -0700	[thread overview]
Message-ID: <1273866363-14249-14-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100514194539.3tIn6hplqa-0ftniuW-p5udaqNbuQGMjNnCChizjFAg@z> (raw)
In-Reply-To: <1273866363-14249-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          |   69 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h
index 80e9e4c..d0ae19f 100644
--- a/arch/x86/include/asm/lmb.h
+++ b/arch/x86/include/asm/lmb.h
@@ -12,4 +12,8 @@ void lmb_add_memory(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 9a5e21e..11b76d0 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -252,3 +252,72 @@ void __init lmb_free_area(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;
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt; i++)
+		if (lmb_find_active_region(&lmb.memory.regions[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.regions[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


  parent reply	other threads:[~2010-05-14 19:45 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-14 19:45 [PATCH -v17 00/37] Use lmb with x86 Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 01/37] lmb: lmb_find_base() should return LMB_ERROR on failing path Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 02/37] lmb: Prepare x86 to use lmb to replace early_res Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 03/37] lmb: Print new doubled array location info Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 04/37] lmb: Export LMB_ERROR again Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 05/37] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 06/37] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 07/37] lmb: Add lmb_find_area() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 22:39   ` Benjamin Herrenschmidt
2010-05-14 23:08     ` Yinghai
2010-05-15  0:11       ` Yinghai
2010-05-17  0:48       ` Benjamin Herrenschmidt
2010-05-17  6:09         ` Yinghai
2010-05-14 19:45 ` [PATCH 08/37] x86, lmb: Add lmb_find_area_size() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 09/37] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 10/37] x86, lmb: Add lmb_to_bootmem() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 11/37] x86,lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 12/37] x86, lmb: Add get_free_all_memory_range() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu [this message]
2010-05-14 19:45   ` [PATCH 13/37] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-05-14 19:45 ` [PATCH 14/37] lmb: Add find_memory_core_early() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 15/37] x86, lmb: Add lmb_find_area_node() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 16/37] x86, lmb: Add lmb_free_memory_size() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 17/37] x86, lmb: Add lmb_memory_size() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 18/37] x86, lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 19/37] x86, lmb: Add x86 version of __lmb_find_area() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 20/37] x86: Use lmb to replace early_res Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 21/37] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 22/37] x86: Remove not used early_res code Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 23/37] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 24/37] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 25/37] mm: move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 26/37] lmb: Move __alloc_memory_core_early() to nobootmem.c Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 27/37] x86: Have nobootmem version setup_bootmem_allocator() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 28/37] x86: Put 64 bit numa node memmap above 16M Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 29/37] swiotlb: Use page alignment for early buffer allocation Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 30/37] x86: Add sanitize_e820_map() Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 31/37] x86: Change e820_saved to __initdata Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 32/37] x86: Align e820 ram range to page Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 33/37] x86: Use wake_system_ram_range() instead of e820_any_mapped() in agp path Yinghai Lu
2010-05-14 19:45   ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 34/37] x86: Add get_centaur_ram_top() Yinghai Lu
2010-05-14 19:46   ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 35/37] x86: Change e820_any_mapped() to __init Yinghai Lu
2010-05-14 19:46   ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 36/37] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Yinghai Lu
2010-05-14 19:46   ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 37/37] x86: make e820 to be __initdata Yinghai Lu
2010-05-14 19:46   ` Yinghai Lu
  -- strict thread matches above, loose matches on Subject: below --
2010-06-16  5:42 [PATCH -v18 00/37] Use lmb with x86 Yinghai Lu
2010-06-16  5:42 ` [PATCH 13/37] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-06-16  5:42   ` 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=1273866363-14249-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).