From: Bart Van Assche <bvanassche@acm.org>
To: peterz@infradead.org
Cc: mingo@redhat.com, tj@kernel.org, longman@redhat.com,
johannes.berg@intel.com, linux-kernel@vger.kernel.org,
Bart Van Assche <bvanassche@acm.org>,
Johannes Berg <johannes@sipsolutions.net>
Subject: [PATCH v4 12/15] locking/lockdep: Verify whether lock objects are small enough to be used as class keys
Date: Tue, 11 Dec 2018 14:13:18 -0800 [thread overview]
Message-ID: <20181211221321.196536-13-bvanassche@acm.org> (raw)
In-Reply-To: <20181211221321.196536-1-bvanassche@acm.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
kernel/locking/lockdep.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index f95c1beddc28..2685b2265f6e 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -738,6 +738,17 @@ static bool assign_lock_key(struct lockdep_map *lock)
{
unsigned long can_addr, addr = (unsigned long)lock;
+#ifdef __KERNEL__
+ /*
+ * lockdep_free_key_range() assumes that struct lock_class_key
+ * objects do not overlap. Since we use the address of lock
+ * objects as class key for static objects, check whether the
+ * size of lock_class_key objects does not exceed the size of
+ * the smallest lock object.
+ */
+ BUILD_BUG_ON(sizeof(struct lock_class_key) > sizeof(raw_spinlock_t));
+#endif
+
if (__is_kernel_percpu_address(addr, &can_addr))
lock->key = (void *)can_addr;
else if (__is_module_percpu_address(addr, &can_addr))
--
2.20.0.rc2.403.gdbc3b29805-goog
next prev parent reply other threads:[~2018-12-11 22:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 22:13 [PATCH v4 00/15] locking/lockdep: Add support for dynamic keys Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 01/15] locking/lockdep: Fix required memory size reported if CONFIG_PROVE_LOCKING=n Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 02/15] locking/lockdep: Make zap_class() remove all matching lock order entries Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 03/15] locking/lockdep: Reorder struct lock_class members Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 04/15] locking/lockdep: Initialize the locks_before and locks_after lists earlier Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 05/15] locking/lockdep: Split lockdep_free_key_range() and lockdep_reset_lock() Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 06/15] locking/lockdep: Make it easy to detect whether or not inside a selftest Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 07/15] locking/lockdep: Free lock classes that are no longer in use Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 08/15] locking/lockdep: Reuse list entries " Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 09/15] locking/lockdep: Introduce lockdep_next_lockchain() and lock_chain_count() Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 10/15] locking/lockdep: Reuse lock chains that have been freed Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 11/15] locking/lockdep: Check data structure consistency Bart Van Assche
2018-12-11 22:13 ` Bart Van Assche [this message]
2018-12-11 22:13 ` [PATCH v4 13/15] locking/lockdep: Add support for dynamic keys Bart Van Assche
2018-12-14 17:20 ` Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 14/15] kernel/workqueue: Use dynamic lockdep keys for workqueues Bart Van Assche
2018-12-11 22:13 ` [PATCH v4 15/15] lockdep tests: Test dynamic key registration Bart Van Assche
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=20181211221321.196536-13-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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
all inboxes | Powered by JetHome®