locking/mutex: Replace spin_is_locked() with lockdep (04547728) · Commits · 戴 / test

lockdep_assert_held() is better suited to checking locking requirements, since it only checks if the current thread holds the lock regardless of whether someone else does. This is also a step towards possibly removing spin_is_locked(). Signed-off-by:

Lance Roy <ldr709@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by:

Paul E. McKenney <paulmck@linux.ibm.com>

kernel/locking/mutex-debug.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ void debug_mutex_lock_common(struct mutex lock, struct mutex_waiter waiter)

		void debug_mutex_wake_waiter(struct mutex lock, struct mutex_waiter waiter)
		{
		SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
		lockdep_assert_held(&lock->wait_lock);
		DEBUG_LOCKS_WARN_ON(list_empty(&lock->wait_list));
		DEBUG_LOCKS_WARN_ON(waiter->magic != waiter);
		DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
		@@ -51,7 +51,7 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
		void debug_mutex_add_waiter(struct mutex lock, struct mutex_waiter waiter,
		struct task_struct *task)
		{
		SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
		lockdep_assert_held(&lock->wait_lock);

		/* Mark the current thread as blocked on the lock: */
		task->blocked_on = waiter;

Admin message