From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752195Ab0DULMp (ORCPT ); Wed, 21 Apr 2010 07:12:45 -0400 Received: from mail-bw0-f225.google.com ([209.85.218.225]:46627 "EHLO mail-bw0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751955Ab0DULMn (ORCPT ); Wed, 21 Apr 2010 07:12:43 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; b=NkN1URuvI+IUbpm0wJ7sVtrB1YOdw2Znx1of3Su5rHuv4BA2SwtMU3sUhJaIoiP23D UwvAbXSGagSgG6JYud/v+ahnFy9cIWp2zeITmvnZOoGdB5LKyupbUeVQrugcBWVIj5LN FF83gf9IOf3QGp1Bw8kBrJ5/8Ml4pkm4m002M= Date: Wed, 21 Apr 2010 13:12:29 +0200 (CEST) From: John Kacur X-X-Sender: jkacur@localhost To: Andrew Morton cc: John Kacur , linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , linux-rt-users@vger.kernel.org, Thomas Gleixner , Clark Williams , "Luis Claudio R. Goncalves" Subject: [PATCH v3] lockdep: Make MAX_STACK_TRACE_ENTRIES configurable. In-Reply-To: <20100420140941.d085007d.akpm@linux-foundation.org> Message-ID: References: <20100420140941.d085007d.akpm@linux-foundation.org> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From f9a733a806a3a486fe24b54c82b74ad6a4137e8b Mon Sep 17 00:00:00 2001 From: John Kacur Date: Fri, 16 Apr 2010 13:24:02 +0200 Subject: [PATCH v3] lockdep: Make MAX_STACK_TRACE_ENTRIES configurable. Cc: Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Clark Williams , Luis Claudio R. Goncalves , Andrew Morton Certain configurations that have LOCKDEP turned on, run into the limit where the MAX_STACK_TRACE_ENTRIES are too small. Rather than simply turning of the locking correctness validator let the user configure this value to something reasonable for their system. -v2 - generated against tip/master -v3 - fix compiler warning reported by Andrew Morton in lockdep_proc.c Signed-off-by: John Kacur --- kernel/lockdep.c | 8 ++++---- kernel/lockdep_internals.h | 6 ------ kernel/lockdep_proc.c | 4 ++-- lib/Kconfig.debug | 9 +++++++++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 78325f8..2acc25d 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -369,12 +369,12 @@ static int verbose(struct lock_class *class) * addresses. Protected by the graph_lock. */ unsigned long nr_stack_trace_entries; -static unsigned long stack_trace[MAX_STACK_TRACE_ENTRIES]; +static unsigned long stack_trace[CONFIG_MAX_STACK_TRACE_ENTRIES]; static int save_trace(struct stack_trace *trace) { trace->nr_entries = 0; - trace->max_entries = MAX_STACK_TRACE_ENTRIES - nr_stack_trace_entries; + trace->max_entries = CONFIG_MAX_STACK_TRACE_ENTRIES - nr_stack_trace_entries; trace->entries = stack_trace + nr_stack_trace_entries; trace->skip = 3; @@ -396,11 +396,11 @@ static int save_trace(struct stack_trace *trace) nr_stack_trace_entries += trace->nr_entries; - if (nr_stack_trace_entries >= MAX_STACK_TRACE_ENTRIES-1) { + if (nr_stack_trace_entries >= CONFIG_MAX_STACK_TRACE_ENTRIES-1) { if (!debug_locks_off_graph_unlock()) return 0; - printk("BUG: MAX_STACK_TRACE_ENTRIES too low!\n"); + printk("BUG: CONFIG_MAX_STACK_TRACE_ENTRIES = %d too low!\n", CONFIG_MAX_STACK_TRACE_ENTRIES); printk("turning off the locking correctness validator.\n"); dump_stack(); diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h index 8d7d4b6..e2585ff 100644 --- a/kernel/lockdep_internals.h +++ b/kernel/lockdep_internals.h @@ -61,12 +61,6 @@ enum { #define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5) -/* - * Stack-trace: tightly packed array of stack backtrace - * addresses. Protected by the hash_lock. - */ -#define MAX_STACK_TRACE_ENTRIES 262144UL - extern struct list_head all_lock_classes; extern struct lock_chain lock_chains[]; diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index 59b76c8..9954401 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c @@ -305,8 +305,8 @@ static int lockdep_stats_show(struct seq_file *m, void *v) #endif seq_printf(m, " in-process chains: %11u\n", nr_process_chains); - seq_printf(m, " stack-trace entries: %11lu [max: %lu]\n", - nr_stack_trace_entries, MAX_STACK_TRACE_ENTRIES); + seq_printf(m, " stack-trace entries: %11lu [max: %d]\n", + nr_stack_trace_entries, CONFIG_MAX_STACK_TRACE_ENTRIES); seq_printf(m, " combined max dependencies: %11u\n", (nr_hardirq_chains + 1) * (nr_softirq_chains + 1) * diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 0bbd5c7..38d3bf3 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -533,6 +533,15 @@ config LOCKDEP select KALLSYMS select KALLSYMS_ALL +config MAX_STACK_TRACE_ENTRIES + int "MAX_STACK_TRACE_ENTRIES for LOCKDEP" + depends on LOCKDEP + default 262144 + help + This option allows you to change the default MAX_STACK_TRACE_ENTRIES + used for LOCKDEP. Warning, increasing this number will increase the + size of the stack_trace array, and thus the kernel size too. + config LOCK_STAT bool "Lock usage statistics" depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT -- 1.6.6.1