mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
locking/lockdep: Stop using RCU primitives to access 'all_lock_classes'
Due to the previous patch all code that accesses the 'all_lock_classes' list holds the graph lock. Hence use regular list primitives instead of their RCU variants to access this list. Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sasha Levin <sasha.levin@oracle.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Waiman Long <longman@redhat.com> Cc: johannes.berg@intel.com Cc: tj@kernel.org Link: https://lkml.kernel.org/r/20181207011148.251812-14-bvanassche@acm.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
786fa29e9c
commit
fe27b0de8d
1 changed files with 5 additions and 4 deletions
|
@ -629,7 +629,8 @@ static int static_obj(void *obj)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* To make lock name printouts unique, we calculate a unique
|
* To make lock name printouts unique, we calculate a unique
|
||||||
* class->name_version generation counter:
|
* class->name_version generation counter. The caller must hold the graph
|
||||||
|
* lock.
|
||||||
*/
|
*/
|
||||||
static int count_matching_names(struct lock_class *new_class)
|
static int count_matching_names(struct lock_class *new_class)
|
||||||
{
|
{
|
||||||
|
@ -639,7 +640,7 @@ static int count_matching_names(struct lock_class *new_class)
|
||||||
if (!new_class->name)
|
if (!new_class->name)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
list_for_each_entry_rcu(class, &all_lock_classes, lock_entry) {
|
list_for_each_entry(class, &all_lock_classes, lock_entry) {
|
||||||
if (new_class->key - new_class->subclass == class->key)
|
if (new_class->key - new_class->subclass == class->key)
|
||||||
return class->name_version;
|
return class->name_version;
|
||||||
if (class->name && !strcmp(class->name, new_class->name))
|
if (class->name && !strcmp(class->name, new_class->name))
|
||||||
|
@ -803,7 +804,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
|
||||||
/*
|
/*
|
||||||
* Add it to the global list of classes:
|
* Add it to the global list of classes:
|
||||||
*/
|
*/
|
||||||
list_add_tail_rcu(&class->lock_entry, &all_lock_classes);
|
list_add_tail(&class->lock_entry, &all_lock_classes);
|
||||||
|
|
||||||
if (verbose(class)) {
|
if (verbose(class)) {
|
||||||
graph_unlock();
|
graph_unlock();
|
||||||
|
@ -4141,7 +4142,7 @@ static void zap_class(struct lock_class *class)
|
||||||
* Unhash the class and remove it from the all_lock_classes list:
|
* Unhash the class and remove it from the all_lock_classes list:
|
||||||
*/
|
*/
|
||||||
hlist_del_rcu(&class->hash_entry);
|
hlist_del_rcu(&class->hash_entry);
|
||||||
list_del_rcu(&class->lock_entry);
|
list_del(&class->lock_entry);
|
||||||
|
|
||||||
RCU_INIT_POINTER(class->key, NULL);
|
RCU_INIT_POINTER(class->key, NULL);
|
||||||
RCU_INIT_POINTER(class->name, NULL);
|
RCU_INIT_POINTER(class->name, NULL);
|
||||||
|
|
Loading…
Reference in a new issue