1. expose lmb_debug 2. expose lmb_reserved_init_regions 3. expose lmb_add_region 4. prection for include linux/lmb.h in mm/page_alloc.c and mm/bootmem.c 5. lmb_find_base() should return LMB_ERROR in one failing path. (this one cost me 3 hours !) 6. move LMB_ERROR to lmb.h Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> --- include/linux/lmb.h | 4 ++++ lib/lmb.c | 21 +++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 6f8c4bd..7987766 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -19,6 +19,7 @@ #include <asm/lmb.h> #define INIT_LMB_REGIONS 128 +#define LMB_ERROR (~(phys_addr_t)0) struct lmb_region { phys_addr_t base; @@ -39,6 +40,8 @@ struct lmb { }; extern struct lmb lmb; +extern int lmb_debug; +extern struct lmb_region lmb_reserved_init_regions[]; extern void __init lmb_init(void); extern void __init lmb_analyze(void); @@ -61,6 +64,7 @@ extern phys_addr_t __init lmb_alloc(phys_addr_t size, phys_addr_t align); #define LMB_ALLOC_ANYWHERE (~(phys_addr_t)0) #define LMB_ALLOC_ACCESSIBLE 0 +long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t size); extern phys_addr_t __init lmb_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr); diff --git a/lib/lmb.c b/lib/lmb.c index 2cd5aaa..fddd72c 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -22,11 +22,9 @@ struct lmb lmb; -static int lmb_debug; +int lmb_debug; static struct lmb_region lmb_memory_init_regions[INIT_LMB_REGIONS + 1]; -static struct lmb_region lmb_reserved_init_regions[INIT_LMB_REGIONS + 1]; - -#define LMB_ERROR (~(phys_addr_t)0) +struct lmb_region lmb_reserved_init_regions[INIT_LMB_REGIONS + 1]; /* inline so we don't get a warning when pr_debug is compiled out */ static inline const char *lmb_type_name(struct lmb_type *type) @@ -154,7 +152,7 @@ static phys_addr_t __init lmb_find_base(phys_addr_t size, phys_addr_t align, if (found != LMB_ERROR) return found; } - return 0; + return LMB_ERROR; } static void lmb_remove_region(struct lmb_type *type, unsigned long r) @@ -176,17 +174,12 @@ static void lmb_coalesce_regions(struct lmb_type *type, lmb_remove_region(type, r2); } -/* Defined below but needed now */ -static long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t size); - static int lmb_double_array(struct lmb_type *type) { struct lmb_region *new_array, *old_array; phys_addr_t old_size, new_size, addr; int use_slab = slab_is_available(); - pr_debug("lmb: %s array full, doubling...", lmb_type_name(type)); - /* Calculate new doubled size */ old_size = type->max * sizeof(struct lmb_region); new_size = old_size << 1; @@ -206,7 +199,7 @@ static int lmb_double_array(struct lmb_type *type) new_array = kmalloc(new_size, GFP_KERNEL); addr = new_array == NULL ? LMB_ERROR : __pa(new_array); } else - addr = lmb_find_base(new_size, sizeof(phys_addr_t), 0, LMB_ALLOC_ACCESSIBLE); + addr = lmb_find_base(new_size, sizeof(struct lmb_region), 0, LMB_ALLOC_ACCESSIBLE); if (addr == LMB_ERROR) { pr_err("lmb: Failed to double %s array from %ld to %ld entries !\n", lmb_type_name(type), type->max, type->max * 2); @@ -214,6 +207,10 @@ static int lmb_double_array(struct lmb_type *type) } new_array = __va(addr); + if (lmb_debug) + pr_info("lmb: %s array is doubled to %ld at %llx - %llx", + lmb_type_name(type), type->max * 2, (u64)addr, (u64)addr + new_size); + /* Found space, we now need to move the array over before * we add the reserved region since it may be our reserved * array itself that is full. @@ -249,7 +246,7 @@ extern int __weak lmb_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1, return 1; } -static long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t size) +long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t size) { unsigned long coalesced = 0; long adjacent, i; -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html