From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 16/37] x86, lmb: Add lmb_free_memory_size() Date: Fri, 14 May 2010 12:45:42 -0700 Message-ID: <1273866363-14249-17-git-send-email-yinghai@kernel.org> References: <1273866363-14249-1-git-send-email-yinghai@kernel.org> Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:59871 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759684Ab0ENTsj (ORCPT ); Fri, 14 May 2010 15:48:39 -0400 In-Reply-To: <1273866363-14249-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 , Be Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu It will return free memory size in specified range. We can not use memory_size - reserved_size here, because some reserved area may not be in the scope of lmb.memory.region. Use lmb.memory.region subtracting lmb.reserved.region to get free range array. then count size of all free ranges. Signed-off-by: Yinghai Lu --- arch/x86/include/asm/lmb.h | 1 + arch/x86/mm/lmb.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h index 358d8a6..4fb94b5 100644 --- a/arch/x86/include/asm/lmb.h +++ b/arch/x86/include/asm/lmb.h @@ -16,5 +16,6 @@ void lmb_register_active_regions(int nid, unsigned long start_pfn, unsigned long last_pfn); u64 lmb_hole_size(u64 start, u64 end); u64 lmb_find_area_node(int nid, u64 start, u64 end, u64 size, u64 align); +u64 lmb_free_memory_size(u64 addr, u64 limit); #endif diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c index 17bb1fb..3a16cdc 100644 --- a/arch/x86/mm/lmb.c +++ b/arch/x86/mm/lmb.c @@ -226,6 +226,57 @@ void __init lmb_to_bootmem(u64 start, u64 end) } #endif +u64 __init lmb_free_memory_size(u64 addr, u64 limit) +{ + int i, count; + struct range *range; + int nr_range; + u64 final_start, final_end; + u64 free_size; + + count = (lmb.reserved.cnt + lmb.memory.cnt) * 2; + + range = find_range_array(count); + nr_range = 0; + + addr = PFN_UP(addr); + limit = PFN_DOWN(limit); + + for (i = 0; i < lmb.memory.cnt; i++) { + struct lmb_region *r = &lmb.memory.regions[i]; + + final_start = PFN_UP(r->base); + final_end = PFN_DOWN(r->base + r->size); + if (final_start >= final_end) + continue; + if (final_start >= limit || final_end <= addr) + continue; + + nr_range = add_range(range, count, nr_range, final_start, final_end); + } + subtract_range(range, count, 0, addr); + subtract_range(range, count, limit, -1ULL); + for (i = 0; i < lmb.reserved.cnt; i++) { + struct lmb_region *r = &lmb.reserved.regions[i]; + + final_start = PFN_DOWN(r->base); + final_end = PFN_UP(r->base + r->size); + if (final_start >= final_end) + continue; + if (final_start >= limit || final_end <= addr) + continue; + + subtract_range(range, count, final_start, final_end); + } + nr_range = clean_sort_range(range, count); + + free_size = 0; + for (i = 0; i < nr_range; i++) + free_size += range[i].end - range[i].start; + + return free_size << PAGE_SHIFT; +} + void __init lmb_add_memory(u64 start, u64 end) { lmb_add(start, end - start); -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet10.oracle.com ([148.87.113.121]:59871 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759684Ab0ENTsj (ORCPT ); Fri, 14 May 2010 15:48:39 -0400 From: Yinghai Lu Subject: [PATCH 16/37] x86, lmb: Add lmb_free_memory_size() Date: Fri, 14 May 2010 12:45:42 -0700 Message-ID: <1273866363-14249-17-git-send-email-yinghai@kernel.org> In-Reply-To: <1273866363-14249-1-git-send-email-yinghai@kernel.org> References: <1273866363-14249-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 Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100514194542.1KmgV0Lf1SbkxoKhwPR4xH4vlpIxrooLuyXZ8h8l2fc@z> It will return free memory size in specified range. We can not use memory_size - reserved_size here, because some reserved area may not be in the scope of lmb.memory.region. Use lmb.memory.region subtracting lmb.reserved.region to get free range array. then count size of all free ranges. Signed-off-by: Yinghai Lu --- arch/x86/include/asm/lmb.h | 1 + arch/x86/mm/lmb.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/lmb.h b/arch/x86/include/asm/lmb.h index 358d8a6..4fb94b5 100644 --- a/arch/x86/include/asm/lmb.h +++ b/arch/x86/include/asm/lmb.h @@ -16,5 +16,6 @@ void lmb_register_active_regions(int nid, unsigned long start_pfn, unsigned long last_pfn); u64 lmb_hole_size(u64 start, u64 end); u64 lmb_find_area_node(int nid, u64 start, u64 end, u64 size, u64 align); +u64 lmb_free_memory_size(u64 addr, u64 limit); #endif diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c index 17bb1fb..3a16cdc 100644 --- a/arch/x86/mm/lmb.c +++ b/arch/x86/mm/lmb.c @@ -226,6 +226,57 @@ void __init lmb_to_bootmem(u64 start, u64 end) } #endif +u64 __init lmb_free_memory_size(u64 addr, u64 limit) +{ + int i, count; + struct range *range; + int nr_range; + u64 final_start, final_end; + u64 free_size; + + count = (lmb.reserved.cnt + lmb.memory.cnt) * 2; + + range = find_range_array(count); + nr_range = 0; + + addr = PFN_UP(addr); + limit = PFN_DOWN(limit); + + for (i = 0; i < lmb.memory.cnt; i++) { + struct lmb_region *r = &lmb.memory.regions[i]; + + final_start = PFN_UP(r->base); + final_end = PFN_DOWN(r->base + r->size); + if (final_start >= final_end) + continue; + if (final_start >= limit || final_end <= addr) + continue; + + nr_range = add_range(range, count, nr_range, final_start, final_end); + } + subtract_range(range, count, 0, addr); + subtract_range(range, count, limit, -1ULL); + for (i = 0; i < lmb.reserved.cnt; i++) { + struct lmb_region *r = &lmb.reserved.regions[i]; + + final_start = PFN_DOWN(r->base); + final_end = PFN_UP(r->base + r->size); + if (final_start >= final_end) + continue; + if (final_start >= limit || final_end <= addr) + continue; + + subtract_range(range, count, final_start, final_end); + } + nr_range = clean_sort_range(range, count); + + free_size = 0; + for (i = 0; i < nr_range; i++) + free_size += range[i].end - range[i].start; + + return free_size << PAGE_SHIFT; +} + void __init lmb_add_memory(u64 start, u64 end) { lmb_add(start, end - start); -- 1.6.4.2