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

Commit a41b56ef authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Ingo Molnar
Browse files

arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not 



This will allow me to call functions that have multiple
arguments if fastpath fails. This is required to support ticket
mutexes, because they need to be able to pass an extra argument
to the fail function.

Originally I duplicated the functions, by adding
__mutex_fastpath_lock_retval_arg. This ended up being just a
duplication of the existing function, so a way to test if
fastpath was called ended up being better.

This also cleaned up the reservation mutex patch some by being
able to call an atomic_set instead of atomic_xchg, and making it
easier to detect if the wrong unlock function was previously
used.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: dri-devel@lists.freedesktop.org
Cc: linaro-mm-sig@lists.linaro.org
Cc: robclark@gmail.com
Cc: rostedt@goodmis.org
Cc: daniel@ffwll.ch
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20130620113105.4001.83929.stgit@patser


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1e876e3b

arch/ia64/include/asm/mutex.h

+4 −6
Original line number Diff line number Diff line
@@ -29,17 +29,15 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) 
 *  __mutex_fastpath_lock_retval - try to take the lock by moving the count

 *                                 from 1 to a 0 value

 *  @count: pointer of type atomic_t

 *  @fail_fn: function to call if the original value was not 1

 *

 * Change the count from 1 to a value lower than 1, and call <fail_fn> if

 * it wasn't 1 originally. This function returns 0 if the fastpath succeeds,

 * or anything the slow path function returns.

 * Change the count from 1 to a value lower than 1. This function returns 0

 * if the fastpath succeeds, or -1 otherwise.

 */

static inline int

__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))

__mutex_fastpath_lock_retval(atomic_t *count)

{

	if (unlikely(ia64_fetchadd4_acq(count, -1) != 1))

		return fail_fn(count);

		return -1;

	return 0;

}

arch/powerpc/include/asm/mutex.h

+4 −6
Original line number Diff line number Diff line
@@ -82,17 +82,15 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) 
 *  __mutex_fastpath_lock_retval - try to take the lock by moving the count

 *                                 from 1 to a 0 value

 *  @count: pointer of type atomic_t

 *  @fail_fn: function to call if the original value was not 1

 *

 * Change the count from 1 to a value lower than 1, and call <fail_fn> if

 * it wasn't 1 originally. This function returns 0 if the fastpath succeeds,

 * or anything the slow path function returns.

 * Change the count from 1 to a value lower than 1. This function returns 0

 * if the fastpath succeeds, or -1 otherwise.

 */

static inline int

__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))

__mutex_fastpath_lock_retval(atomic_t *count)

{

	if (unlikely(__mutex_dec_return_lock(count) < 0))

		return fail_fn(count);

		return -1;

	return 0;

}

arch/sh/include/asm/mutex-llsc.h

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) 
}



static inline int

__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))

__mutex_fastpath_lock_retval(atomic_t *count)

{

	int __done, __res;
@@ -51,7 +51,7 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) 
		: "t");



	if (unlikely(!__done || __res != 0))

		__res = fail_fn(count);

		__res = -1;



	return __res;

}

arch/x86/include/asm/mutex_32.h

+4 −7
Original line number Diff line number Diff line
@@ -42,17 +42,14 @@ do { \ 
 *  __mutex_fastpath_lock_retval - try to take the lock by moving the count

 *                                 from 1 to a 0 value

 *  @count: pointer of type atomic_t

 *  @fail_fn: function to call if the original value was not 1

 *

 * Change the count from 1 to a value lower than 1, and call <fail_fn> if it

 * wasn't 1 originally. This function returns 0 if the fastpath succeeds,

 * or anything the slow path function returns

 * Change the count from 1 to a value lower than 1. This function returns 0

 * if the fastpath succeeds, or -1 otherwise.

 */

static inline int __mutex_fastpath_lock_retval(atomic_t *count,

					       int (*fail_fn)(atomic_t *))

static inline int __mutex_fastpath_lock_retval(atomic_t *count)

{

	if (unlikely(atomic_dec_return(count) < 0))

		return fail_fn(count);

		return -1;

	else

		return 0;

}

arch/x86/include/asm/mutex_64.h

+4 −7
Original line number Diff line number Diff line
@@ -37,17 +37,14 @@ do { \ 
 *  __mutex_fastpath_lock_retval - try to take the lock by moving the count

 *                                 from 1 to a 0 value

 *  @count: pointer of type atomic_t

 *  @fail_fn: function to call if the original value was not 1

 *

 * Change the count from 1 to a value lower than 1, and call <fail_fn> if

 * it wasn't 1 originally. This function returns 0 if the fastpath succeeds,

 * or anything the slow path function returns

 * Change the count from 1 to a value lower than 1. This function returns 0

 * if the fastpath succeeds, or -1 otherwise.

 */

static inline int __mutex_fastpath_lock_retval(atomic_t *count,

					       int (*fail_fn)(atomic_t *))

static inline int __mutex_fastpath_lock_retval(atomic_t *count)

{

	if (unlikely(atomic_dec_return(count) < 0))

		return fail_fn(count);

		return -1;

	else

		return 0;

}