diff options
Diffstat (limited to 'kmemleak.patch')
| -rw-r--r-- | kmemleak.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/kmemleak.patch b/kmemleak.patch new file mode 100644 index 000000000..56bd860db --- /dev/null +++ b/kmemleak.patch @@ -0,0 +1,100 @@ + +Delivered-To: jwboyer@gmail.com +Received: by 10.216.166.66 with SMTP id f44cs7120wel; + Fri, 20 Jan 2012 03:02:14 -0800 (PST) +Received: by 10.68.72.8 with SMTP id z8mr60494730pbu.111.1327057318390; + Fri, 20 Jan 2012 03:01:58 -0800 (PST) +Return-Path: <linux-kernel-owner@vger.kernel.org> +Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) + by mx.google.com with ESMTP id q8si4181579pbn.101.2012.01.20.03.01.56; + Fri, 20 Jan 2012 03:01:58 -0800 (PST) +Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; +Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1751460Ab2ATLBU (ORCPT <rfc822;ramashish.lists@gmail.com> + + 99 others); Fri, 20 Jan 2012 06:01:20 -0500 +Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:34737 "EHLO + cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) + by vger.kernel.org with ESMTP id S1750877Ab2ATLBT (ORCPT + <rfc822;linux-kernel@vger.kernel.org>); + Fri, 20 Jan 2012 06:01:19 -0500 +Received: from arm.com (e102109-lin.cambridge.arm.com [10.1.69.68]) + by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id q0KB1CWq000059; + Fri, 20 Jan 2012 11:01:12 GMT +Date: Fri, 20 Jan 2012 11:01:11 +0000 +From: Catalin Marinas <catalin.marinas@arm.com> +To: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de> +Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> +Subject: Re: [Problem] kernel hangs at boot (bisected 892d208bcf) +Message-ID: <20120120110111.GB30612@arm.com> +References: <gi39bcyff8.fsf@mx10.gouders.net> + <20120119110121.GC9268@arm.com> + <gi1uqvsx8n.fsf@karga.hank.lab> + <20120119140058.GA19036@arm.com> + <gik44nrc52.fsf@karga.hank.lab> + <20120119153732.GB20558@arm.com> + <gi1uqvwpt2.fsf@mx10.gouders.net> + <gimx9jv50u.fsf@mx10.gouders.net> + <giipk7v2hv.fsf@mx10.gouders.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <giipk7v2hv.fsf@mx10.gouders.net> +Thread-Topic: [Problem] kernel hangs at boot (bisected 892d208bcf) +Accept-Language: en-GB, en-US +Content-Language: en-US +User-Agent: Mutt/1.5.20 (2009-06-14) +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-kernel.vger.kernel.org> +X-Mailing-List: linux-kernel@vger.kernel.org + +On Thu, Jan 19, 2012 at 08:52:44PM +0000, Dirk Gouders wrote: +> Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de> writes: +> I want to note that in my config CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF is +> set which causes kmemleak_disable() to be called in kmemleak_init(). + +Thanks for the investigation. Could you please try the patch below? +Thanks. + + +From 09e7bd41ff3fd07e4c5eea7bbb0a045921eb5944 Mon Sep 17 00:00:00 2001 +From: Catalin Marinas <catalin.marinas@arm.com> +Date: Fri, 20 Jan 2012 10:42:40 +0000 +Subject: [PATCH] kmemleak: Disable early logging when kmemleak is off by + default + +Commit b6693005 (kmemleak: When the early log buffer is exceeded, report +the actual number) deferred the disabling of the early logging to +kmemleak_init(). However, when CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y, the +early logging was no longer disabled causing __init kmemleak functions +to be called even after the kernel freed the init memory. This patch +disables the early logging during kmemleak_init() if kmemleak is left +disabled. + +Reported-by: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de> +Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +--- + mm/kmemleak.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/mm/kmemleak.c b/mm/kmemleak.c +index f9f7310..45eb621 100644 +--- a/mm/kmemleak.c ++++ b/mm/kmemleak.c +@@ -1757,6 +1757,7 @@ void __init kmemleak_init(void) + + #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF + if (!kmemleak_skip_disable) { ++ atomic_set(&kmemleak_early_log, 0); + kmemleak_disable(); + return; + } + +-- +Catalin +-- +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/ |