Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a26db5b authored by Nick Piggin's avatar Nick Piggin Committed by Peter Zijlstra
Browse files

lockdep: fix internal double unlock during self-test 


Lockdep, during self-test (when it was simulating double unlocks) was
sometimes unconditionally unlocking a spinlock when it had not been
locked. This won't work for ticket locks.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
parent cbd9c883

kernel/lockdep.c

+8 −4
Original line number Diff line number Diff line
@@ -2943,9 +2943,10 @@ void lockdep_free_key_range(void *start, unsigned long size) 
	struct list_head *head;

	unsigned long flags;

	int i;

	int locked;



	raw_local_irq_save(flags);

	graph_lock();

	locked = graph_lock();



	/*

	 * Unhash all classes that were created by this module:
@@ -2959,6 +2960,7 @@ void lockdep_free_key_range(void *start, unsigned long size) 
				zap_class(class);

	}



	if (locked)

		graph_unlock();

	raw_local_irq_restore(flags);

}
@@ -2969,6 +2971,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
	struct list_head *head;

	unsigned long flags;

	int i, j;

	int locked;



	raw_local_irq_save(flags);
@@ -2987,7 +2990,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
	 * Debug check: in the end all mapped classes should

	 * be gone.

	 */

	graph_lock();

	locked = graph_lock();

	for (i = 0; i < CLASSHASH_SIZE; i++) {

		head = classhash_table + i;

		if (list_empty(head))
@@ -3000,6 +3003,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
			}

		}

	}

	if (locked)

		graph_unlock();



out_restore: