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 05/33] lmb: Add lmb_find_area() Date: Tue, 30 Mar 2010 19:16:50 -0700 [thread overview] Message-ID: <1270001838-15857-6-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org> It will try find area according with size/align in specified range (start, end). lmb_find_area() will honor goal/limit. also make it more easy for x86 to use lmb. x86 early_res is using find/reserve pattern instead of alloc. When we need temporaray buff for range array etc for range work, if We are using lmb_alloc(), We will need to add some post fix code for buffer that is used by range array, because it is in the lmb.reserved already. and have to call extra lmb_free(). -v2: Change name to lmb_find_area() according to Michael Ellerman -v3: Add generic weak version __lmb_find_area() Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 4 ++++ mm/lmb.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index e14ea8d..4cf2f3b 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -83,6 +83,10 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr) lmb_size_pages(type, region_nr); } +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); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index 392d805..6739e4f 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -11,9 +11,13 @@ */ #include <linux/kernel.h> +#include <linux/types.h> #include <linux/init.h> #include <linux/bitops.h> #include <linux/lmb.h> +#include <linux/bootmem.h> +#include <linux/mm.h> +#include <linux/range.h> #define LMB_ALLOC_ANYWHERE 0 @@ -559,3 +563,48 @@ int lmb_find(struct lmb_property *res) } return -1; } + +u64 __init __weak __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align) +{ + u64 final_start, final_end; + u64 mem; + + final_start = max(ei_start, start); + final_end = min(ei_last, end); + + if (final_start >= final_end) + return -1ULL; + + mem = __lmb_find_base(size, align, final_end); + + if (mem == -1ULL) + return -1ULL; + + lmb_free(mem, size); + if (mem >= final_start) + return mem; + + return -1ULL; +} + +/* + * Find a free area with specified alignment in a specific range. + */ +u64 __init lmb_find_area(u64 start, u64 end, u64 size, u64 align) +{ + int i; + + for (i = 0; i < lmb.memory.cnt; i++) { + u64 ei_start = lmb.memory.region[i].base; + u64 ei_last = ei_start + lmb.memory.region[i].size; + u64 addr; + + addr = __lmb_find_area(ei_start, ei_last, start, end, + size, align); + + if (addr != -1ULL) + return addr; + } + return -1ULL; +} -- 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 05/33] lmb: Add lmb_find_area() Date: Tue, 30 Mar 2010 19:16:50 -0700 [thread overview] Message-ID: <1270001838-15857-6-git-send-email-yinghai@kernel.org> (raw) Message-ID: <20100331021650.VlN7C5lLMb2AwuKMO8aFVSo52Zwo-1D7gJJLQSrx0bk@z> (raw) In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org> It will try find area according with size/align in specified range (start, end). lmb_find_area() will honor goal/limit. also make it more easy for x86 to use lmb. x86 early_res is using find/reserve pattern instead of alloc. When we need temporaray buff for range array etc for range work, if We are using lmb_alloc(), We will need to add some post fix code for buffer that is used by range array, because it is in the lmb.reserved already. and have to call extra lmb_free(). -v2: Change name to lmb_find_area() according to Michael Ellerman -v3: Add generic weak version __lmb_find_area() Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 4 ++++ mm/lmb.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index e14ea8d..4cf2f3b 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -83,6 +83,10 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr) lmb_size_pages(type, region_nr); } +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); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index 392d805..6739e4f 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -11,9 +11,13 @@ */ #include <linux/kernel.h> +#include <linux/types.h> #include <linux/init.h> #include <linux/bitops.h> #include <linux/lmb.h> +#include <linux/bootmem.h> +#include <linux/mm.h> +#include <linux/range.h> #define LMB_ALLOC_ANYWHERE 0 @@ -559,3 +563,48 @@ int lmb_find(struct lmb_property *res) } return -1; } + +u64 __init __weak __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align) +{ + u64 final_start, final_end; + u64 mem; + + final_start = max(ei_start, start); + final_end = min(ei_last, end); + + if (final_start >= final_end) + return -1ULL; + + mem = __lmb_find_base(size, align, final_end); + + if (mem == -1ULL) + return -1ULL; + + lmb_free(mem, size); + if (mem >= final_start) + return mem; + + return -1ULL; +} + +/* + * Find a free area with specified alignment in a specific range. + */ +u64 __init lmb_find_area(u64 start, u64 end, u64 size, u64 align) +{ + int i; + + for (i = 0; i < lmb.memory.cnt; i++) { + u64 ei_start = lmb.memory.region[i].base; + u64 ei_last = ei_start + lmb.memory.region[i].size; + u64 addr; + + addr = __lmb_find_area(ei_start, ei_last, start, end, + size, align); + + if (addr != -1ULL) + return addr; + } + return -1ULL; +} -- 1.6.4.2
next prev parent reply other threads:[~2010-03-31 2:16 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-31 2:16 [PATCH -v11 00/33] use lmb with x86 Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 01/33] x86: Make e820_remove_range() to handle all covered case Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 02/33] lmb: Move lmb.c to mm/ Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 03/33] lmb: Seperate region array from lmb_region struct Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 04/33] lmb: Seperate __lmb_find_base() from __lmb_alloc_base() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu [this message] 2010-03-31 2:16 ` [PATCH 05/33] lmb: Add lmb_find_area() Yinghai Lu 2010-03-31 2:16 ` [PATCH 06/33] lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-04-07 23:35 ` Michael Ellerman 2010-04-07 23:36 ` Yinghai 2010-03-31 2:16 ` [PATCH 07/33] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 08/33] lmb: Add lmb_to_bootmem() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 09/33] lmb: Add get_free_all_memory_range() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 10/33] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 11/33] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 12/33] lmb: Add find_memory_core_early() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 13/33] lmb: Add lmb_find_area_node() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:16 ` [PATCH 14/33] lmb: Add lmb_free_memory_size() Yinghai Lu 2010-03-31 2:16 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 15/33] lmb: Add lmb_memory_size() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 16/33] lmb: Add lmb_reserve_area_overlap_ok() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 17/33] lmb: Use lmb_debug to control debug message print out Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 18/33] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 19/33] x86: Add sanitize_e820_map() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 20/33] x86, lmb: Add lmb_find_area_size() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 21/33] x86, lmb: Add x86 version of __lmb_find_area() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 22/33] x86: Use lmb to replace early_res Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 23/33] x86: Replace e820_/_early string with lmb_ Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 24/33] nobootmem: use lmb.default_alloc_limit in alloc_bootmem path Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-04-07 23:38 ` Michael Ellerman 2010-04-07 23:40 ` Yinghai 2010-03-31 2:17 ` [PATCH 26/33] x86: Remove not used early_res code Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 27/33] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 28/33] x86: Align e820 ram range to page Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 29/33] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 30/33] x86: Add get_centaur_ram_top() Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 31/33] x86: Change e820_any_mapped() to __init Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 32/33] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Yinghai Lu 2010-03-31 2:17 ` Yinghai Lu 2010-03-31 2:17 ` [PATCH 33/33] x86: make e820 to be __initdata Yinghai Lu 2010-03-31 2:17 ` 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=1270001838-15857-6-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: linkBe 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).