Commit cf702edd authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking/ww_mutex: Simplify lockdep annotations 



No functional change.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211304.222921634@linutronix.de
parent ebf4c55c

kernel/locking/mutex.c

+10 −9
Original line number Diff line number Diff line
@@ -951,6 +951,10 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas 
		 */

		if (ww_ctx->acquired == 0)

			ww_ctx->wounded = 0;



#ifdef CONFIG_DEBUG_LOCK_ALLOC

		nest_lock = &ww_ctx->dep_map;

#endif

	}



	preempt_disable();
@@ -1098,10 +1102,9 @@ __mutex_lock(struct mutex *lock, unsigned int state, unsigned int subclass, 


static int __sched

__ww_mutex_lock(struct mutex *lock, unsigned int state, unsigned int subclass,

		struct lockdep_map *nest_lock, unsigned long ip,

		struct ww_acquire_ctx *ww_ctx)

		unsigned long ip, struct ww_acquire_ctx *ww_ctx)

{

	return __mutex_lock_common(lock, state, subclass, nest_lock, ip, ww_ctx, true);

	return __mutex_lock_common(lock, state, subclass, NULL, ip, ww_ctx, true);

}



#ifdef CONFIG_DEBUG_LOCK_ALLOC
@@ -1181,8 +1184,7 @@ ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) 


	might_sleep();

	ret =  __ww_mutex_lock(&lock->base, TASK_UNINTERRUPTIBLE,

			       0, ctx ? &ctx->dep_map : NULL, _RET_IP_,

			       ctx);

			       0, _RET_IP_, ctx);

	if (!ret && ctx && ctx->acquired > 1)

		return ww_mutex_deadlock_injection(lock, ctx);
@@ -1197,8 +1199,7 @@ ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) 


	might_sleep();

	ret = __ww_mutex_lock(&lock->base, TASK_INTERRUPTIBLE,

			      0, ctx ? &ctx->dep_map : NULL, _RET_IP_,

			      ctx);

			      0, _RET_IP_, ctx);



	if (!ret && ctx && ctx->acquired > 1)

		return ww_mutex_deadlock_injection(lock, ctx);
@@ -1364,7 +1365,7 @@ __mutex_lock_interruptible_slowpath(struct mutex *lock) 
static noinline int __sched

__ww_mutex_lock_slowpath(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)

{

	return __ww_mutex_lock(&lock->base, TASK_UNINTERRUPTIBLE, 0, NULL,

	return __ww_mutex_lock(&lock->base, TASK_UNINTERRUPTIBLE, 0,

			       _RET_IP_, ctx);

}
@@ -1372,7 +1373,7 @@ static noinline int __sched 
__ww_mutex_lock_interruptible_slowpath(struct ww_mutex *lock,

					    struct ww_acquire_ctx *ctx)

{

	return __ww_mutex_lock(&lock->base, TASK_INTERRUPTIBLE, 0, NULL,

	return __ww_mutex_lock(&lock->base, TASK_INTERRUPTIBLE, 0,

			       _RET_IP_, ctx);

}