From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 30/50] memblock: Print new doubled array location info Date: Tue, 13 Jul 2010 00:10:24 -0700 Message-ID: <1279005044-24777-31-git-send-email-yinghai@kernel.org> References: <1279005044-24777-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1279005044-24777-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-arch.vger.kernel.org so will have more idea where it is, use memblock_debug to controll it -v2: use memblock_dbg instead of " if (memblock_debug) " Signed-off-by: Yinghai Lu --- mm/memblock.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index c16d4c6..796ef8c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -192,8 +192,6 @@ static int memblock_double_array(struct memblock_type *type) if (!memblock_can_resize) return -1; - pr_debug("memblock: %s array full, doubling...", memblock_type_name(type)); - /* Calculate new doubled size */ old_size = type->max * sizeof(struct memblock_region); new_size = old_size << 1; @@ -221,6 +219,9 @@ static int memblock_double_array(struct memblock_type *type) } new_array = __va(addr); + memblock_dbg("memblock: %s array is doubled to %ld at [%#010llx-%#010llx]", + memblock_type_name(type), type->max * 2, (u64)addr, (u64)addr + new_size - 1); + /* 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. @@ -646,7 +647,7 @@ static void memblock_dump(struct memblock_type *region, char *name) base = region->regions[i].base; size = region->regions[i].size; - pr_info(" %s[0x%x]\t0x%016llx - 0x%016llx, 0x%llx bytes\n", + pr_info(" %s[%#x]\t[%#016llx-%#016llx], %#llx bytes\n", name, i, base, base + size - 1, size); } } -- 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]:29213 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754489Ab0GMHQn (ORCPT ); Tue, 13 Jul 2010 03:16:43 -0400 From: Yinghai Lu Subject: [PATCH 30/50] memblock: Print new doubled array location info Date: Tue, 13 Jul 2010 00:10:24 -0700 Message-ID: <1279005044-24777-31-git-send-email-yinghai@kernel.org> In-Reply-To: <1279005044-24777-1-git-send-email-yinghai@kernel.org> References: <1279005044-24777-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: <20100713071024.TyV5IBaB5TTBUOh6FlGAvW_N5RbjIwcijdntMLONsGQ@z> so will have more idea where it is, use memblock_debug to controll it -v2: use memblock_dbg instead of " if (memblock_debug) " Signed-off-by: Yinghai Lu --- mm/memblock.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index c16d4c6..796ef8c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -192,8 +192,6 @@ static int memblock_double_array(struct memblock_type *type) if (!memblock_can_resize) return -1; - pr_debug("memblock: %s array full, doubling...", memblock_type_name(type)); - /* Calculate new doubled size */ old_size = type->max * sizeof(struct memblock_region); new_size = old_size << 1; @@ -221,6 +219,9 @@ static int memblock_double_array(struct memblock_type *type) } new_array = __va(addr); + memblock_dbg("memblock: %s array is doubled to %ld at [%#010llx-%#010llx]", + memblock_type_name(type), type->max * 2, (u64)addr, (u64)addr + new_size - 1); + /* 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. @@ -646,7 +647,7 @@ static void memblock_dump(struct memblock_type *region, char *name) base = region->regions[i].base; size = region->regions[i].size; - pr_info(" %s[0x%x]\t0x%016llx - 0x%016llx, 0x%llx bytes\n", + pr_info(" %s[%#x]\t[%#016llx-%#016llx], %#llx bytes\n", name, i, base, base + size - 1, size); } } -- 1.6.4.2