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/24] lmb: Add find_memory_core_early()
Date: Fri, 26 Mar 2010 15:21:44 -0700	[thread overview]
Message-ID: <1269642114-16588-15-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1269642114-16588-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/24] lmb: Add find_memory_core_early()
Date: Fri, 26 Mar 2010 15:21:44 -0700	[thread overview]
Message-ID: <1269642114-16588-15-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100326222144.mOibsqj_mYCt0psn2s08Wp_yqlI-DuGjuzrxUvMgQIU@z> (raw)
In-Reply-To: <1269642114-16588-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-26 22:24 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-26 22:21 [PATCH -v8 00/24] use lmb with x86 Yinghai Lu
2010-03-26 22:21 ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 01/24] x86: Make smp_locks end with page alignment Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 23:33   ` Johannes Weiner
2010-03-26 22:21 ` [PATCH 02/24] x86: Make sure free_init_pages() free pages in boundary Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 23:06   ` Johannes Weiner
2010-03-26 23:06     ` Johannes Weiner
2010-03-26 23:45     ` Yinghai Lu
2010-03-27  0:07       ` Johannes Weiner
2010-03-27  0:07         ` Johannes Weiner
2010-03-27  0:17         ` Yinghai Lu
2010-03-27  0:17           ` Yinghai Lu
2010-03-27  1:19         ` [PATCH -v3] " Yinghai Lu
2010-03-28  0:03           ` Johannes Weiner
2010-03-28  0:50             ` Yinghai Lu
2010-03-28  1:01               ` Johannes Weiner
2010-03-28  1:58                 ` Yinghai Lu
2010-03-28 23:35                   ` [patch v5] x86: page-alin initrd area size Johannes Weiner
2010-03-29  0:41                     ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 03/24] x86: Do not free zero sized per cpu areas Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 23:42   ` Johannes Weiner
2010-03-26 23:42     ` Johannes Weiner
2010-03-26 23:49     ` Yinghai Lu
2010-03-26 23:49       ` Yinghai Lu
2010-03-26 23:54       ` Johannes Weiner
2010-03-26 23:56         ` Yinghai Lu
2010-03-27  1:18   ` [PATCH -v8] " Yinghai Lu
2010-03-26 22:21 ` [PATCH 04/24] lmb: Move lmb.c to mm/ Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 05/24] lmb: Seperate region array from lmb_region struct Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 06/24] lmb: Add find_lmb_area() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 07/24] lmb: Add reserve_lmb/free_lmb Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 08/24] lmb: Add find_lmb_area_size() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 09/24] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 10/24] lmb: Add lmb_to_bootmem() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 11/24] lmb: Add get_free_all_memory_range() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 12/24] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 13/24] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` Yinghai Lu [this message]
2010-03-26 22:21   ` [PATCH 14/24] lmb: Add find_memory_core_early() Yinghai Lu
2010-03-26 22:21 ` [PATCH 15/24] lmb: Add find_lmb_area_node() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 16/24] lmb: Add lmb_free_memory_size() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 17/24] lmb: Add lmb_memory_size() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 18/24] lmb: Add reserve_lmb_overlap_ok() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 19/24] x86: Add sanitize_e820_map() Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 20/24] x86: Use lmb to replace early_res Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 21/24] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 22/24] x86: Remove not used early_res code Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 23/24] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-03-26 22:21   ` Yinghai Lu
2010-03-26 22:21 ` [PATCH 24/24] x86: Align e820 ram range to page Yinghai Lu
2010-03-26 22:21   ` 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=1269642114-16588-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).