From: Babu Moger <babu.moger@oracle.com>
To: peterz@infradead.org, mingo@redhat.com,
akpm@linux-foundation.org, keescook@chromium.org,
dan.j.williams@intel.com, aryabinin@virtuozzo.com, tj@kernel.org,
sam@ravnborg.org
Cc: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org,
babu.moger@oracle.com
Subject: [PATCH v3 2/2] lockdep: Limit static allocations if PROVE_LOCKING_SMALL is defined
Date: Tue, 27 Sep 2016 12:33:28 -0700 [thread overview]
Message-ID: <1475004808-91920-3-git-send-email-babu.moger@oracle.com> (raw)
In-Reply-To: <1475004808-91920-1-git-send-email-babu.moger@oracle.com>
Reduce the size of data structure for lockdep entries by half if
PROVE_LOCKING_SMALL if defined. This is used only for sparc.
Signed-off-by: Babu Moger <babu.moger@oracle.com>
---
kernel/locking/lockdep_internals.h | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 51c4b24..c2b8849 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -46,6 +46,14 @@ enum {
(LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)
/*
+ * CONFIG_PROVE_LOCKING_SMALL is defined for sparc. Sparc requires .text,
+ * .data and .bss to fit in required 32MB limit for the kernel. With
+ * PROVE_LOCKING we could go over this limit and cause system boot-up problems.
+ * So, reduce the static allocations for lockdeps related structures so that
+ * everything fits in current required size limit.
+ */
+#ifdef CONFIG_PROVE_LOCKING_SMALL
+/*
* MAX_LOCKDEP_ENTRIES is the maximum number of lock dependencies
* we track.
*
@@ -54,18 +62,24 @@ enum {
* table (if it's not there yet), and we check it for lock order
* conflicts and deadlocks.
*/
+#define MAX_LOCKDEP_ENTRIES 16384UL
+#define MAX_LOCKDEP_CHAINS_BITS 15
+#define MAX_STACK_TRACE_ENTRIES 262144UL
+#else
#define MAX_LOCKDEP_ENTRIES 32768UL
#define MAX_LOCKDEP_CHAINS_BITS 16
-#define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS)
-
-#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 524288UL
+#endif
+
+#define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS)
+
+#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)
extern struct list_head all_lock_classes;
extern struct lock_chain lock_chains[];
--
1.7.1
next prev parent reply other threads:[~2016-09-27 19:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 19:33 [PATCH v3 0/2] Ajust lockdep static allocations for sparc Babu Moger
2016-09-27 19:33 ` [PATCH v3 1/2] config: Adding the new config parameter CONFIG_PROVE_LOCKING_SMALL " Babu Moger
2016-09-28 8:39 ` Peter Zijlstra
2016-09-29 13:53 ` Babu Moger
2016-09-30 5:19 ` David Miller
2016-10-05 22:56 ` Babu Moger
2016-10-06 4:27 ` Sam Ravnborg
2016-09-28 20:51 ` Sam Ravnborg
2016-09-27 19:33 ` Babu Moger [this message]
2016-09-28 20:51 ` [PATCH v3 2/2] lockdep: Limit static allocations if PROVE_LOCKING_SMALL is defined Sam Ravnborg
2016-09-29 13:55 ` Babu Moger
2016-11-18 19:34 ` [PATCH v3 0/2] Ajust lockdep static allocations for sparc David Miller
2016-11-19 11:53 ` Peter Zijlstra
2016-11-21 7:17 ` Ingo Molnar
2016-11-29 11:14 ` Geert Uytterhoeven
2016-11-29 11:41 ` Peter Zijlstra
2016-11-29 11:52 ` Geert Uytterhoeven
2016-11-29 12:29 ` Peter Zijlstra
2016-11-29 12:35 ` Peter Zijlstra
2016-11-29 13:26 ` Geert Uytterhoeven
2016-11-29 13:31 ` Peter Zijlstra
2016-11-29 13:39 ` Geert Uytterhoeven
2016-11-29 13:50 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475004808-91920-3-git-send-email-babu.moger@oracle.com \
--to=babu.moger@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.com \
--cc=dan.j.williams@intel.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sam@ravnborg.org \
--cc=sparclinux@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).