Commit bee64578 authored by Waiman Long's avatar Waiman Long Committed by Ingo Molnar
Browse files

locking/ww_mutex: Fix acquire/release imbalance in ww_acquire_init()/ww_acquire_fini() 



In ww_acquire_init(), mutex_acquire() is gated by CONFIG_DEBUG_LOCK_ALLOC.
The dep_map in the ww_acquire_ctx structure is also gated by the
same config. However mutex_release() in ww_acquire_fini() is gated by
CONFIG_DEBUG_MUTEXES. It is possible to set CONFIG_DEBUG_MUTEXES without
setting CONFIG_DEBUG_LOCK_ALLOC though it is an unlikely configuration.
That may cause a compilation error as dep_map isn't defined in this
case. Fix this potential problem by enclosing mutex_release() inside
CONFIG_DEBUG_LOCK_ALLOC.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210316153119.13802-3-longman@redhat.com
parent 5de2055d

include/linux/ww_mutex.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -173,9 +173,10 @@ static inline void ww_acquire_done(struct ww_acquire_ctx *ctx) 
 */

 */

static inline void ww_acquire_fini(struct ww_acquire_ctx *ctx)

static inline void ww_acquire_fini(struct ww_acquire_ctx *ctx)

{

{

#ifdef CONFIG_DEBUG_MUTEXES

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	mutex_release(&ctx->dep_map, _THIS_IP_);

	mutex_release(&ctx->dep_map, _THIS_IP_);



#endif

#ifdef CONFIG_DEBUG_MUTEXES

	DEBUG_LOCKS_WARN_ON(ctx->acquired);

	DEBUG_LOCKS_WARN_ON(ctx->acquired);

	if (!IS_ENABLED(CONFIG_PROVE_LOCKING))

	if (!IS_ENABLED(CONFIG_PROVE_LOCKING))

		/*

		/*