locking/lockdep: Add support for dynamic keys
Subsystems (3)
v4 cover locking/lockdep: Add support for dynamic keys
Hi Peter and Ingo,
A known shortcoming of the current lockdep implementation is that it requires lock keys to be allocated statically. This forces certain unrelated synchronization objects to share keys and this key sharing can cause false positive deadlock reports. This patch series adds support for dynamic keys in the lockdep code and eliminates a class of false positive reports from the workqueue implementation.
The changes compared to v3 are:
- Rework the code that frees objects that are no longer used such that it is now guaranteed that a grace period elapses between last use and freeing.
- The lockdep self tests pass again.
- Avoid that the patch that removes all matching lock order entries can cause list corruption. Note: the change in this patch to realize that is removed again by a later patch. In other words, this change is only necessary to make the series bisectable.
The changes compared to v2 are:
- Made sure that all schedule_free_zapped_classes() calls are protected with the graph lock.
- When removing a lock class, only recalculate lock chains that have been modified.
- Combine a list_del() and list_add_tail() call into a list_move_tail() call in register_lock_class().
- Use an RCU read lock instead of the graph lock inside is_dynamic_key().
The changes compared to v1 are:
- Addressed Peter's review comments: remove the list_head that I had added to struct lock_list again, replaced all_list_entries and free_list_entries by two bitmaps, use call_rcu() to free lockdep objects, add a BUILD_BUG_ON() that compares the size of struct lock_class_key and raw_spin_lock_t.
- Addressed the "unknown symbol" errors reported by the build bot by adding a few #ifdef / #endif directives. Addressed the 32-bit warnings by using %d instead of %ld for array indices and by casting the array indices to unsigned int.
- Removed several WARN_ON_ONCE(!class->hash_entry.pprev) statements since these duplicate the code in check_data_structures().
- Left out the patch that causes lockdep to complain if no name has been assigned to a lock object. That patch namely causes the build bot to complain about certain lock objects but I have not yet had the time to figure out the identity of these lock objects.
Bart.
Bart Van Assche (15):
locking/lockdep: Fix required memory size reported if
CONFIG_PROVE_LOCKING=n
locking/lockdep: Make zap_class() remove all matching lock order
entries
locking/lockdep: Reorder struct lock_class members locking/lockdep: Initialize the locks_before and locks_after lists
earlier
locking/lockdep: Split lockdep_free_key_range() and
lockdep_reset_lock()
locking/lockdep: Make it easy to detect whether or not inside a
selftest
locking/lockdep: Free lock classes that are no longer in use locking/lockdep: Reuse list entries that are no longer in use locking/lockdep: Introduce lockdep_next_lockchain() and
lock_chain_count()
locking/lockdep: Reuse lock chains that have been freed locking/lockdep: Check data structure consistency locking/lockdep: Verify whether lock objects are small enough to be
used as class keys
locking/lockdep: Add support for dynamic keys kernel/workqueue: Use dynamic lockdep keys for workqueues lockdep tests: Test dynamic key registration
include/linux/lockdep.h | 38 +- include/linux/workqueue.h | 28 +- kernel/locking/lockdep.c | 884 ++++++++++++++++-- kernel/locking/lockdep_internals.h | 3 +- kernel/locking/lockdep_proc.c | 12 +- kernel/workqueue.c | 60 +- lib/locking-selftest.c | 2 + tools/lib/lockdep/include/liblockdep/common.h | 2 + tools/lib/lockdep/include/liblockdep/mutex.h | 11 +- tools/lib/lockdep/tests/ABBA.c | 9 + 10 files changed, 893 insertions(+), 156 deletions(-)
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 1/15 locking/lockdep: Fix required memory size reported if CONFIG_PROVE_LOCKING=n
Lock chains are only tracked with CONFIG_PROVE_LOCKING=y. Do not report the memory required for the lock chain array if CONFIG_PROVE_LOCKING=n.
--- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/locking/lockdep.c +1 -1
@@ -4282,9 +4282,9 @@ void __init lockdep_init(void) (sizeof (struct lock_class ) *MAX_LOCKDEP_KEYS +sizeof (struct list_head ) *CLASSHASH_SIZE +sizeof (struct lock_list ) *MAX_LOCKDEP_ENTRIES + -sizeof (struct lock_chain ) *MAX_LOCKDEP_CHAINS +sizeof (struct list_head ) *CHAINHASH_SIZE #ifdef CONFIG_PROVE_LOCKING + +sizeof (struct lock_chain ) *MAX_LOCKDEP_CHAINS +sizeof (struct circular_queue ) #endif ) /1024
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 2/15 locking/lockdep: Make zap_class() remove all matching lock order entries
In reply to Bart Van AsscheMake sure that all lock order entries that refer to a class are removed from the list_entries[] array when a kernel module is unloaded.
--- include/linux/lockdep.h | 1 + kernel/locking/lockdep.c | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)
include/linux/lockdep.h +1 -0
@@ -178,6 +178,7 @@ static inline void lockdep_copy_map(struct lockdep_map *to,struct lock_list {struct list_head entry;struct lock_class *class; +struct lock_class *links_to;struct stack_trace trace;int distance;
kernel/locking/lockdep.c +13 -6
@@ -859,7 +859,8 @@ static struct lock_list *alloc_list_entry(void)/* * Add a new dependency to the head of the list: */ -static int add_lock_to_list (struct lock_class *this,struct list_head *head, +static int add_lock_to_list (struct lock_class *this, +struct lock_class *links_to,struct list_head *head,unsigned long ip,int distance,struct stack_trace *trace) {
@@ -873,6 +874,7 @@ static int add_lock_to_list(struct lock_class *this, struct list_head *head,return 0 ; entry->class = this; + entry->links_to = links_to; entry->distance = distance; entry->trace = *trace;/*
@@ -1918,14 +1920,14 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,* Ok, all validations passed, add the new lock * to the previous lock's dependency list: */ - ret =add_lock_to_list (hlock_class (next), + ret =add_lock_to_list (hlock_class (next),hlock_class (prev), &hlock_class (prev)->locks_after, next->acquire_ip, distance, trace);if (!ret)return 0 ; - ret =add_lock_to_list (hlock_class (prev), + ret =add_lock_to_list (hlock_class (prev),hlock_class (next), &hlock_class (next)->locks_before, next->acquire_ip, distance, trace);if (!ret)
@@ -4128,15 +4130,20 @@ void lockdep_reset(void)*/ static void zap_class (struct lock_class *class) { +struct lock_list *entry;int i;/* * Remove all dependencies this lock is * involved in: */ -for (i =0 ; i < nr_list_entries; i++) { -if (list_entries[i].class == class) -list_del_rcu (&list_entries[i].entry); +for (i =0 , entry = list_entries; i < nr_list_entries; i++, entry++) { +if (entry->class != class && entry->links_to != class) +continue ; +list_del_rcu (&entry->entry); +/* Clear .class and .links_to to avoid double removal. */ +WRITE_ONCE (entry->class,NULL ); +WRITE_ONCE (entry->links_to,NULL ); }/* * Unhash the class and remove it from the all_lock_classes list:
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 3/15 locking/lockdep: Reorder struct lock_class members
In reply to Bart Van AsscheThis patch does not change any functionality but makes the patch that frees lock classes that are no longer in use easier to read.
--- include/linux/lockdep.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/linux/lockdep.h +7 -7
@@ -76,6 +76,13 @@ struct lock_class {*/ struct list_head lock_entry; +/* +* These fields represent a directed graph of lock dependencies, +* to every node we attach a list of "forward" and a list of +* "backward" graph nodes. +*/ +struct list_head locks_after, locks_before; +struct lockdep_subclass_key *key;unsigned int subclass;unsigned int dep_gen_id;
@@ -86,13 +93,6 @@ struct lock_class {unsigned long usage_mask;struct stack_trace usage_traces[XXX_LOCK_USAGE_STATES ]; -/* -* These fields represent a directed graph of lock dependencies, -* to every node we attach a list of "forward" and a list of -* "backward" graph nodes. -*/ -struct list_head locks_after, locks_before; -/* * Generation counter, when doing certain classes of graph walking, * to ensure that we check one node only once:
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 4/15 locking/lockdep: Initialize the locks_before and locks_after lists earlier
In reply to Bart Van AsscheThis patch does not change any functionality. A later patch will reuse lock classes that have been freed. In combination with that patch this patch wil have the effect of initializing lock class order lists once instead of every time a lock class structure is reinitialized.
--- kernel/locking/lockdep.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
kernel/locking/lockdep.c +27 -2
@@ -735,6 +735,25 @@ static bool assign_lock_key(struct lockdep_map *lock)return true; } +/* +* Initialize the lock_classes[] array elements. +*/ +static void init_data_structures_once (void ) +{ +static bool initialization_happened; +int i; + +if (likely (initialization_happened)) +return ; + + initialization_happened = true; + +for (i =0 ; i <ARRAY_SIZE (lock_classes); i++) { +INIT_LIST_HEAD (&lock_classes[i].locks_after); +INIT_LIST_HEAD (&lock_classes[i].locks_before); + } +} +/* * Register a lock's class in the hash-table, if the class is not present * yet. Otherwise we look it up. We cache the result in the lock object
@@ -775,6 +794,8 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) goto out_unlock_set; } +init_data_structures_once (); +/* * Allocate a new key from the static array, and add it to * the hash:
@@ -793,8 +814,8 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) class->key = key; class->name = lock->name; class->subclass = subclass; -INIT_LIST_HEAD (&class->locks_before); -INIT_LIST_HEAD (&class->locks_after); +WARN_ON_ONCE (!list_empty (&class->locks_before)); +WARN_ON_ONCE (!list_empty (&class->locks_after)); class->name_version =count_matching_names (class);/* * We use RCU's safe list-add method to make
@@ -4176,6 +4197,8 @@ void lockdep_free_key_range(void *start, unsigned long size)int i;int locked; +init_data_structures_once (); +raw_local_irq_save (flags); locked =graph_lock ();
@@ -4239,6 +4262,8 @@ void lockdep_reset_lock(struct lockdep_map *lock)unsigned long flags;int j, locked; +init_data_structures_once (); +raw_local_irq_save (flags); locked =graph_lock ();
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 5/15 locking/lockdep: Split lockdep_free_key_range() and lockdep_reset_lock()
In reply to Bart Van AsscheThis patch does not change the behavior of these functions but makes the patch that frees unused lock classes easier to read.
--- kernel/locking/lockdep.c | 74 +++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 36 deletions(-)
kernel/locking/lockdep.c +38 -36
@@ -4181,6 +4181,26 @@ static inline int within(const void *addr, void *start, unsigned long size)return addr >= start && addr < start + size; } +static void __lockdep_free_key_range (void *start,unsigned long size) +{ +struct lock_class *class; +struct hlist_head *head; +int i; + +/* +* Unhash all classes that were created by this module: +*/ +for (i =0 ; i <CLASSHASH_SIZE ; i++) { + head = classhash_table + i; +hlist_for_each_entry_rcu (class, head, hash_entry) { +if (!within (class->key, start, size) && + !within (class->name, start, size)) +continue ; +zap_class (class); + } + } +} +/* * Used in module.c to remove lock classes from memory that is going to be * freed; and possibly re-used by other modules.
@@ -4191,30 +4211,14 @@ static inline int within(const void *addr, void *start, unsigned long size)*/ void lockdep_free_key_range (void *start,unsigned long size) { -struct lock_class *class; -struct hlist_head *head;unsigned long flags; -int i;int locked;init_data_structures_once ();raw_local_irq_save (flags); locked =graph_lock (); - -/* -* Unhash all classes that were created by this module: -*/ -for (i =0 ; i <CLASSHASH_SIZE ; i++) { - head = classhash_table + i; -hlist_for_each_entry_rcu (class, head, hash_entry) { -if (within (class->key, start, size)) -zap_class (class); -else if (within (class->name, start, size)) -zap_class (class); - } - } - +__lockdep_free_key_range (start, size);if (locked)graph_unlock ();raw_local_irq_restore (flags);
@@ -4256,16 +4260,11 @@ static bool lock_class_cache_is_registered(struct lockdep_map *lock)return false; } -void lockdep_reset_lock (struct lockdep_map *lock) +/* The caller must hold the graph lock. Does not sleep. */ +static void __lockdep_reset_lock (struct lockdep_map *lock) {struct lock_class *class; -unsigned long flags; -int j, locked; - -init_data_structures_once (); - -raw_local_irq_save (flags); - locked =graph_lock (); +int j;/* * Remove all classes this lock might have:
@@ -4282,19 +4281,22 @@ void lockdep_reset_lock(struct lockdep_map *lock)* Debug check: in the end all mapped classes should * be gone. */ -if (unlikely (lock_class_cache_is_registered (lock))) { -if (debug_locks_off_graph_unlock ()) { -/* -* We all just reset everything, how did it match? -*/ -WARN_ON (1 ); - } - goto out_restore; - } +if (WARN_ON_ONCE (lock_class_cache_is_registered (lock))) +debug_locks_off (); +} + +void lockdep_reset_lock (struct lockdep_map *lock) +{ +unsigned long flags; +int locked; + +init_data_structures_once (); + +raw_local_irq_save (flags); + locked =graph_lock (); +__lockdep_reset_lock (lock);if (locked)graph_unlock (); - -out_restore:raw_local_irq_restore (flags); }
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 6/15 locking/lockdep: Make it easy to detect whether or not inside a selftest
In reply to Bart Van AsscheThe patch that frees unused lock classes will modify the behavior of lockdep_free_key_range() and lockdep_reset_lock() depending on whether or not these functions are called from the context of the lockdep selftests. Hence make it easy to detect whether or not lockdep code is called from the context of a lockdep selftest.
--- include/linux/lockdep.h | 2 ++ kernel/locking/lockdep.c | 1 + lib/locking-selftest.c | 2 ++ 3 files changed, 5 insertions(+)
include/linux/lockdep.h +2 -0
@@ -466,6 +466,8 @@ enum xhlock_context_t {#define STATIC_LOCKDEP_MAP_INIT (_name, _key) \ { .name = (_name), .key = (void *)(_key), } +extern struct task_struct *lockdep_selftest_task_struct; +static inline void lockdep_invariant_state (bool force) {}static inline void lockdep_init_task (struct task_struct *task) {}static inline void lockdep_free_task (struct task_struct *task) {}
kernel/locking/lockdep.c +1 -0
@@ -81,6 +81,7 @@ module_param(lock_stat, int, 0644);* code to recurse back into the lockdep code... */ static arch_spinlock_t lockdep_lock = (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED; +struct task_struct *lockdep_selftest_task_struct;static int graph_lock (void ) {
lib/locking-selftest.c +2 -0
@@ -1989,6 +1989,7 @@ void locking_selftest(void)init_shared_classes (); debug_locks_silent = !debug_locks_verbose; + lockdep_selftest_task_struct = current;DO_TESTCASE_6R ("A-A deadlock" ,AA );DO_TESTCASE_6R ("A-B-B-A deadlock" ,ABBA );
@@ -2097,5 +2098,6 @@ void locking_selftest(void)printk ("---------------------------------\n" ); debug_locks =1 ; } + lockdep_selftest_task_struct =NULL ; debug_locks_silent =0 ; }
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 7/15 locking/lockdep: Free lock classes that are no longer in use
In reply to Bart Van AsscheInstead of leaving lock classes that are no longer in use in the lock_classes array, reuse entries from that array that are no longer in use. Maintain a linked list of free lock classes with list head 'free_lock_class'. Initialize that list from inside register_lock_class() instead of from inside lockdep_init() because register_lock_class() can be called before lockdep_init() has been called. Only add freed lock classes to the free_lock_classes list after a grace period to avoid that a lock_classes[] element would be reused while an RCU reader is accessing it. Since the lockdep selftests run in a context where sleeping is not allowed and since the selftests require that lock resetting/zapping works with debug_locks = 0, make the behavior of lockdep_free_key_range() and lockdep_reset_lock() depend on whether or not these are called from the context of the lockdep selftests.
--- include/linux/lockdep.h | 9 +- kernel/locking/lockdep.c | 434 +++++++++++++++++++++++++++++++++------ 2 files changed, 381 insertions(+), 62 deletions(-)
include/linux/lockdep.h +6 -3
@@ -63,7 +63,8 @@ extern struct lock_class_key __lockdep_no_validate__;#define LOCKSTAT_POINTS 4/* -* The lock-class itself: +* The lock-class itself. The order of the structure members matters. +* reinit_class() zeroes the key member and all subsequent members. */ struct lock_class {/*
@@ -72,7 +73,9 @@ struct lock_class {struct hlist_node hash_entry;/* -* global list of all lock-classes: +* Entry in all_lock_classes when in use. Entry in free_lock_classes +* when not in use. Instances that are being freed are on one of the +* zapped_classes lists. */ struct list_head lock_entry;
@@ -104,7 +107,7 @@ struct lock_class {unsigned long contention_point[LOCKSTAT_POINTS ];unsigned long contending_point[LOCKSTAT_POINTS ];#endif -}; +} __no_randomize_layout;#ifdef CONFIG_LOCK_STAT struct lock_time {
kernel/locking/lockdep.c +375 -59
600 lines not on this page · raw message
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 8/15 locking/lockdep: Reuse list entries that are no longer in use
In reply to Bart Van AsscheInstead of abandoning elements of list_entries[] that are no longer in use, make alloc_list_entry() reuse array elements that have been freed.
--- kernel/locking/lockdep.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-)
kernel/locking/lockdep.c +23 -10
@@ -45,6 +45,7 @@#include <linux/hash.h> #include <linux/ftrace.h> #include <linux/stringify.h> +#include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/gfp.h> #include <linux/random.h>
@@ -132,6 +133,7 @@ static inline int debug_locks_off_graph_unlock(void)unsigned long nr_list_entries;static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES ]; +static DECLARE_BITMAP(list_entries_in_use, MAX_LOCKDEP_ENTRIES);/* * All data structures here are protected by the global debug_lock.
@@ -296,6 +298,7 @@ static struct pending_free {struct list_head zapped_classes;struct rcu_head rcu_head;bool scheduled; +DECLARE_BITMAP (list_entries_being_freed,MAX_LOCKDEP_ENTRIES ); } pending_free[2 ];static DECLARE_WAIT_QUEUE_HEAD (rcu_cb);
@@ -891,7 +894,10 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)*/ static struct lock_list *alloc_list_entry (void ) { -if (nr_list_entries >=MAX_LOCKDEP_ENTRIES ) { +int idx =find_first_zero_bit (list_entries_in_use, +ARRAY_SIZE (list_entries)); + +if (idx >=ARRAY_SIZE (list_entries)) {if (!debug_locks_off_graph_unlock ())return NULL ;
@@ -899,7 +905,9 @@ static struct lock_list *alloc_list_entry(void)dump_stack ();return NULL ; } -return list_entries + nr_list_entries++; + nr_list_entries++; +__set_bit (idx, list_entries_in_use); +return list_entries + idx; }/*
@@ -1003,7 +1011,7 @@ static inline void mark_lock_accessed(struct lock_list *lock,unsigned long nr; nr = lock - list_entries; -WARN_ON (nr >= nr_list_entries);/* Out-of-bounds, input fail */ +WARN_ON (nr >=ARRAY_SIZE (list_entries));/* Out-of-bounds, input fail */ lock->parent = parent; lock->class->dep_gen_id = lockdep_dependency_gen_id; }
@@ -1013,7 +1021,7 @@ static inline unsigned long lock_accessed(struct lock_list *lock)unsigned long nr; nr = lock - list_entries; -WARN_ON (nr >= nr_list_entries);/* Out-of-bounds, input fail */ +WARN_ON (nr >=ARRAY_SIZE (list_entries));/* Out-of-bounds, input fail */ return lock->class->dep_gen_id == lockdep_dependency_gen_id; }
@@ -4281,13 +4289,14 @@ static void zap_class(struct pending_free *pf, struct lock_class *class)* Remove all dependencies this lock is * involved in: */ -for (i =0 , entry = list_entries; i < nr_list_entries; i++, entry++) { +for_each_set_bit (i, list_entries_in_use,ARRAY_SIZE (list_entries)) { + entry = list_entries + i;if (entry->class != class && entry->links_to != class)continue ; +if (__test_and_set_bit (i, pf->list_entries_being_freed)) +continue ; + nr_list_entries--;list_del_rcu (&entry->entry); -/* Clear .class and .links_to to avoid double removal. */ -WRITE_ONCE (entry->class,NULL ); -WRITE_ONCE (entry->links_to,NULL ); }if (list_empty (&class->locks_after) &&list_empty (&class->locks_before)) {
@@ -4329,8 +4338,9 @@ static bool inside_selftest(void) }/* -* Free all lock classes that are on the pf->zapped_classes list. May be called -* from RCU callback context. +* Free all lock classes that are on the pf->zapped_classes list and also all +* list entries that have been marked as being freed. Called as an RCU +* callback function. May be called from RCU callback context. */ static void free_zapped_classes (struct rcu_head *ch) {
@@ -4346,6 +4356,9 @@ static void free_zapped_classes(struct rcu_head *ch)reinit_class (class); }list_splice_init (&pf->zapped_classes, &free_lock_classes); +bitmap_andnot (list_entries_in_use, list_entries_in_use, + pf->list_entries_being_freed,ARRAY_SIZE (list_entries)); +bitmap_clear (pf->list_entries_being_freed,0 ,ARRAY_SIZE (list_entries));graph_unlock (); restore_irqs:raw_local_irq_restore (flags);
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 9/15 locking/lockdep: Introduce lockdep_next_lockchain() and lock_chain_count()
In reply to Bart Van AsscheThis patch does not change any functionality but makes the next patch in this series easier to read.
--- kernel/locking/lockdep.c | 16 +++++++++++++++- kernel/locking/lockdep_internals.h | 3 ++- kernel/locking/lockdep_proc.c | 12 ++++++------ 3 files changed, 23 insertions(+), 8 deletions(-)
kernel/locking/lockdep.c +15 -1
@@ -2092,7 +2092,7 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)return 0 ; } -unsigned long nr_lock_chains; +static unsigned long nr_lock_chains;struct lock_chain lock_chains[MAX_LOCKDEP_CHAINS ];int nr_chain_hlocks;static u16 chain_hlocks[MAX_LOCKDEP_CHAIN_HLOCKS ];
@@ -2226,6 +2226,20 @@ static int check_no_collision(struct task_struct *curr,return 1 ; } +/* +* Given an index that is >= -1, return the index of the next lock chain. +* Return -2 if there is no next lock chain. +*/ +long lockdep_next_lockchain (long i) +{ +return i +1 < nr_lock_chains ? i +1 :-2 ; +} + +unsigned long lock_chain_count (void ) +{ +return nr_lock_chains; +} +/* * Adds a dependency chain into chain hashtable. And must be called with * graph_lock held.
kernel/locking/lockdep_internals.h +2 -1
@@ -96,7 +96,8 @@ struct lock_class *lock_chain_get_class(struct lock_chain *chain, int i);extern unsigned long nr_lock_classes;extern unsigned long nr_list_entries; -extern unsigned long nr_lock_chains; +long lockdep_next_lockchain (long i); +unsigned long lock_chain_count (void );extern int nr_chain_hlocks;extern unsigned long nr_stack_trace_entries;
kernel/locking/lockdep_proc.c +6 -6
@@ -104,18 +104,18 @@ static const struct seq_operations lockdep_ops = {#ifdef CONFIG_PROVE_LOCKING static void *lc_start (struct seq_file *m,loff_t *pos) { +if (*pos <0 ) +return NULL ; +if (*pos ==0 )return SEQ_START_TOKEN ; -if (*pos -1 < nr_lock_chains) -return lock_chains + (*pos -1 ); - -return NULL ; +return lock_chains + (*pos -1 ); }static void *lc_next (struct seq_file *m,void *v,loff_t *pos) { - (*pos)++; + *pos =lockdep_next_lockchain (*pos -1 ) +1 ;return lc_start (m, pos); }
@@ -268,7 +268,7 @@ static int lockdep_stats_show(struct seq_file *m, void *v)#ifdef CONFIG_PROVE_LOCKING seq_printf (m," dependency chains: %11lu [max: %lu]\n" , - nr_lock_chains,MAX_LOCKDEP_CHAINS ); +lock_chain_count (),MAX_LOCKDEP_CHAINS );seq_printf (m," dependency chain hlocks: %11d [max: %lu]\n" , nr_chain_hlocks,MAX_LOCKDEP_CHAIN_HLOCKS );#endif
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 10/15 locking/lockdep: Reuse lock chains that have been freed
In reply to Bart Van AsscheA previous patch introduced a lock chain leak. Fix that leak by reusing lock chains that have been freed.
--- kernel/locking/lockdep.c | 48 +++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 15 deletions(-)
kernel/locking/lockdep.c +33 -15
@@ -299,6 +299,7 @@ static struct pending_free {struct rcu_head rcu_head;bool scheduled;DECLARE_BITMAP (list_entries_being_freed,MAX_LOCKDEP_ENTRIES ); +DECLARE_BITMAP (lock_chains_being_freed,MAX_LOCKDEP_CHAINS ); } pending_free[2 ];static DECLARE_WAIT_QUEUE_HEAD (rcu_cb);
@@ -2092,8 +2093,8 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)return 0 ; } -static unsigned long nr_lock_chains;struct lock_chain lock_chains[MAX_LOCKDEP_CHAINS ]; +static DECLARE_BITMAP(lock_chains_in_use, MAX_LOCKDEP_CHAINS);int nr_chain_hlocks;static u16 chain_hlocks[MAX_LOCKDEP_CHAIN_HLOCKS ];
@@ -2232,12 +2233,25 @@ static int check_no_collision(struct task_struct *curr,*/ long lockdep_next_lockchain (long i) { -return i +1 < nr_lock_chains ? i +1 :-2 ; + i =find_next_bit (lock_chains_in_use,ARRAY_SIZE (lock_chains), i +1 ); +return i <ARRAY_SIZE (lock_chains) ? i :-2 ; }unsigned long lock_chain_count (void ) { -return nr_lock_chains; +return bitmap_weight (lock_chains_in_use,ARRAY_SIZE (lock_chains)); +} + +/* Must be called with the graph lock held. */ +static struct lock_chain *alloc_lock_chain (void ) +{ +int idx =find_first_zero_bit (lock_chains_in_use, +ARRAY_SIZE (lock_chains)); + +if (unlikely (idx >=ARRAY_SIZE (lock_chains))) +return NULL ; +__set_bit (idx, lock_chains_in_use); +return lock_chains + idx; }/*
@@ -2269,7 +2283,8 @@ static inline int add_chain_cache(struct task_struct *curr,if (DEBUG_LOCKS_WARN_ON (!irqs_disabled ()))return 0 ; -if (unlikely (nr_lock_chains >=MAX_LOCKDEP_CHAINS )) { + chain =alloc_lock_chain (); +if (!chain) {if (!debug_locks_off_graph_unlock ())return 0 ;
@@ -2277,7 +2292,6 @@ static inline int add_chain_cache(struct task_struct *curr,dump_stack ();return 0 ; } - chain = lock_chains + nr_lock_chains++; chain->chain_key = chain_key; chain->irq_context = hlock->irq_context; i =get_first_held_lock (curr, hlock);
@@ -4214,7 +4228,8 @@ void lockdep_reset(void) }/* Remove a class from a lock chain. Must be called with the graph lock held. */ -static void remove_class_from_lock_chain (struct lock_chain *chain, +static void remove_class_from_lock_chain (struct pending_free *pf, +struct lock_chain *chain,struct lock_class *class) {#ifdef CONFIG_PROVE_LOCKING
@@ -4252,6 +4267,7 @@ static void remove_class_from_lock_chain(struct lock_chain *chain,* hlist_for_each_entry_rcu() loop is safe. */ hlist_del_rcu (&chain->entry); +__set_bit (chain - lock_chains, pf->lock_chains_being_freed);if (chain->depth ==0 )return ;/*
@@ -4260,22 +4276,19 @@ static void remove_class_from_lock_chain(struct lock_chain *chain,*/ if (lookup_chain_cache (chain_key))return ; -if (WARN_ON_ONCE (nr_lock_chains >=MAX_LOCKDEP_CHAINS )) { + new_chain =alloc_lock_chain (); +if (WARN_ON_ONCE (!new_chain)) {debug_locks_off ();return ; } -/* -* Leak *chain because it is not safe to reinsert it before an RCU -* grace period has expired. -*/ - new_chain = lock_chains + nr_lock_chains++; *new_chain = *chain;hlist_add_head_rcu (&new_chain->entry,chainhashentry (chain_key));#endif }/* Must be called with the graph lock held. */ -static void remove_class_from_lock_chains (struct lock_class *class) +static void remove_class_from_lock_chains (struct pending_free *pf, +struct lock_class *class) {struct lock_chain *chain;struct hlist_head *head;
@@ -4284,7 +4297,7 @@ static void remove_class_from_lock_chains(struct lock_class *class)for (i =0 ; i <ARRAY_SIZE (chainhash_table); i++) { head = chainhash_table + i;hlist_for_each_entry_rcu (chain, head, entry) { -remove_class_from_lock_chain (chain, class); +remove_class_from_lock_chain (pf, chain, class); } } }
@@ -4324,7 +4337,7 @@ static void zap_class(struct pending_free *pf, struct lock_class *class) class->name); } -remove_class_from_lock_chains (class); +remove_class_from_lock_chains (pf, class); }static void reinit_class (struct lock_class *class)
@@ -4373,6 +4386,11 @@ static void free_zapped_classes(struct rcu_head *ch)bitmap_andnot (list_entries_in_use, list_entries_in_use, pf->list_entries_being_freed,ARRAY_SIZE (list_entries));bitmap_clear (pf->list_entries_being_freed,0 ,ARRAY_SIZE (list_entries)); +#ifdef CONFIG_PROVE_LOCKING +bitmap_andnot (lock_chains_in_use, lock_chains_in_use, + pf->lock_chains_being_freed,ARRAY_SIZE (lock_chains)); +bitmap_clear (pf->lock_chains_being_freed,0 ,ARRAY_SIZE (lock_chains)); +#endif graph_unlock (); restore_irqs:raw_local_irq_restore (flags);
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 11/15 locking/lockdep: Check data structure consistency
In reply to Bart Van AsscheDebugging lockdep data structure inconsistencies is challenging. Add disabled code that verifies data structure consistency at runtime.
--- kernel/locking/lockdep.c | 183 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+)
kernel/locking/lockdep.c +183 -0
@@ -74,6 +74,8 @@ module_param(lock_stat, int, 0644);#define lock_stat 0#endif +static bool check_data_structure_consistency; +/* * lockdep_lock: protects the lockdep graph, the hashes and the * class/list/hash allocators.
@@ -755,6 +757,185 @@ static bool assign_lock_key(struct lockdep_map *lock)return true; } +/* Check whether element @e occurs in list @h */ +static bool in_list (struct list_head *e,struct list_head *h) +{ +struct list_head *f; + +list_for_each (f, h) { +if (e == f) +return true; + } + +return false; +} + +/* +* Check whether entry @e occurs in any of the locks_after or locks_before +* lists. +*/ +static bool in_any_class_list (struct list_head *e) +{ +struct lock_class *class; +int i; + +for (i =0 ; i <ARRAY_SIZE (lock_classes); i++) { + class = &lock_classes[i]; +if (in_list (e, &class->locks_after) || +in_list (e, &class->locks_before)) +return true; + } +return false; +} + +static bool class_lock_list_valid (struct lock_class *c,struct list_head *h) +{ +struct lock_list *e; + +list_for_each_entry (e, h, entry) { +if (e->links_to != c) { +printk (KERN_INFO "class %s: mismatch for lock entry %ld; class %s <> %s" , + c->name ? :"(?)" , + (unsigned long )(e - list_entries), + e->links_to && e->links_to->name ? + e->links_to->name :"(?)" , + e->class && e->class->name ? e->class->name : +"(?)" ); +return false; + } + } +return true; +} + +static u16 chain_hlocks[]; + +static bool check_lock_chain_key (struct lock_chain *chain) +{ +#ifdef CONFIG_PROVE_LOCKING +u64 chain_key =0 ; +int i; + +for (i = chain->base; i < chain->base + chain->depth; i++) + chain_key =iterate_chain_key (chain_key, chain_hlocks[i] +1 ); +/* +* The 'unsigned long long' casts avoid that a compiler warning +* is reported when building tools/lib/lockdep. +*/ +if (chain->chain_key != chain_key) +printk (KERN_INFO "chain %lld: key %#llx <> %#llx\n" , + (unsigned long long )(chain - lock_chains), + (unsigned long long )chain->chain_key, + (unsigned long long )chain_key); +return chain->chain_key == chain_key; +#else +return true; +#endif +} + +static bool list_entry_being_freed (int list_entry_idx) +{ +struct pending_free *pf; +int i; + +for (i =0 , pf = pending_free; i <ARRAY_SIZE (pending_free); + i++, pf++) +if (test_bit (list_entry_idx, pf->list_entries_being_freed)) +return true; + +return false; +} + +static bool in_any_zapped_class_list (struct lock_class *class) +{ +struct pending_free *pf; +int i; + +for (i =0 , pf = pending_free; i <ARRAY_SIZE (pending_free); + i++, pf++) +if (in_list (&class->lock_entry, &pf->zapped_classes)) +return true; + +return false; +} + +static bool check_data_structures (void ) +{ +struct lock_class *class; +struct lock_chain *chain; +struct hlist_head *head; +struct lock_list *e; +int i; + +/* Check whether all classes occur in a lock list. */ +for (i =0 ; i <ARRAY_SIZE (lock_classes); i++) { + class = &lock_classes[i]; +if (!in_list (&class->lock_entry, &all_lock_classes) && + !in_list (&class->lock_entry, &free_lock_classes) && + !in_any_zapped_class_list (class)) { +printk (KERN_INFO "class %px/%s is not in any class list\n" , + class, class->name ? :"(?)" ); +return false; +return false; + } + } + +/* Check whether all classes have valid lock lists. */ +for (i =0 ; i <ARRAY_SIZE (lock_classes); i++) { + class = &lock_classes[i]; +if (!class_lock_list_valid (class, &class->locks_before)) +return false; +if (!class_lock_list_valid (class, &class->locks_after)) +return false; + } + +/* Check the chain_key of all lock chains. */ +for (i =0 ; i <ARRAY_SIZE (chainhash_table); i++) { + head = chainhash_table + i; +hlist_for_each_entry_rcu (chain, head, entry) { +if (!check_lock_chain_key (chain)) +return false; + } + } + +/* +* Check whether all list entries that are in use occur in a class +* lock list. +*/ +for_each_set_bit (i, list_entries_in_use,ARRAY_SIZE (list_entries)) { +if (list_entry_being_freed (i)) +continue ; + e = list_entries + i; +if (!in_any_class_list (&e->entry)) { +printk (KERN_INFO "list entry %d is not in any class list; class %s <> %s\n" , + (unsigned int )(e - list_entries), + e->class->name ? :"(?)" , + e->links_to->name ? :"(?)" ); +return false; + } + } + +/* +* Check whether all list entries that are not in use do not occur in +* a class lock list. +*/ +for_each_clear_bit (i, list_entries_in_use,ARRAY_SIZE (list_entries)) { +if (WARN_ON_ONCE (list_entry_being_freed (i))) +return false; + e = list_entries + i; +if (in_any_class_list (&e->entry)) { +printk (KERN_INFO "list entry %d occurs in a class list; class %s <> %s\n" , + (unsigned int )(e - list_entries), + e->class && e->class->name ? e->class->name : +"(?)" , + e->links_to && e->links_to->name ? + e->links_to->name :"(?)" ); +return false; + } + } + +return true; +} +/* * Initialize the lock_classes[] array elements, the free_lock_classes list * and also the pending_free[] array.
@@ -4379,6 +4560,8 @@ static void free_zapped_classes(struct rcu_head *ch)if (!graph_lock ()) goto restore_irqs; pf->scheduled = false; +if (check_data_structure_consistency) +WARN_ON_ONCE (!check_data_structures ());list_for_each_entry (class, &pf->zapped_classes, lock_entry) {reinit_class (class); }
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 12/15 locking/lockdep: Verify whether lock objects are small enough to be used as class keys
In reply to Bart Van Assche--- kernel/locking/lockdep.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
kernel/locking/lockdep.c +11 -0
@@ -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))
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 13/15 locking/lockdep: Add support for dynamic keys
In reply to Bart Van AsscheA shortcoming of the current lockdep implementation is that it requires lock keys to be allocated statically. That forces certain lock objects to share lock keys. Since lock dependency analysis groups lock objects per key sharing lock keys can cause false positive lockdep reports. Make it possible to avoid such false positive reports by allowing lock keys to be allocated dynamically. Require that dynamically allocated lock keys are registered before use by calling lockdep_register_key(). Complain about attempts to register the same lock key pointer twice without calling lockdep_unregister_key() between successive registration calls.
The purpose of the new lock_keys_hash[] data structure that keeps track of all dynamic keys is twofold:
- Verify whether the lockdep_register_key() and lockdep_unregister_key() functions are used correctly.
- Avoid that lockdep_init_map() complains when encountering a dynamically allocated key.
--- include/linux/lockdep.h | 13 +++-- kernel/locking/lockdep.c | 114 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 116 insertions(+), 11 deletions(-)
include/linux/lockdep.h +10 -3
@@ -46,15 +46,19 @@ extern int lock_stat;#define NR_LOCKDEP_CACHING_CLASSES 2/* -* Lock-classes are keyed via unique addresses, by embedding the -* lockclass-key into the kernel (or module) .data section. (For -* static locks we use the lock address itself as the key.) +* A lockdep key is associated with each lock object. For static locks we use +* the lock address itself as the key. Dynamically allocated lock objects can +* have a statically or dynamically allocated key. Dynamically allocated lock +* keys must be registered before being used and must be unregistered before +* the key memory is freed. */ struct lockdep_subclass_key {char __one_byte; } __attribute__ ((__packed__ )); +/* hash_entry is used to keep track of dynamically allocated keys. */ struct lock_class_key { +struct hlist_node hash_entry;struct lockdep_subclass_key subkeys[MAX_LOCKDEP_SUBCLASSES ]; };
@@ -272,6 +276,9 @@ extern asmlinkage void lockdep_sys_exit(void);extern void lockdep_off (void );extern void lockdep_on (void ); +extern void lockdep_register_key (struct lock_class_key *key); +extern void lockdep_unregister_key (struct lock_class_key *key); +/* * These methods are used by specific locking variants (spinlocks, * rwlocks, mutexes and rwsems) to pass init/acquire/release events
kernel/locking/lockdep.c +106 -8
151 lines not on this page · raw message
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
Quoted 11 lines · Bart Van Assche
+-/*>+- *Unregister a dynamically allocated key. Must not be called from interrupt
+- *context. The caller must ensure that freeing @key only happens after an RCU
+- *grace period.
+- */
+-void lockdep_unregister_key(struct lock_class_key *key)
+-{>+- struct hlist_head *hash_head =keyhashentry(key);>+- struct lock_class_key *k;>+- struct pending_free *pf;>+- unsigned long flags;>+- bool found =false;>+-
+- might_sleep();>+-
+- if (WARN_ON_ONCE(static_obj(key)))
+- return;>+-
+- pf =get_pending_free_lock(&flags);>+- if (WARN_ON_ONCE(!pf))
+- return;>+- hlist_for_each_entry_rcu(k, hash_head, hash_entry) {>+- if (k ==key) {>+- hlist_del_rcu(&k->hash_entry);>+- found =true;>+- break;>+- }>+- }>+- WARN_ON_ONCE(!found);>+- __lockdep_free_key_range(pf, key, 1);>+- schedule_free_zapped_classes(pf);>+- graph_unlock();>+- raw_local_irq_restore(flags);>+-}>+-EXPORT_SYMBOL_GPL(lockdep_unregister_key);Since is_dynamic_key() has been modified from using locking into using RCU, a synchronize_rcu() call needs to be added at the end of lockdep_unregister_key(). I will repost this patch series if the 0-day test infrastructure is happy with the new version.
Bart.
PATCH v4 14/15 kernel/workqueue: Use dynamic lockdep keys for workqueues
In reply to Bart Van AsscheCommit 87915adc3f0a ("workqueue: re-add lockdep dependencies for flushing") improved deadlock checking in the workqueue implementation. Unfortunately that patch also introduced a few false positive lockdep complaints. This patch suppresses these false positives by allocating the workqueue mutex lockdep key dynamically. An example of a false positive lockdep complaint suppressed by this report can be found below. The root cause of the lockdep complaint shown below is that the direct I/O code can call alloc_workqueue() from inside a work item created by another alloc_workqueue() call and that both workqueues share the same lockdep key. This patch avoids that that lockdep complaint is triggered by allocating the work queue lockdep keys dynamically. In other words, this patch guarantees that a unique lockdep key is associated with each work queue mutex.
======================================================
WARNING: possible circular locking dependency detected
4.19.0-dbg+ #1 Not tainted
------------------------------------------------------
fio/4129 is trying to acquire lock:00000000a01cfe1a ((wq_completion)"dio/%s"sb->s_id){+.+.}, at: flush_workqueue+0xd0/0x970
but task is already holding lock:00000000a0acecf9 (&sb->s_type->i_mutex_key#14){+.+.}, at: ext4_file_write_iter+0x154/0x710
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&sb->s_type->i_mutex_key#14){+.+.}:
down_write+0x3d/0x80
__generic_file_fsync+0x77/0xf0
ext4_sync_file+0x3c9/0x780
vfs_fsync_range+0x66/0x100
dio_complete+0x2f5/0x360
dio_aio_complete_work+0x1c/0x20
process_one_work+0x481/0x9f0
worker_thread+0x63/0x5a0
kthread+0x1cf/0x1f0
ret_from_fork+0x24/0x30-> #1 ((work_completion)(&dio->complete_work)){+.+.}:
process_one_work+0x447/0x9f0
worker_thread+0x63/0x5a0
kthread+0x1cf/0x1f0
ret_from_fork+0x24/0x30-> #0 ((wq_completion)"dio/%s"sb->s_id){+.+.}:
lock_acquire+0xc5/0x200
flush_workqueue+0xf3/0x970
drain_workqueue+0xec/0x220
destroy_workqueue+0x23/0x350
sb_init_dio_done_wq+0x6a/0x80
do_blockdev_direct_IO+0x1f33/0x4be0
__blockdev_direct_IO+0x79/0x86
ext4_direct_IO+0x5df/0xbb0
generic_file_direct_write+0x119/0x220
__generic_file_write_iter+0x131/0x2d0
ext4_file_write_iter+0x3fa/0x710
aio_write+0x235/0x330
io_submit_one+0x510/0xeb0
__x64_sys_io_submit+0x122/0x340
do_syscall_64+0x71/0x220
entry_SYSCALL_64_after_hwframe+0x49/0xbeother info that might help us debug this:
Chain exists of: (wq_completion)"dio/%s"sb->s_id --> (work_completion)(&dio->complete_work) --> &sb->s_type->i_mutex_key#14 Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&sb->s_type->i_mutex_key#14);
lock((work_completion)(&dio->complete_work));
lock(&sb->s_type->i_mutex_key#14);lock((wq_completion)"dio/%s"sb->s_id);
*** DEADLOCK ***
1 lock held by fio/4129:
#0: 00000000a0acecf9 (&sb->s_type->i_mutex_key#14){+.+.}, at: ext4_file_write_iter+0x154/0x710
stack backtrace: CPU: 3 PID: 4129 Comm: fio Not tainted 4.19.0-dbg+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 Call Trace: dump_stack+0x86/0xc5 print_circular_bug.isra.32+0x20a/0x218 __lock_acquire+0x1c68/0x1cf0 lock_acquire+0xc5/0x200 flush_workqueue+0xf3/0x970 drain_workqueue+0xec/0x220 destroy_workqueue+0x23/0x350 sb_init_dio_done_wq+0x6a/0x80 do_blockdev_direct_IO+0x1f33/0x4be0 __blockdev_direct_IO+0x79/0x86 ext4_direct_IO+0x5df/0xbb0 generic_file_direct_write+0x119/0x220 __generic_file_write_iter+0x131/0x2d0 ext4_file_write_iter+0x3fa/0x710 aio_write+0x235/0x330 io_submit_one+0x510/0xeb0 __x64_sys_io_submit+0x122/0x340 do_syscall_64+0x71/0x220 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- include/linux/workqueue.h | 28 +++--------------- kernel/workqueue.c | 60 +++++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 33 deletions(-)
include/linux/workqueue.h +4 -24
@@ -390,43 +390,23 @@ extern struct workqueue_struct *system_freezable_wq;extern struct workqueue_struct *system_power_efficient_wq;extern struct workqueue_struct *system_freezable_power_efficient_wq; -extern struct workqueue_struct * -__alloc_workqueue_key (const char *fmt,unsigned int flags,int max_active, -struct lock_class_key *key,const char *lock_name, ...)__printf (1 ,6 ); -/** * alloc_workqueue - allocate a workqueue * @fmt: printf format for the name of the workqueue * @flags: WQ_* flags * @max_active: max in-flight work items, 0 for default -* @args...: args for @fmt +* remaining args: args for @fmt * * Allocate a workqueue with the specified parameters. For detailed * information on WQ_* flags, please refer to * Documentation/core-api/workqueue.rst. * -* The __lock_name macro dance is to guarantee that single lock_class_key -* doesn't end up with different namesm, which isn't allowed by lockdep. -* * RETURNS: * Pointer to the allocated workqueue on success, %NULL on failure. */ -#ifdef CONFIG_LOCKDEP -#define alloc_workqueue(fmt, flags, max_active, args...) \ -({ \ - static struct lock_class_key __key; \ - const char *__lock_name; \ - \ - __lock_name = "(wq_completion)"#fmt#args; \ - \ - __alloc_workqueue_key((fmt), (flags), (max_active), \ - &__key, __lock_name, ##args); \ -}) -#else -#define alloc_workqueue(fmt, flags, max_active, args...) \ - __alloc_workqueue_key((fmt), (flags), (max_active), \ - NULL, NULL, ##args) -#endif +struct workqueue_struct *alloc_workqueue (const char *fmt, +unsigned int flags, +int max_active, ...);/** * alloc_ordered_workqueue - allocate an ordered workqueue
kernel/workqueue.c +51 -9
114 lines not on this page · raw message
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog
PATCH v4 15/15 lockdep tests: Test dynamic key registration
In reply to Bart Van AsscheMake sure that the lockdep_register_key() and lockdep_unregister_key() code is tested when running the lockdep tests.
--- tools/lib/lockdep/include/liblockdep/common.h | 2 ++ tools/lib/lockdep/include/liblockdep/mutex.h | 11 ++++++----- tools/lib/lockdep/tests/ABBA.c | 9 +++++++++ 3 files changed, 17 insertions(+), 5 deletions(-)
tools/lib/lockdep/include/liblockdep/common.h +2 -0
@@ -45,6 +45,8 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass,void lock_release (struct lockdep_map *lock,int nested,unsigned long ip);void lockdep_reset_lock (struct lockdep_map *lock); +void lockdep_register_key (struct lock_class_key *key); +void lockdep_unregister_key (struct lock_class_key *key);extern void debug_check_no_locks_freed (const void *from,unsigned long len);#define STATIC_LOCKDEP_MAP_INIT (_name, _key) \
tools/lib/lockdep/include/liblockdep/mutex.h +6 -5
@@ -7,6 +7,7 @@struct liblockdep_pthread_mutex {pthread_mutex_t mutex; +struct lock_class_key key;struct lockdep_map dep_map; };
@@ -27,11 +28,10 @@ static inline int __mutex_init(liblockdep_pthread_mutex_t *lock,return pthread_mutex_init (&lock->mutex, __mutexattr); } -#define liblockdep_pthread_mutex_init (mutex, mutexattr) \ -({ \ - static struct lock_class_key __key; \ - \ - __mutex_init((mutex), #mutex, &__key, (mutexattr)); \ +#define liblockdep_pthread_mutex_init (mutex, mutexattr) \ +({ \ + lockdep_register_key(&(mutex)->key); \ + __mutex_init((mutex), #mutex, &(mutex)->key, (mutexattr)); \ })static inline int liblockdep_pthread_mutex_lock (liblockdep_pthread_mutex_t *lock)
@@ -55,6 +55,7 @@ static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *lstatic inline int liblockdep_pthread_mutex_destroy (liblockdep_pthread_mutex_t *lock) {lockdep_reset_lock (&lock->dep_map); +lockdep_unregister_key (&lock->key);return pthread_mutex_destroy (&lock->mutex); }
tools/lib/lockdep/tests/ABBA.c +9 -0
@@ -14,4 +14,13 @@ void main(void)pthread_mutex_destroy (&b);pthread_mutex_destroy (&a); + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, a); + +pthread_mutex_destroy (&b); +pthread_mutex_destroy (&a); }
Signature · 1 line
2.20.0.rc2.403.gdbc3b29805-goog