Re: [Problem] kernel hangs at boot (bisected 892d208bcf)

[Josh Boyer]

On Fri, Jan 20, 2012 at 6:01 AM, Catalin Marinas
<catalin.marinas@xxxxxxx> wrote:
> On Thu, Jan 19, 2012 at 08:52:44PM +0000, Dirk Gouders wrote:
>> Dirk Gouders <gouders@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> 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@xxxxxxx>
> 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@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>

I tested this on my machine and it works for me as well.  Thanks for the quick
turn around.  Feel free to add a:

Tested-by: Josh Boyer <jwboyer@xxxxxxxxx>

if you'd like.

josh

> ---
>  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@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/