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 14/25] lmb: Add find_memory_core_early()
Date: Tue, 22 Jun 2010 10:26:43 -0700 [thread overview]
Message-ID: <1277227614-11581-15-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1277227614-11581-1-git-send-email-yinghai@kernel.org>
According to node range in early_node_map[] with __lmb_find_in_range
to find free range.
Will be used by lmb_find_in_range_node()
lmb_find_in_range_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 | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4238a9c..a85bb08 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1164,6 +1164,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 431214b..37f30fc 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>
@@ -3612,6 +3613,41 @@ 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;
+ u64 final_start, final_end;
+
+ ei_last = early_node_map[i].end_pfn;
+ ei_last <<= PAGE_SHIFT;
+ ei_start = early_node_map[i].start_pfn;
+ ei_start <<= PAGE_SHIFT;
+
+ final_start = max(ei_start, goal);
+ final_end = min(ei_last, limit);
+
+ if (final_start >= final_end)
+ continue;
+
+ addr = lmb_find_in_range(final_start, final_end, size, align);
+
+ if (addr == LMB_ERROR)
+ continue;
+
+ return addr;
+ }
+
+ return LMB_ERROR;
+}
+#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>
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 14/25] lmb: Add find_memory_core_early()
Date: Tue, 22 Jun 2010 10:26:43 -0700 [thread overview]
Message-ID: <1277227614-11581-15-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100622172643.CzKNA3jXVsTTgFmr5xZBfY9Ui_QdGD-PI8raNiiycZI@z> (raw)
In-Reply-To: <1277227614-11581-1-git-send-email-yinghai@kernel.org>
According to node range in early_node_map[] with __lmb_find_in_range
to find free range.
Will be used by lmb_find_in_range_node()
lmb_find_in_range_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 | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4238a9c..a85bb08 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1164,6 +1164,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 431214b..37f30fc 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>
@@ -3612,6 +3613,41 @@ 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;
+ u64 final_start, final_end;
+
+ ei_last = early_node_map[i].end_pfn;
+ ei_last <<= PAGE_SHIFT;
+ ei_start = early_node_map[i].start_pfn;
+ ei_start <<= PAGE_SHIFT;
+
+ final_start = max(ei_start, goal);
+ final_end = min(ei_last, limit);
+
+ if (final_start >= final_end)
+ continue;
+
+ addr = lmb_find_in_range(final_start, final_end, size, align);
+
+ if (addr == LMB_ERROR)
+ continue;
+
+ return addr;
+ }
+
+ return LMB_ERROR;
+}
+#endif
+
int __init add_from_early_node_map(struct range *range, int az,
int nr_range, int nid)
{
--
1.6.4.2
next prev parent reply other threads:[~2010-06-22 17:28 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 ` [PATCH 13/25] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu
2010-06-22 17:26 ` Yinghai Lu [this message]
2010-06-22 17:26 ` [PATCH 14/25] lmb: Add find_memory_core_early() 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-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 \
--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).