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>
Cc: David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
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 12/22] lmb: Add lmb_find_area_node()
Date: Sat, 8 May 2010 08:17:30 -0700 [thread overview]
Message-ID: <1273331860-14325-13-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1273331860-14325-1-git-send-email-yinghai@kernel.org>
It can be used to find NODE_DATA for numa.
Need to make sure early_node_map[] is filled before it is called, otherwise
it will fallback to lmb_find_area(), with node range.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/linux/lmb.h | 1 +
mm/lmb.c | 15 +++++++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index 58db7e9..c75d0c9 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -92,6 +92,7 @@ void lmb_add_memory(u64 start, u64 end);
u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align);
u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align);
+u64 lmb_find_area_node(int nid, u64 start, u64 end, u64 size, u64 align);
void lmb_to_bootmem(u64 start, u64 end);
struct range;
diff --git a/mm/lmb.c b/mm/lmb.c
index b9607fc..36b3f63 100644
--- a/mm/lmb.c
+++ b/mm/lmb.c
@@ -790,6 +790,21 @@ u64 __init __weak lmb_find_area(u64 start, u64 end, u64 size, u64 align)
return LMB_ERROR;
}
/*
+ * Need to call this function after lmb_register_active_regions,
+ * so early_node_map[] is filled already.
+ */
+u64 __init lmb_find_area_node(int nid, u64 start, u64 end, u64 size, u64 align)
+{
+ u64 addr;
+ addr = find_memory_core_early(nid, size, align, start, end);
+ if (addr != LMB_ERROR)
+ return addr;
+
+ /* Fallback, should already have start end within node range */
+ return lmb_find_area(start, end, size, align);
+}
+
+/*
* 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.
*/
--
1.6.4.2
next prev parent reply other threads:[~2010-05-08 15:23 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-08 15:17 [PATCH -v14 00/22] Use lmb with x86 Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 01/22] lmb: Move lmb.c to mm/ Yinghai Lu
2010-05-08 15:17 ` [PATCH 02/22] lmb: Seperate region array from lmb_region struct Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 03/22] lmb: Seperate __lmb_find_base() from __lmb_alloc_base() Yinghai Lu
2010-05-08 15:17 ` [PATCH 04/22] lmb: Add lmb_find_area() Yinghai Lu
2010-05-08 15:17 ` [PATCH 05/22] lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu
2010-05-10 7:10 ` Benjamin Herrenschmidt
2010-05-10 18:09 ` Yinghai
2010-05-10 21:44 ` H. Peter Anvin
2010-05-10 21:53 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 06/22] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-05-08 15:17 ` [PATCH 07/22] lmb: Add lmb_to_bootmem() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-10 3:13 ` Benjamin Herrenschmidt
2010-05-10 4:31 ` Yinghai
2010-05-12 0:03 ` Benjamin Herrenschmidt
2010-05-12 0:50 ` yinghai.lu
2010-05-08 15:17 ` [PATCH 08/22] lmb: Add get_free_all_memory_range() Yinghai Lu
2010-05-10 4:04 ` Benjamin Herrenschmidt
2010-05-10 4:04 ` Benjamin Herrenschmidt
2010-05-10 7:29 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 09/22] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 10/22] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-05-08 15:17 ` [PATCH 11/22] lmb: Add find_memory_core_early() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu [this message]
2010-05-10 6:23 ` [PATCH 12/22] lmb: Add lmb_find_area_node() Benjamin Herrenschmidt
2010-05-10 6:23 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 13/22] lmb: Add lmb_free_memory_size() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-10 6:24 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 14/22] lmb: Add lmb_memory_size() Yinghai Lu
2010-05-10 6:25 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 15/22] lmb: Add lmb_reserve_area_overlap_ok() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-10 6:34 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 16/22] lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 17/22] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-10 6:16 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 18/22] lmb: Add __free/__reserve/__clear_lmb_reserved_region_array() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-10 6:18 ` Benjamin Herrenschmidt
2010-05-08 15:17 ` [PATCH 19/22] x86, lmb: Add lmb_find_area_size() Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 20/22] x86: Use lmb to replace early_res Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 21/22] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-05-08 15:17 ` Yinghai Lu
2010-05-08 15:17 ` [PATCH 22/22] x86: Remove not used early_res code Yinghai Lu
2010-05-10 2:38 ` [PATCH -v14 00/22] Use lmb with x86 Benjamin Herrenschmidt
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=1273331860-14325-13-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.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).