x86/rwsem for 2.6.36
Hi Linus,
The following changes since commit cdd854bc42b5e6c79bbbc40c6600d995ffe6e747:
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2010-08-05 09:03:46 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-rwsem-for-linus
Michel Lespinasse (2):
x86, rwsem: Stay on fast path when count > 0 in __up_write() x86, rwsem: Minor cleanups
arch/x86/include/asm/rwsem.h | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)
arch/x86/include/asm/rwsem.h +9 -12
@@ -118,7 +118,7 @@ static inline void __down_read(struct rw_semaphore *sem) { asmvolatile ("# beginning down_read\n\t" LOCK_PREFIX _ASM_INC"(%1)\n\t" -/* adds 0x00000001, returns the old value */ +/* adds 0x00000001 */ " jns 1f\n" " call call_rwsem_down_read_failed\n" "1:\n\t"
@@ -156,11 +156,9 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)static inline void __down_write_nested (struct rw_semaphore *sem,int subclass) {rwsem_count_t tmp; - - tmp =RWSEM_ACTIVE_WRITE_BIAS ; asmvolatile ("# beginning down_write\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" -/* subtract 0x0000ffff, returns the old value */ +/* adds 0xffff0001, returns the old value */ " test %1,%1\n\t" /* was the count 0 before? */ " jz 1f\n"
@@ -168,7 +166,7 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass) "1:\n" "# ending down_write" : "+m" (sem->count), "=d" (tmp) - : "a" (sem), "1" (tmp) + : "a" (sem), "1" (RWSEM_ACTIVE_WRITE_BIAS) : "memory", "cc"); }
@@ -195,16 +193,16 @@ static inline int __down_write_trylock(struct rw_semaphore *sem)*/ static inline void __up_read (struct rw_semaphore *sem) { -rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS ; +rwsem_count_t tmp; asmvolatile ("# beginning __up_read\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" /* subtracts 1, returns the old value */ " jns 1f\n\t" -" call call_rwsem_wake\n" +" call call_rwsem_wake\n" /* expects old value in %edx */ "1:\n" "# ending __up_read\n" :"+m" (sem->count),"=d" (tmp) - :"a" (sem),"1" (tmp) + :"a" (sem),"1" (-RWSEM_ACTIVE_READ_BIAS ) :"memory" ,"cc" ); }
@@ -216,10 +214,9 @@ static inline void __up_write(struct rw_semaphore *sem)rwsem_count_t tmp; asmvolatile ("# beginning __up_write\n\t" LOCK_PREFIX " xadd %1,(%2)\n\t" -/* tries to transition -0xffff0001 -> 0x00000000 */ -" jz 1f\n" -" call call_rwsem_wake\n" +/* subtracts 0xffff0001, returns the old value */ +" jns 1f\n\t" +" call call_rwsem_wake\n" /* expects old value in %edx */ "1:\n\t" "# ending __up_write\n" : "+m" (sem->count), "=d" (tmp)