Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755524Ab0DIGIX (ORCPT ); Fri, 9 Apr 2010 02:08:23 -0400 Received: from acsinet12.oracle.com ([141.146.126.234]:37837 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755682Ab0DIGH0 (ORCPT ); Fri, 9 Apr 2010 02:07:26 -0400 From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton Cc: David Miller , Benjamin Herrenschmidt , Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH 20/39] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Date: Thu, 8 Apr 2010 23:03:49 -0700 Message-Id: <1270793048-23796-21-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1270793048-23796-1-git-send-email-yinghai@kernel.org> References: <1270793048-23796-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090205.4BBEC3E4.004B,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8636 Lines: 277 So those lmb bits could be released after kernel is booted up. Arch code could define ARCH_DISCARD_LMB in asm/lmb.h, __init_lmb will become __init, __initdata_lmb will becom __initdata x86 code will use that. -v2: use ARCH_DISCARD_LMB according to Michael Ellerman Signed-off-by: Yinghai Lu --- include/linux/lmb.h | 8 +++++++ mm/lmb.c | 54 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 3c8095f..f615626 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -106,6 +106,14 @@ u64 lmb_memory_size(u64 addr, u64 limit); #include +#ifdef ARCH_DISCARD_LMB +#define __init_lmb __init +#define __initdata_lmb __initdata +#else +#define __init_lmb +#define __initdata_lmb +#endif + #endif /* CONFIG_HAVE_LMB */ #endif /* __KERNEL__ */ diff --git a/mm/lmb.c b/mm/lmb.c index dfbf660..ab3d85f 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -21,11 +21,11 @@ #define LMB_ALLOC_ANYWHERE 0 -struct lmb lmb; -static struct lmb_property lmb_memory_region[MAX_LMB_REGIONS + 1]; -static struct lmb_property lmb_reserved_region[MAX_LMB_REGIONS + 1]; +struct lmb lmb __initdata_lmb; +static struct lmb_property lmb_memory_region[MAX_LMB_REGIONS + 1] __initdata_lmb; +static struct lmb_property lmb_reserved_region[MAX_LMB_REGIONS + 1] __initdata_lmb; -static int lmb_debug; +static int lmb_debug __initdata_lmb; static int __init early_lmb(char *p) { @@ -35,7 +35,7 @@ static int __init early_lmb(char *p) } early_param("lmb", early_lmb); -static void lmb_dump(struct lmb_region *region, char *name) +static void __init_lmb lmb_dump(struct lmb_region *region, char *name) { unsigned long long base, size; int i; @@ -51,7 +51,7 @@ static void lmb_dump(struct lmb_region *region, char *name) } } -void lmb_dump_all(void) +void __init_lmb lmb_dump_all(void) { if (!lmb_debug) return; @@ -64,13 +64,13 @@ void lmb_dump_all(void) lmb_dump(&lmb.reserved, "reserved"); } -static unsigned long lmb_addrs_overlap(u64 base1, u64 size1, u64 base2, +static unsigned long __init_lmb lmb_addrs_overlap(u64 base1, u64 size1, u64 base2, u64 size2) { return ((base1 < (base2 + size2)) && (base2 < (base1 + size1))); } -static long lmb_addrs_adjacent(u64 base1, u64 size1, u64 base2, u64 size2) +static long __init_lmb lmb_addrs_adjacent(u64 base1, u64 size1, u64 base2, u64 size2) { if (base2 == base1 + size1) return 1; @@ -80,7 +80,7 @@ static long lmb_addrs_adjacent(u64 base1, u64 size1, u64 base2, u64 size2) return 0; } -static long lmb_regions_adjacent(struct lmb_region *rgn, +static long __init_lmb lmb_regions_adjacent(struct lmb_region *rgn, unsigned long r1, unsigned long r2) { u64 base1 = rgn->region[r1].base; @@ -91,7 +91,7 @@ static long lmb_regions_adjacent(struct lmb_region *rgn, return lmb_addrs_adjacent(base1, size1, base2, size2); } -static void lmb_remove_region(struct lmb_region *rgn, unsigned long r) +static void __init_lmb lmb_remove_region(struct lmb_region *rgn, unsigned long r) { unsigned long i; @@ -103,7 +103,7 @@ static void lmb_remove_region(struct lmb_region *rgn, unsigned long r) } /* Assumption: base addr of region 1 < base addr of region 2 */ -static void lmb_coalesce_regions(struct lmb_region *rgn, +static void __init_lmb lmb_coalesce_regions(struct lmb_region *rgn, unsigned long r1, unsigned long r2) { rgn->region[r1].size += rgn->region[r2].size; @@ -140,7 +140,7 @@ void __init lmb_analyze(void) lmb.memory.size += lmb.memory.region[i].size; } -static long lmb_add_region(struct lmb_region *rgn, u64 base, u64 size) +static long __init_lmb lmb_add_region(struct lmb_region *rgn, u64 base, u64 size) { unsigned long coalesced = 0; long adjacent, i; @@ -204,7 +204,7 @@ static long lmb_add_region(struct lmb_region *rgn, u64 base, u64 size) return 0; } -long lmb_add(u64 base, u64 size) +long __init_lmb lmb_add(u64 base, u64 size) { struct lmb_region *_rgn = &lmb.memory; @@ -216,7 +216,7 @@ long lmb_add(u64 base, u64 size) } -static long __lmb_remove(struct lmb_region *rgn, u64 base, u64 size) +static long __init_lmb __lmb_remove(struct lmb_region *rgn, u64 base, u64 size) { u64 rgnbegin, rgnend; u64 end = base + size; @@ -264,7 +264,7 @@ static long __lmb_remove(struct lmb_region *rgn, u64 base, u64 size) return lmb_add_region(rgn, end, rgnend - end); } -long lmb_remove(u64 base, u64 size) +long __init_lmb lmb_remove(u64 base, u64 size) { return __lmb_remove(&lmb.memory, base, size); } @@ -283,7 +283,7 @@ long __init lmb_reserve(u64 base, u64 size) return lmb_add_region(_rgn, base, size); } -long lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size) +long __init_lmb lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size) { unsigned long i; @@ -297,12 +297,12 @@ long lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size) return (i < rgn->cnt) ? i : -1; } -static u64 lmb_align_down(u64 addr, u64 size) +static u64 __init_lmb lmb_align_down(u64 addr, u64 size) { return addr & ~(size - 1); } -static u64 lmb_align_up(u64 addr, u64 size) +static u64 __init_lmb lmb_align_up(u64 addr, u64 size) { return (addr + (size - 1)) & ~(size - 1); } @@ -462,7 +462,7 @@ u64 __init lmb_phys_mem_size(void) return lmb.memory.size; } -u64 lmb_end_of_DRAM(void) +u64 __init_lmb lmb_end_of_DRAM(void) { int idx = lmb.memory.cnt - 1; @@ -526,7 +526,7 @@ int __init lmb_is_reserved(u64 addr) return 0; } -int lmb_is_region_reserved(u64 base, u64 size) +int __init_lmb lmb_is_region_reserved(u64 base, u64 size) { return lmb_overlaps_region(&lmb.reserved, base, size); } @@ -535,7 +535,7 @@ int lmb_is_region_reserved(u64 base, u64 size) * Given a , find which memory regions belong to this range. * Adjust the request and return a contiguous chunk. */ -int lmb_find(struct lmb_property *res) +int __init_lmb lmb_find(struct lmb_property *res) { int i; u64 rstart, rend; @@ -689,10 +689,11 @@ static void __init subtract_lmb_reserved(struct range *range, int az) int i, count; u64 final_start, final_end; +#ifdef ARCH_DISCARD_LMB /* Take out region array itself at first*/ if (lmb.reserved.region != lmb_reserved_region) lmb_free(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); - +#endif count = lmb.reserved.cnt; if (lmb_debug) @@ -708,9 +709,11 @@ static void __init subtract_lmb_reserved(struct range *range, int az) continue; subtract_range(range, az, final_start, final_end); } +#ifdef ARCH_DISCARD_LMB /* Put region array back ? */ if (lmb.reserved.region != lmb_reserved_region) lmb_reserve(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); +#endif } int __init get_free_all_memory_range(struct range **rangep, int nodeid) @@ -735,6 +738,7 @@ int __init get_free_all_memory_range(struct range **rangep, int nodeid) subtract_lmb_reserved(range, count); nr_range = clean_sort_range(range, count); +#ifdef ARCH_DISCARD_LMB /* Need to clear it ? */ if (nodeid == MAX_NUMNODES) { memset(&lmb.reserved.region[0], 0, sizeof(struct lmb_property) * lmb.reserved.nr_regions); @@ -742,6 +746,7 @@ int __init get_free_all_memory_range(struct range **rangep, int nodeid) lmb.reserved.nr_regions = 0; lmb.reserved.cnt = 0; } +#endif *rangep = range; return nr_range; @@ -752,9 +757,11 @@ void __init lmb_to_bootmem(u64 start, u64 end) int i, count; u64 final_start, final_end; +#ifdef ARCH_DISCARD_LMB /* Take out region array itself */ if (lmb.reserved.region != lmb_reserved_region) lmb_free(__pa(lmb.reserved.region), sizeof(struct lmb_property) * lmb.reserved.nr_regions); +#endif count = lmb.reserved.cnt; if (lmb_debug) @@ -774,11 +781,14 @@ void __init lmb_to_bootmem(u64 start, u64 end) pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end); reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT); } + +#ifdef ARCH_DISCARD_LMB /* Clear them to avoid misusing ? */ memset(&lmb.reserved.region[0], 0, sizeof(struct lmb_property) * lmb.reserved.nr_regions); lmb.reserved.region = NULL; lmb.reserved.nr_regions = 0; lmb.reserved.cnt = 0; +#endif } #endif -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/