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 10/33] lmb: Add lmb_register_active_regions() and lmb_hole_size() Date: Tue, 30 Mar 2010 19:16:55 -0700 [thread overview] Message-ID: <1270001838-15857-11-git-send-email-yinghai@kernel.org> (raw) In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org> lmb_register_active_regions() will be used to fill early_node_map, the result will be lmb.memory.region AND numa data lmb_hole_size will be used to find hole size on lmb.memory.region with specified range. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 4 +++ mm/lmb.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 2ee2cc1..cf8f7ca 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -95,6 +95,10 @@ void lmb_to_bootmem(u64 start, u64 end); struct range; int get_free_all_memory_range(struct range **rangep, int nodeid); +void lmb_register_active_regions(int nid, unsigned long start_pfn, + unsigned long last_pfn); +u64 lmb_hole_size(u64 start, u64 end); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index 62efdb4..72448a5 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -790,3 +790,71 @@ u64 __init lmb_find_area(u64 start, u64 end, u64 size, u64 align) } return -1ULL; } +/* + * 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. + */ +static int __init lmb_find_active_region(const struct lmb_property *ei, + unsigned long start_pfn, + unsigned long last_pfn, + unsigned long *ei_startpfn, + unsigned long *ei_endpfn) +{ + u64 align = PAGE_SIZE; + + *ei_startpfn = round_up(ei->base, align) >> PAGE_SHIFT; + *ei_endpfn = round_down(ei->base + ei->size, align) >> PAGE_SHIFT; + + /* Skip map entries smaller than a page */ + if (*ei_startpfn >= *ei_endpfn) + return 0; + + /* Skip if map is outside the node */ + if (*ei_endpfn <= start_pfn || *ei_startpfn >= last_pfn) + return 0; + + /* Check for overlaps */ + if (*ei_startpfn < start_pfn) + *ei_startpfn = start_pfn; + if (*ei_endpfn > last_pfn) + *ei_endpfn = last_pfn; + + return 1; +} + +/* Walk the lmb.memory map and register active regions within a node */ +void __init lmb_register_active_regions(int nid, unsigned long start_pfn, + unsigned long last_pfn) +{ + unsigned long ei_startpfn; + unsigned long ei_endpfn; + int i; + + for (i = 0; i < lmb.memory.cnt; i++) + if (lmb_find_active_region(&lmb.memory.region[i], + start_pfn, last_pfn, + &ei_startpfn, &ei_endpfn)) + add_active_range(nid, ei_startpfn, ei_endpfn); +} + +/* + * Find the hole size (in bytes) in the memory range. + * @start: starting address of the memory range to scan + * @end: ending address of the memory range to scan + */ +u64 __init lmb_hole_size(u64 start, u64 end) +{ + unsigned long start_pfn = start >> PAGE_SHIFT; + unsigned long last_pfn = end >> PAGE_SHIFT; + unsigned long ei_startpfn, ei_endpfn, ram = 0; + int i; + + for (i = 0; i < lmb.memory.cnt; i++) { + if (lmb_find_active_region(&lmb.memory.region[i], + start_pfn, last_pfn, + &ei_startpfn, &ei_endpfn)) + ram += ei_endpfn - ei_startpfn; + } + return end - start - ((u64)ram << PAGE_SHIFT); +} + -- 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 10/33] lmb: Add lmb_register_active_regions() and lmb_hole_size() Date: Tue, 30 Mar 2010 19:16:55 -0700 [thread overview] Message-ID: <1270001838-15857-11-git-send-email-yinghai@kernel.org> (raw) Message-ID: <20100331021655.JXA2C-kgpX2zUDLhMNiB5lhY0A5Pv0ek1_NCHYQxlHQ@z> (raw) In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org> lmb_register_active_regions() will be used to fill early_node_map, the result will be lmb.memory.region AND numa data lmb_hole_size will be used to find hole size on lmb.memory.region with specified range. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- include/linux/lmb.h | 4 +++ mm/lmb.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 2ee2cc1..cf8f7ca 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -95,6 +95,10 @@ void lmb_to_bootmem(u64 start, u64 end); struct range; int get_free_all_memory_range(struct range **rangep, int nodeid); +void lmb_register_active_regions(int nid, unsigned long start_pfn, + unsigned long last_pfn); +u64 lmb_hole_size(u64 start, u64 end); + #include <asm/lmb.h> #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index 62efdb4..72448a5 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -790,3 +790,71 @@ u64 __init lmb_find_area(u64 start, u64 end, u64 size, u64 align) } return -1ULL; } +/* + * 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. + */ +static int __init lmb_find_active_region(const struct lmb_property *ei, + unsigned long start_pfn, + unsigned long last_pfn, + unsigned long *ei_startpfn, + unsigned long *ei_endpfn) +{ + u64 align = PAGE_SIZE; + + *ei_startpfn = round_up(ei->base, align) >> PAGE_SHIFT; + *ei_endpfn = round_down(ei->base + ei->size, align) >> PAGE_SHIFT; + + /* Skip map entries smaller than a page */ + if (*ei_startpfn >= *ei_endpfn) + return 0; + + /* Skip if map is outside the node */ + if (*ei_endpfn <= start_pfn || *ei_startpfn >= last_pfn) + return 0; + + /* Check for overlaps */ + if (*ei_startpfn < start_pfn) + *ei_startpfn = start_pfn; + if (*ei_endpfn > last_pfn) + *ei_endpfn = last_pfn; + + return 1; +} + +/* Walk the lmb.memory map and register active regions within a node */ +void __init lmb_register_active_regions(int nid, unsigned long start_pfn, + unsigned long last_pfn) +{ + unsigned long ei_startpfn; + unsigned long ei_endpfn; + int i; + + for (i = 0; i < lmb.memory.cnt; i++) + if (lmb_find_active_region(&lmb.memory.region[i], + start_pfn, last_pfn, + &ei_startpfn, &ei_endpfn)) + add_active_range(nid, ei_startpfn, ei_endpfn); +} + +/* + * Find the hole size (in bytes) in the memory range. + * @start: starting address of the memory range to scan + * @end: ending address of the memory range to scan + */ +u64 __init lmb_hole_size(u64 start, u64 end) +{ + unsigned long start_pfn = start >> PAGE_SHIFT; + unsigned long last_pfn = end >> PAGE_SHIFT; + unsigned long ei_startpfn, ei_endpfn, ram = 0; + int i; + + for (i = 0; i < lmb.memory.cnt; i++) { + if (lmb_find_active_region(&lmb.memory.region[i], + start_pfn, last_pfn, + &ei_startpfn, &ei_endpfn)) + ram += ei_endpfn - ei_startpfn; + } + return end - start - ((u64)ram << PAGE_SHIFT); +} + -- 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 ` [PATCH 05/33] lmb: Add lmb_find_area() Yinghai Lu 2010-03-31 2:16 ` 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 ` Yinghai Lu [this message] 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 ` [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-11-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).