From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753162Ab1KQVuQ (ORCPT ); Thu, 17 Nov 2011 16:50:16 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:55430 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554Ab1KQVuP (ORCPT ); Thu, 17 Nov 2011 16:50:15 -0500 Message-ID: <4EC58191.2070000@gmail.com> Date: Fri, 18 Nov 2011 08:50:09 +1100 From: Ryan Mallon User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.23) Gecko/20110921 Lightning/1.0b2 Thunderbird/3.1.15 MIME-Version: 1.0 To: tom.leiming@gmail.com CC: mingo@elte.hu, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] lockdep: print lock name for lockdep_init_error References: <1321508072-23853-1-git-send-email-tom.leiming@gmail.com> <1321508072-23853-2-git-send-email-tom.leiming@gmail.com> In-Reply-To: <1321508072-23853-2-git-send-email-tom.leiming@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17/11/11 16:34, tom.leiming@gmail.com wrote: > From: Ming Lei > > This patch prints the name of the lock which is acquired > before lockdep_init is called, so that user can easily find > which lock trigged the lockdep init error warning. > > This patch also removes the lockdep_init_error message > of "Arch code didn't call lockdep_init() early enough?" since > lockdep_init is called in arch independent code now. > > Signed-off-by: Ming Lei > --- > kernel/lockdep.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/kernel/lockdep.c b/kernel/lockdep.c > index 4e7e672..8141317 100644 > --- a/kernel/lockdep.c > +++ b/kernel/lockdep.c > @@ -430,6 +430,7 @@ unsigned int max_lockdep_depth; > * about it later on, in lockdep_info(). > */ > static int lockdep_init_error; > +static const char *lock_init_error; You can now remove lockdep_init_error and just test against lock_init_error below instead. ~Ryan > static unsigned long lockdep_init_trace_data[20]; > static struct stack_trace lockdep_init_trace = { > .max_entries = ARRAY_SIZE(lockdep_init_trace_data), > @@ -651,6 +652,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass) > if (unlikely(!lockdep_initialized)) { > lockdep_init(); > lockdep_init_error = 1; > + lock_init_error = lock->name; > save_stack_trace(&lockdep_init_trace); > } > #endif > @@ -3965,7 +3967,8 @@ void __init lockdep_info(void) > > #ifdef CONFIG_DEBUG_LOCKDEP > if (lockdep_init_error) { > - printk("WARNING: lockdep init error! Arch code didn't call lockdep_init() early enough?\n"); > + printk("WARNING: lockdep init error! lock-%s was acquired" > + "before lockdep_init\n", lock_init_error); > printk("Call stack leading to lockdep invocation was:\n"); > print_stack_trace(&lockdep_init_trace, 0); > }