Commit aaa77de1 authored by Peter Zijlstra (Intel)'s avatar Peter Zijlstra (Intel) Committed by Ingo Molnar
Browse files

locking/ww_mutex: Split up ww_mutex_unlock() 



Split the ww related part out into a helper function so it can be reused
for a rtmutex based ww_mutex implementation.

[ mingo: Fixed bisection failure. ]

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.340166556@linutronix.de
parent c0afb0ff

kernel/locking/mutex.c

+15 −11
Original line number Diff line number Diff line
@@ -744,6 +744,20 @@ void __sched mutex_unlock(struct mutex *lock) 
}

EXPORT_SYMBOL(mutex_unlock);



static void __ww_mutex_unlock(struct ww_mutex *lock)

{

	/*

	 * The unlocking fastpath is the 0->1 transition from 'locked'

	 * into 'unlocked' state:

	 */

	if (lock->ctx) {

		MUTEX_WARN_ON(!lock->ctx->acquired);

		if (lock->ctx->acquired > 0)

			lock->ctx->acquired--;

		lock->ctx = NULL;

	}

}



/**

 * ww_mutex_unlock - release the w/w mutex

 * @lock: the mutex to be released
@@ -757,17 +771,7 @@ EXPORT_SYMBOL(mutex_unlock); 
 */

void __sched ww_mutex_unlock(struct ww_mutex *lock)

{

	/*

	 * The unlocking fastpath is the 0->1 transition from 'locked'

	 * into 'unlocked' state:

	 */

	if (lock->ctx) {

		MUTEX_WARN_ON(!lock->ctx->acquired);

		if (lock->ctx->acquired > 0)

			lock->ctx->acquired--;

		lock->ctx = NULL;

	}



	__ww_mutex_unlock(lock);

	mutex_unlock(&lock->base);

}

EXPORT_SYMBOL(ww_mutex_unlock);