implement ia64 specific mutex primitives
PATCH 1/1 implement ia64 specific mutex primitives
Implement ia64 optimized mutex primitives. It properly uses acquire/release memory ordering semantics in lock/unlock path.
include/asm-ia64/mutex.h renamed from include/asm-ia64/mutex.h.orig +86 -5
@@ -1,9 +1,90 @@/* -* Pull in the generic implementation for the mutex fastpath. +* ia64 implementation of the mutex fastpath. * -* TODO: implement optimized primitives instead, or leave the generic -* implementation in place, or pick the atomic_xchg() based generic -* implementation. (see asm-generic/mutex-xchg.h for details) +* Copyright (C) 2006 Ken Chen <[email protected]> +* +*/ + +#ifndef _ASM_MUTEX_H +#define _ASM_MUTEX_H + +/** +* __mutex_fastpath_lock - 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 MUST leave the value lower than +* 1 even when the "1" assertion wasn't true. +*/ +#define __mutex_fastpath_lock (count, fail_fn) \ +do { \ + if (unlikely(ia64_fetchadd4_acq(count, -1) != 1)) \ + fail_fn(count); \ +} while (0) + +/** +* __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. +*/ +static inline int +__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +{ +if (unlikely (ia64_fetchadd4_acq (count,-1 ) !=1 )) +return fail_fn (count); +return 0 ; +} + +/** +* __mutex_fastpath_unlock - try to promote the count from 0 to 1 +* @count: pointer of type atomic_t +* @fail_fn: function to call if the original value was not 0 +* +* Try to promote the count from 0 to 1. If it wasn't 0, call <fail_fn>. +* In the failure case, this function is allowed to either set the value to +* 1, or to set it to a value lower than 1. +* +* If the implementation sets it to a value of lower than 1, then the +* __mutex_slowpath_needs_to_unlock() macro needs to return 1, it needs +* to return 0 otherwise. +*/ +#define __mutex_fastpath_unlock (count, fail_fn) \ +do { \ + int ret = ia64_fetchadd4_rel(count, 1); \ + if (unlikely(ret < 0)) \ + fail_fn(count); \ +} while (0) + +#define __mutex_slowpath_needs_to_unlock () 1 + +/** +* __mutex_fastpath_trylock - try to acquire the mutex, without waiting +* +* @count: pointer of type atomic_t +* @fail_fn: fallback function +* +* Change the count from 1 to a value lower than 1, and return 0 (failure) +* if it wasn't 1 originally, or return 1 (success) otherwise. This function +* MUST leave the value lower than 1 even when the "1" assertion wasn't true. +* Additionally, if the value was < 0 originally, this function must not leave +* it to 0 on failure. +* +* If the architecture has no effective trylock variant, it should call the +* <fail_fn> spinlock-based trylock variant unconditionally. */ +static inline int +__mutex_fastpath_trylock (atomic_t *count,int (*fail_fn)(atomic_t *)) +{ +if (likely (cmpxchg_acq (count,1 ,0 )) =1 ) +return 1 ; +return 0 ; +} -#include <asm-generic/mutex-dec.h> +#endif
Quoted 8 lines · "Chen, Kenneth W" (on Wed, 11 Jan 2006 15:24:50 -0800) wrote:
Implement ia64 optimized mutex primitives. It properly uses acquire/release memory ordering semantics in lock/unlock path.
#define__mutex_fastpath_lock(count, fail_fn)\
static inline int__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
#define__mutex_fastpath_unlock(count, fail_fn)\
static inline int__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
Instead of mixing #define and static, make them all static and let gcc decide if you should inline them. Or make them all #define. Either works but is more consistent.
Keith Owens wrote on Wednesday, January 11, 2006 4:14 PM
Quoted 10 lines
Quoted 8 lines · "Chen, Kenneth W" (on Wed, 11 Jan 2006 15:24:50 -0800) wrote:
Implement ia64 optimized mutex primitives. It properly uses acquire/release memory ordering semantics in lock/unlock path.
#define__mutex_fastpath_lock(count, fail_fn)\
static inline int__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
#define__mutex_fastpath_unlock(count, fail_fn)\
static inline int__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
Quoted 3 lines
Instead of mixing #define and static, make them all static and let gcc decide if you should inline them. Or make them all #define. Either works but is more consistent.
I don't have strong preference either way. Here is a respin making them all static inline functions.
----
Implement ia64 optimized mutex primitives. It properly uses acquire/release memory ordering semantics in lock/unlock path.
include/asm-ia64/mutex.h renamed from include/asm-ia64/mutex.h.orig +88 -5
@@ -1,9 +1,92 @@/* -* Pull in the generic implementation for the mutex fastpath. +* ia64 implementation of the mutex fastpath. * -* TODO: implement optimized primitives instead, or leave the generic -* implementation in place, or pick the atomic_xchg() based generic -* implementation. (see asm-generic/mutex-xchg.h for details) +* Copyright (C) 2006 Ken Chen <[email protected]> +* +*/ + +#ifndef _ASM_MUTEX_H +#define _ASM_MUTEX_H + +/** +* __mutex_fastpath_lock - 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 MUST leave the value lower than +* 1 even when the "1" assertion wasn't true. +*/ +static inline void +__mutex_fastpath_lock (atomic_t *count,void (*fail_fn)(atomic_t *)) +{ +if (unlikely (ia64_fetchadd4_acq (count,-1 ) !=1 )) +fail_fn (count); +} + +/** +* __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. +*/ +static inline int +__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +{ +if (unlikely (ia64_fetchadd4_acq (count,-1 ) !=1 )) +return fail_fn (count); +return 0 ; +} + +/** +* __mutex_fastpath_unlock - try to promote the count from 0 to 1 +* @count: pointer of type atomic_t +* @fail_fn: function to call if the original value was not 0 +* +* Try to promote the count from 0 to 1. If it wasn't 0, call <fail_fn>. +* In the failure case, this function is allowed to either set the value to +* 1, or to set it to a value lower than 1. +* +* If the implementation sets it to a value of lower than 1, then the +* __mutex_slowpath_needs_to_unlock() macro needs to return 1, it needs +* to return 0 otherwise. +*/ +static inline void +__mutex_fastpath_unlock (atomic_t *count,void (*fail_fn)(atomic_t *)) +{ +int ret =ia64_fetchadd4_rel (count,1 ); +if (unlikely (ret <0 )) +fail_fn (count); +} + +#define __mutex_slowpath_needs_to_unlock () 1 + +/** +* __mutex_fastpath_trylock - try to acquire the mutex, without waiting +* +* @count: pointer of type atomic_t +* @fail_fn: fallback function +* +* Change the count from 1 to a value lower than 1, and return 0 (failure) +* if it wasn't 1 originally, or return 1 (success) otherwise. This function +* MUST leave the value lower than 1 even when the "1" assertion wasn't true. +* Additionally, if the value was < 0 originally, this function must not leave +* it to 0 on failure. +* +* If the architecture has no effective trylock variant, it should call the +* <fail_fn> spinlock-based trylock variant unconditionally. */ +static inline int +__mutex_fastpath_trylock (atomic_t *count,int (*fail_fn)(atomic_t *)) +{ +if (likely (cmpxchg_acq (count,1 ,0 )) =1 ) +return 1 ; +return 0 ; +} -#include <asm-generic/mutex-dec.h> +#endif