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: Johannes Weiner <hannes@cmpxchg.org>,
	linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 14/31] lmb: Add find_memory_core_early()
Date: Sun, 28 Mar 2010 19:43:07 -0700	[thread overview]
Message-ID: <1269830604-26214-15-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org>

According to node range in early_node_map[] with __find_lmb_area
to find free range.

Will be used by find_lmb_area_node()

find_lmb_area_node will be used to find right buffer for NODE_DATA

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

diff --git a/include/linux/mm.h b/include/linux/mm.h
index c8442b6..8070bd8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1159,6 +1159,8 @@ extern void free_bootmem_with_active_regions(int nid,
 						unsigned long max_low_pfn);
 int add_from_early_node_map(struct range *range, int az,
 				   int nr_range, int nid);
+u64 __init find_memory_core_early(int nid, u64 size, u64 align,
+					u64 goal, u64 limit);
 void *__alloc_memory_core_early(int nodeid, u64 size, u64 align,
 				 u64 goal, u64 limit);
 typedef int (*work_fn_t)(unsigned long, unsigned long, void *);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d03c946..faae23a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -21,6 +21,7 @@
 #include <linux/pagemap.h>
 #include <linux/jiffies.h>
 #include <linux/bootmem.h>
+#include <linux/lmb.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/kmemcheck.h>
@@ -3393,6 +3394,34 @@ void __init free_bootmem_with_active_regions(int nid,
 	}
 }
 
+#ifdef CONFIG_HAVE_LMB
+u64 __init find_memory_core_early(int nid, u64 size, u64 align,
+					u64 goal, u64 limit)
+{
+	int i;
+
+	/* Need to go over early_node_map to find out good range for node */
+	for_each_active_range_index_in_nid(i, nid) {
+		u64 addr;
+		u64 ei_start, ei_last;
+
+		ei_last = early_node_map[i].end_pfn;
+		ei_last <<= PAGE_SHIFT;
+		ei_start = early_node_map[i].start_pfn;
+		ei_start <<= PAGE_SHIFT;
+		addr = __find_lmb_area(ei_start, ei_last,
+					 goal, limit, size, align);
+
+		if (addr == -1ULL)
+			continue;
+
+		return addr;
+	}
+
+	return -1ULL;
+}
+#endif
+
 int __init add_from_early_node_map(struct range *range, int az,
 				   int nr_range, int nid)
 {
-- 
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>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
	linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 14/31] lmb: Add find_memory_core_early()
Date: Sun, 28 Mar 2010 19:43:07 -0700	[thread overview]
Message-ID: <1269830604-26214-15-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100329024307.MF0xmDvYdBA4IWx4QKMhOlcbcUeWeh6auaHjyRQiMJc@z> (raw)
In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org>

According to node range in early_node_map[] with __find_lmb_area
to find free range.

Will be used by find_lmb_area_node()

find_lmb_area_node will be used to find right buffer for NODE_DATA

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

diff --git a/include/linux/mm.h b/include/linux/mm.h
index c8442b6..8070bd8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1159,6 +1159,8 @@ extern void free_bootmem_with_active_regions(int nid,
 						unsigned long max_low_pfn);
 int add_from_early_node_map(struct range *range, int az,
 				   int nr_range, int nid);
+u64 __init find_memory_core_early(int nid, u64 size, u64 align,
+					u64 goal, u64 limit);
 void *__alloc_memory_core_early(int nodeid, u64 size, u64 align,
 				 u64 goal, u64 limit);
 typedef int (*work_fn_t)(unsigned long, unsigned long, void *);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d03c946..faae23a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -21,6 +21,7 @@
 #include <linux/pagemap.h>
 #include <linux/jiffies.h>
 #include <linux/bootmem.h>
+#include <linux/lmb.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/kmemcheck.h>
@@ -3393,6 +3394,34 @@ void __init free_bootmem_with_active_regions(int nid,
 	}
 }
 
+#ifdef CONFIG_HAVE_LMB
+u64 __init find_memory_core_early(int nid, u64 size, u64 align,
+					u64 goal, u64 limit)
+{
+	int i;
+
+	/* Need to go over early_node_map to find out good range for node */
+	for_each_active_range_index_in_nid(i, nid) {
+		u64 addr;
+		u64 ei_start, ei_last;
+
+		ei_last = early_node_map[i].end_pfn;
+		ei_last <<= PAGE_SHIFT;
+		ei_start = early_node_map[i].start_pfn;
+		ei_start <<= PAGE_SHIFT;
+		addr = __find_lmb_area(ei_start, ei_last,
+					 goal, limit, size, align);
+
+		if (addr == -1ULL)
+			continue;
+
+		return addr;
+	}
+
+	return -1ULL;
+}
+#endif
+
 int __init add_from_early_node_map(struct range *range, int az,
 				   int nr_range, int nid)
 {
-- 
1.6.4.2


  parent reply	other threads:[~2010-03-29  2:43 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-29  2:42 [PATCH -v9 00/31] use lmb with x86 Yinghai Lu
2010-03-29  2:42 ` Yinghai Lu
2010-03-29  2:42 ` [PATCH 01/31] x86: Make smp_locks end with page alignment Yinghai Lu
2010-03-29  2:42   ` Yinghai Lu
2010-03-29  2:42 ` [PATCH 02/31] x86: Make sure free_init_pages() free pages in boundary Yinghai Lu
2010-03-29  2:42   ` Yinghai Lu
2010-03-29 16:57   ` Ingo Molnar
2010-03-29 16:59     ` Yinghai Lu
2010-03-29  2:42 ` [PATCH 03/31] x86: Do not free zero sized per cpu areas Yinghai Lu
2010-03-29  2:42   ` Yinghai Lu
2010-03-29  2:42 ` [PATCH 04/31] lmb: Move lmb.c to mm/ Yinghai Lu
2010-03-29  2:42   ` Yinghai Lu
2010-03-29  2:42 ` [PATCH 05/31] lmb: Seperate region array from lmb_region struct Yinghai Lu
2010-03-29  2:42   ` Yinghai Lu
2010-03-29  2:42 ` [PATCH 06/31] lmb: Add find_lmb_area() Yinghai Lu
2010-03-29  2:42   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 07/31] lmb: Add reserve_lmb/free_lmb Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29 12:22   ` Michael Ellerman
2010-03-29 16:45     ` Yinghai Lu
2010-03-29 22:20       ` Michael Ellerman
2010-03-29 22:37         ` Yinghai Lu
2010-03-29 23:34           ` Benjamin Herrenschmidt
2010-03-29 23:53             ` Yinghai Lu
2010-03-30  4:13               ` Michael Ellerman
2010-03-30  4:21                 ` Yinghai Lu
2010-03-30  5:29                   ` Benjamin Herrenschmidt
2010-03-30  5:40                     ` Yinghai Lu
2010-03-30  5:24               ` Benjamin Herrenschmidt
2010-03-29 23:31         ` Benjamin Herrenschmidt
2010-03-30  0:03           ` Yinghai Lu
2010-03-30  5:26             ` Benjamin Herrenschmidt
2010-03-30  6:12               ` Yinghai Lu
2010-03-30  6:46                 ` Michael Ellerman
2010-03-30  6:57                   ` Yinghai Lu
2010-03-30 21:30                 ` Benjamin Herrenschmidt
2010-03-30 22:42                   ` Yinghai Lu
2010-03-29 21:49     ` Benjamin Herrenschmidt
2010-03-29  2:43 ` [PATCH 08/31] lmb: Add find_lmb_area_size() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 09/31] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 10/31] lmb: Add lmb_to_bootmem() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 11/31] lmb: Add get_free_all_memory_range() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 12/31] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 13/31] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` Yinghai Lu [this message]
2010-03-29  2:43   ` [PATCH 14/31] lmb: Add find_memory_core_early() Yinghai Lu
2010-03-29  2:43 ` [PATCH 15/31] lmb: Add find_lmb_area_node() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 16/31] lmb: Add lmb_free_memory_size() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 17/31] lmb: Add lmb_memory_size() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 18/31] lmb: Add reserve_lmb_overlap_ok() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 19/31] lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 20/31] lmb: Add __NOT_KEEP_LMB to put lmb code to .init Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29 12:07   ` Michael Ellerman
2010-03-29 16:20     ` Yinghai Lu
2010-03-29 18:34       ` David Miller
2010-03-29 18:39         ` Yinghai Lu
2010-03-29 19:11           ` David Miller
2010-03-29 21:44             ` Benjamin Herrenschmidt
2010-03-29  2:43 ` [PATCH 21/31] x86: Add sanitize_e820_map() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 22/31] x86: Use lmb to replace early_res Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 23/31] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 24/31] x86: Remove not used early_res code Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 25/31] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 26/31] x86: Align e820 ram range to page Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 27/31] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 28/31] x86: Add get_centaur_ram_top() Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 29/31] x86: Make e820_any_mapped to __init Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 30/31] x86: Use walk_system_ream_range()instead of e820.map directly Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29  2:43 ` [PATCH 31/31] x86: make e820 to be __initdata Yinghai Lu
2010-03-29  2:43   ` Yinghai Lu
2010-03-29 12:22 ` [PATCH -v9 00/31] use lmb with x86 Michael Ellerman
2010-03-29 12:22   ` Michael Ellerman
2010-03-29 16:52   ` Yinghai Lu
2010-03-29 20:39     ` Yinghai Lu
2010-03-29 22:10     ` Michael Ellerman
2010-03-29 22:17       ` Yinghai Lu
2010-03-29 22:32         ` Michael Ellerman
2010-03-29 22:32           ` Michael Ellerman
2010-03-29 22:41           ` Yinghai Lu
2010-03-29 23:33           ` Benjamin Herrenschmidt
2010-03-29 23:29         ` Benjamin Herrenschmidt
2010-03-29 23:47           ` 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=1269830604-26214-15-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 \
    /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).