Skip to contentSkip to conversation

lockdep: Include all lock classes in all_lock_classes

PATCH In review Dale Farnsworth 2 participants 4 messages Feb 1, 2008 – Feb 3, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lockdep: Include all lock classes in all_lock_classes

Add each lock class to the all_lock_classes list when it is first registered.

Previously, lock classes were added to all_lock_classes when the lock class was first used. Since one of the uses of the list is to find unused locks, this didn't work well.

---
 kernel/lockdep.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
kernel/lockdep.c +4 -4
index 723bd9f..e630127 100644
@@ -779,6 +779,10 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
 	 * parallel walking of the hash-list safe:
 	 */
 	list_add_tail_rcu(&class->hash_entry, hash_head);
+	/*
+	 * Add it to the global list of classes:
+	 */
+	list_add_tail_rcu(&class->lock_entry, &all_lock_classes);
 
 	if (verbose(class)) {
 		graph_unlock();
@@ -2282,10 +2286,6 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
 			return 0;
 		break;
 	case LOCK_USED:
-		/*
-		 * Add it to the global list of classes:
-		 */
-		list_add_tail_rcu(&this->class->lock_entry, &all_lock_classes);
 		debug_atomic_dec(&nr_unused_locks);
 		break;
 	default:
Signature · 1 line
1.5.3.4
#1 lore raw
Quoted 8 lines · Dale Farnsworth

Add each lock class to the all_lock_classes list when it is first registered.

Previously, lock classes were added to all_lock_classes when the lock class was first used.

Since one of the uses of the list is to find unused locks, this didn't work well.

You mean in lockdep_proc.c to generate the statistics?

Another potential issue might be count_matching_names() generating a wrong class version.

#2 lore raw
Quoted 11 lines · Peter Zijlstra
Quoted 8 lines · Dale Farnsworth

Add each lock class to the all_lock_classes list when it is first registered.

Previously, lock classes were added to all_lock_classes when the lock class was first used.

Since one of the uses of the list is to find unused locks, this didn't work well.

You mean in lockdep_proc.c to generate the statistics?

Yes, that's where I noticed it. On my platform, there was one unused lock which was missed.

Quoted 3 lines

Another potential issue might be count_matching_names() generating a wrong class version.

I haven't looked into that issue yet.

-Dale

#3 lore raw
Quoted 8 lines · Dale Farnsworth
Quoted 7 lines · Peter Zijlstra
Quoted 5 lines · Dale Farnsworth

Add each lock class to the all_lock_classes list when it is first registered.

Previously, lock classes were added to all_lock_classes when the lock class was first used.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Since one of the uses of the list is to find unused locks, this didn't work well.

You mean in lockdep_proc.c to generate the statistics?

Yes, that's where I noticed it. On my platform, there was one unused lock which was missed.

OK, I'll clarify the description and take the patch. Thanks!