Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755002Ab2BUBFr (ORCPT ); Mon, 20 Feb 2012 20:05:47 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:62358 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754969Ab2BUBFp (ORCPT ); Mon, 20 Feb 2012 20:05:45 -0500 Date: Mon, 20 Feb 2012 17:05:37 -0800 From: Tejun Heo To: Meelis Roos Cc: Grant Likely , Rob Herring , sparclinux@vger.kernel.org, Linux Kernel list , sam@ravnborg.org, "David S. Miller" Subject: Re: OF-related boot crash in 3.3.0-rc3-00188-g3ec1e88 Message-ID: <20120221010537.GA15898@dhcp-172-17-108-109.mtv.corp.google.com> References: <20120213080618.GA11077@ponder.secretlab.ca> <20120213214623.GJ11077@ponder.secretlab.ca> <20120220170603.GC7836@mtj.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3135 Lines: 82 Hello, Meelis, can you please apply the following patch before & after the offending commit, boot with "memblock=debug" added as kernel param and post the boot log? The patch will generate some offset warnings after the commit but should work fine. Sam, David, as I'm not familiar with the code base, is it possible to tell which address is corrupted (zeroed, it seems)? ie. can we add "if (XXX == NULL) printk("%p is corrputed\n"...);" somewhere? Thanks. diff --git a/mm/memblock.c b/mm/memblock.c index 1adbef0..dccfced 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -179,9 +179,15 @@ int __init_memblock memblock_reserve_reserved_regions(void) static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r) { - type->total_size -= type->regions[r].size; - memmove(&type->regions[r], &type->regions[r + 1], - (type->cnt - (r + 1)) * sizeof(type->regions[r])); + struct memblock_region *rgn = &type->regions[r]; + + memblock_dbg(" memblock %s: rm [%#016llx-%#016llx] node %d\n", + memblock_type_name(type), + (unsigned long long)rgn->base, + (unsigned long long)rgn->base + rgn->size, rgn->nid); + + type->total_size -= rgn->size; + memmove(rgn, rgn + 1, (type->cnt - (r + 1)) * sizeof(*rgn)); type->cnt--; /* Special case for empty arrays */ @@ -317,6 +323,9 @@ static void __init_memblock memblock_insert_region(struct memblock_type *type, memblock_set_region_node(rgn, nid); type->cnt++; type->total_size += size; + memblock_dbg(" memblock %s: add [%#016llx-%016llx] node %d @%d\n", + memblock_type_name(type), (unsigned long long)base, + (unsigned long long)base + size, nid, idx); } /** @@ -342,6 +351,10 @@ static int __init_memblock memblock_add_region(struct memblock_type *type, phys_addr_t end = base + memblock_cap_size(base, &size); int i, nr_new; + memblock_dbg(" memblock %s: ADD [%#016llx-%#016llx] node %d\n", + memblock_type_name(type), (unsigned long long)base, + (unsigned long long)base + size, nid); + /* special case for empty array */ if (type->regions[0].size == 0) { WARN_ON(type->cnt != 1 || type->total_size); @@ -349,6 +362,8 @@ static int __init_memblock memblock_add_region(struct memblock_type *type, type->regions[0].size = size; memblock_set_region_node(&type->regions[0], nid); type->total_size = size; + memblock_dbg(" memblock %s: add first entry\n", + memblock_type_name(type)); return 0; } repeat: @@ -494,6 +509,10 @@ static int __init_memblock __memblock_remove(struct memblock_type *type, int start_rgn, end_rgn; int i, ret; + memblock_dbg(" memblock %s: RM [%#016llx-%016llx]\n", + memblock_type_name(type), (unsigned long long)base, + (unsigned long long)base + size); + ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); if (ret) return ret; -- 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/