From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 14/31] lmb: Add find_memory_core_early() Date: Sun, 28 Mar 2010 19:43:07 -0700 Message-ID: <1269830604-26214-15-git-send-email-yinghai@kernel.org> References: <1269830604-26214-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Be Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu List-Id: linux-arch.vger.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 --- 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 #include #include +#include #include #include #include @@ -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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet11.oracle.com ([148.87.113.123]:19484 "EHLO rcsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755953Ab0C2Cqv (ORCPT ); Sun, 28 Mar 2010 22:46:51 -0400 From: Yinghai Lu Subject: [PATCH 14/31] lmb: Add find_memory_core_early() Date: Sun, 28 Mar 2010 19:43:07 -0700 Message-ID: <1269830604-26214-15-git-send-email-yinghai@kernel.org> In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> References: <1269830604-26214-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt , Linus Torvalds Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100329024307.MF0xmDvYdBA4IWx4QKMhOlcbcUeWeh6auaHjyRQiMJc@z> 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 --- 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 #include #include +#include #include #include #include @@ -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