Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1561786

[PATCH v5 03/13] lockdep: Add a function building a chain between two classes

Show all headers | View raw

Currently, add_chain_cache() should be used in the context where the
hlock is owned since it might be racy. However, crossrelease needs to
build a chain between two locks regardless of context. So this patch
introduces a new function making it possible.

Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
 kernel/locking/lockdep.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index a143eb4..2081c31 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -2109,6 +2109,76 @@ static int check_no_collision(struct task_struct *curr,
 	return 1;
 }
 
+/*
+ * This is for building a chain between just two different classes,
+ * instead of adding a new hlock upon current, which is done by
+ * add_chain_cache().
+ *
+ * This can be called in any context with two classes, while
+ * add_chain_cache() must be done within the lock owener's context
+ * since it uses hlock which might be racy in another context.
+ */
+static inline int add_chain_cache_classes(unsigned int prev,
+					  unsigned int next,
+					  unsigned int irq_context,
+					  u64 chain_key)
+{
+	struct hlist_head *hash_head = chainhashentry(chain_key);
+	struct lock_chain *chain;
+
+	/*
+	 * Allocate a new chain entry from the static array, and add
+	 * it to the hash:
+	 */
+
+	/*
+	 * We might need to take the graph lock, ensure we've got IRQs
+	 * disabled to make this an IRQ-safe lock.. for recursion reasons
+	 * lockdep won't complain about its own locking errors.
+	 */
+	if (DEBUG_LOCKS_WARN_ON(!irqs_disabled()))
+		return 0;
+
+	if (unlikely(nr_lock_chains >= MAX_LOCKDEP_CHAINS)) {
+		if (!debug_locks_off_graph_unlock())
+			return 0;
+
+		print_lockdep_off("BUG: MAX_LOCKDEP_CHAINS too low!");
+		dump_stack();
+		return 0;
+	}
+
+	chain = lock_chains + nr_lock_chains++;
+	chain->chain_key = chain_key;
+	chain->irq_context = irq_context;
+	chain->depth = 2;
+	if (likely(nr_chain_hlocks + chain->depth <= MAX_LOCKDEP_CHAIN_HLOCKS)) {
+		chain->base = nr_chain_hlocks;
+		nr_chain_hlocks += chain->depth;
+		chain_hlocks[chain->base] = prev - 1;
+		chain_hlocks[chain->base + 1] = next -1;
+	}
+#ifdef CONFIG_DEBUG_LOCKDEP
+	/*
+	 * Important for check_no_collision().
+	 */
+	else {
+		if (!debug_locks_off_graph_unlock())
+			return 0;
+
+		print_lockdep_off("BUG: MAX_LOCKDEP_CHAIN_HLOCKS too low!");
+		dump_stack();
+		return 0;
+	}
+#endif
+
+	hlist_add_head_rcu(&chain->entry, hash_head);
+	debug_atomic_inc(chain_lookup_misses);
+	inc_chains();
+
+	return 1;
+}
+
 static inline int add_chain_cache(struct task_struct *curr,
 				  struct held_lock *hlock,
 				  u64 chain_key)
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 00/13] lockdep: Implement crossrelease feature Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:20 +0100
  [PATCH v5 01/13] lockdep: Refactor lookup_chain_cache() Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:20 +0100
    Re: [PATCH v5 01/13] lockdep: Refactor lookup_chain_cache() Boqun Feng <boqun.feng@gmail.com> - 2017-01-19 10:20 +0100
      Re: [PATCH v5 01/13] lockdep: Refactor lookup_chain_cache() Byungchul Park <byungchul.park@lge.com> - 2017-01-19 11:10 +0100
      Re: [PATCH v5 01/13] lockdep: Refactor lookup_chain_cache() Byungchul Park <byungchul.park@lge.com> - 2017-01-26 09:00 +0100
  [PATCH v5 09/13] pagemap.h: Remove trailing white space Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 10/13] lockdep: Apply crossrelease to PG_locked locks Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 13/13] lockdep: Crossrelease feature documentation Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
    [REVISED DOCUMENT] lockdep: Crossrelease feature documentation Byungchul Park <byungchul.park@lge.com> - 2017-01-20 10:10 +0100
  [PATCH v5 06/13] lockdep: Implement crossrelease feature Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 08/13] lockdep: Apply crossrelease to completions Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 11/13] lockdep: Apply lock_acquire(release) on __Set(__Clear)PageLocked Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 03/13] lockdep: Add a function building a chain between two classes Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 07/13] lockdep: Make print_circular_bug() aware of crossrelease Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
  [PATCH v5 05/13] lockdep: Pass a callback arg to check_prev_add() to handle stack_trace Byungchul Park <byungchul.park@lge.com> - 2017-01-18 14:30 +0100
    Re: [PATCH v5 05/13] lockdep: Pass a callback arg to  check_prev_add() to handle stack_trace Byungchul Park <byungchul.park@lge.com> - 2017-01-26 08:50 +0100

csiph-web