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 06/31] lmb: Add find_lmb_area() Date: Sun, 28 Mar 2010 19:42:59 -0700 [thread overview] Message-ID: <1269830604-26214-7-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> It will try find area according with size/align in specified range (start, end). Need use it find correct buffer for new lmb.reserved.region. also make it more easy for x86 to use lmb. x86 early_res is using find/reserve pattern instead of alloc. find_lmb_area() will hohor goal When we need temperary 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. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 4 ++ mm/lmb.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index e14ea8d..05234bd 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 __find_lmb_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align); +u64 find_lmb_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 65b62dc..d5d5dc4 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 @@ -546,3 +550,80 @@ int lmb_find(struct lmb_property *res) } return -1; } + +static int __init find_overlapped_early(u64 start, u64 end) +{ + int i; + struct lmb_property *r; + + for (i = 0; i < lmb.reserved.cnt && lmb.reserved.region[i].size; i++) { + r = &lmb.reserved.region[i]; + if (end > r->base && start < (r->base + r->size)) + break; + } + + return i; +} + +/* Check for already reserved areas */ +static inline bool __init bad_addr(u64 *addrp, u64 size, u64 align) +{ + int i; + u64 addr = *addrp; + bool changed = false; + struct lmb_property *r; +again: + i = find_overlapped_early(addr, addr + size); + r = &lmb.reserved.region[i]; + if (i < lmb.reserved.cnt && r->size) { + *addrp = addr = round_up(r->base + r->size, align); + changed = true; + goto again; + } + return changed; +} + +u64 __init __find_lmb_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align) +{ + u64 addr, last; + + addr = round_up(ei_start, align); + if (addr < start) + addr = round_up(start, align); + if (addr >= ei_last) + goto out; + while (bad_addr(&addr, size, align) && addr+size <= ei_last) + ; + last = addr + size; + if (last > ei_last) + goto out; + if (last > end) + goto out; + + return addr; + +out: + return -1ULL; +} + +/* + * Find a free area with specified alignment in a specific range. + */ +u64 __init find_lmb_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 = __find_lmb_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 06/31] lmb: Add find_lmb_area() Date: Sun, 28 Mar 2010 19:42:59 -0700 [thread overview] Message-ID: <1269830604-26214-7-git-send-email-yinghai@kernel.org> (raw) Message-ID: <20100329024259.c09iwamTa2Q_g_g7ssuyb8DDH4ESQlQVAIkSpeBjfnE@z> (raw) In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> It will try find area according with size/align in specified range (start, end). Need use it find correct buffer for new lmb.reserved.region. also make it more easy for x86 to use lmb. x86 early_res is using find/reserve pattern instead of alloc. find_lmb_area() will hohor goal When we need temperary 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. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 4 ++ mm/lmb.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index e14ea8d..05234bd 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 __find_lmb_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align); +u64 find_lmb_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 65b62dc..d5d5dc4 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 @@ -546,3 +550,80 @@ int lmb_find(struct lmb_property *res) } return -1; } + +static int __init find_overlapped_early(u64 start, u64 end) +{ + int i; + struct lmb_property *r; + + for (i = 0; i < lmb.reserved.cnt && lmb.reserved.region[i].size; i++) { + r = &lmb.reserved.region[i]; + if (end > r->base && start < (r->base + r->size)) + break; + } + + return i; +} + +/* Check for already reserved areas */ +static inline bool __init bad_addr(u64 *addrp, u64 size, u64 align) +{ + int i; + u64 addr = *addrp; + bool changed = false; + struct lmb_property *r; +again: + i = find_overlapped_early(addr, addr + size); + r = &lmb.reserved.region[i]; + if (i < lmb.reserved.cnt && r->size) { + *addrp = addr = round_up(r->base + r->size, align); + changed = true; + goto again; + } + return changed; +} + +u64 __init __find_lmb_area(u64 ei_start, u64 ei_last, u64 start, u64 end, + u64 size, u64 align) +{ + u64 addr, last; + + addr = round_up(ei_start, align); + if (addr < start) + addr = round_up(start, align); + if (addr >= ei_last) + goto out; + while (bad_addr(&addr, size, align) && addr+size <= ei_last) + ; + last = addr + size; + if (last > ei_last) + goto out; + if (last > end) + goto out; + + return addr; + +out: + return -1ULL; +} + +/* + * Find a free area with specified alignment in a specific range. + */ +u64 __init find_lmb_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 = __find_lmb_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-29 2:46 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-29 2:42 [PATCH -v9 00/31] use lmb with x86 Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 01/31] x86: Make smp_locks end with page alignment Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 02/31] x86: Make sure free_init_pages() free pages in boundary Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 16:57 ` Ingo Molnar 2010-03-29 16:59 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 03/31] x86: Do not free zero sized per cpu areas Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 04/31] lmb: Move lmb.c to mm/ Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` [PATCH 05/31] lmb: Seperate region array from lmb_region struct Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu 2010-03-29 2:42 ` Yinghai Lu [this message] 2010-03-29 2:42 ` [PATCH 06/31] lmb: Add find_lmb_area() Yinghai Lu 2010-03-29 2:43 ` [PATCH 07/31] lmb: Add reserve_lmb/free_lmb Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 12:22 ` Michael Ellerman 2010-03-29 16:45 ` Yinghai Lu 2010-03-29 22:20 ` Michael Ellerman 2010-03-29 22:37 ` Yinghai Lu 2010-03-29 23:34 ` Benjamin Herrenschmidt 2010-03-29 23:53 ` Yinghai Lu 2010-03-30 4:13 ` Michael Ellerman 2010-03-30 4:21 ` Yinghai Lu 2010-03-30 5:29 ` Benjamin Herrenschmidt 2010-03-30 5:40 ` Yinghai Lu 2010-03-30 5:24 ` Benjamin Herrenschmidt 2010-03-29 23:31 ` Benjamin Herrenschmidt 2010-03-30 0:03 ` Yinghai Lu 2010-03-30 5:26 ` Benjamin Herrenschmidt 2010-03-30 6:12 ` Yinghai Lu 2010-03-30 6:46 ` Michael Ellerman 2010-03-30 6:57 ` Yinghai Lu 2010-03-30 21:30 ` Benjamin Herrenschmidt 2010-03-30 22:42 ` Yinghai Lu 2010-03-29 21:49 ` Benjamin Herrenschmidt 2010-03-29 2:43 ` [PATCH 08/31] lmb: Add find_lmb_area_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 09/31] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 10/31] lmb: Add lmb_to_bootmem() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 11/31] lmb: Add get_free_all_memory_range() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 12/31] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 13/31] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 14/31] lmb: Add find_memory_core_early() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 15/31] lmb: Add find_lmb_area_node() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 16/31] lmb: Add lmb_free_memory_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 17/31] lmb: Add lmb_memory_size() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 18/31] lmb: Add reserve_lmb_overlap_ok() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 19/31] lmb: Use lmb_debug to control debug message print out Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 20/31] lmb: Add __NOT_KEEP_LMB to put lmb code to .init Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 12:07 ` Michael Ellerman 2010-03-29 16:20 ` Yinghai Lu 2010-03-29 18:34 ` David Miller 2010-03-29 18:39 ` Yinghai Lu 2010-03-29 19:11 ` David Miller 2010-03-29 21:44 ` Benjamin Herrenschmidt 2010-03-29 2:43 ` [PATCH 21/31] x86: Add sanitize_e820_map() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 22/31] x86: Use lmb to replace early_res Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 23/31] x86: Replace e820_/_early string with lmb_ Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 24/31] x86: Remove not used early_res code Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 25/31] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 26/31] x86: Align e820 ram range to page Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 27/31] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 28/31] x86: Add get_centaur_ram_top() Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 29/31] x86: Make e820_any_mapped to __init Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 30/31] x86: Use walk_system_ream_range()instead of e820.map directly Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 2:43 ` [PATCH 31/31] x86: make e820 to be __initdata Yinghai Lu 2010-03-29 2:43 ` Yinghai Lu 2010-03-29 12:22 ` [PATCH -v9 00/31] use lmb with x86 Michael Ellerman 2010-03-29 12:22 ` Michael Ellerman 2010-03-29 16:52 ` Yinghai Lu 2010-03-29 20:39 ` Yinghai Lu 2010-03-29 22:10 ` Michael Ellerman 2010-03-29 22:17 ` Yinghai Lu 2010-03-29 22:32 ` Michael Ellerman 2010-03-29 22:32 ` Michael Ellerman 2010-03-29 22:41 ` Yinghai Lu 2010-03-29 23:33 ` Benjamin Herrenschmidt 2010-03-29 23:29 ` Benjamin Herrenschmidt 2010-03-29 23:47 ` 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=1269830604-26214-7-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).