Allow rwlocks to re-enable interrupts
Subsystems (11)
PATCH 2/3 Allow rwlocks to re-enable interrupts
From: Robin Holt <[email protected]>
Pass the original flags to rwlock arch-code, so that it can re-enable interrupts if implemented for that architecture.
Initially, make __raw_read_lock_flags and __raw_write_lock_flags stubs which just do the same thing as non-flags variants.
Signed-off-by Petr Tesarik <[email protected]>
Signed-off-by Robin Holt <[email protected]>
Acked-by Peter Zijlstra <[email protected]>
Cc <[email protected]>
Acked-by Ingo Molnar <[email protected]>
Cc "Luck, Tony" <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/alpha/include/asm/spinlock.h | 3 +++ arch/arm/include/asm/spinlock.h | 3 +++ arch/cris/include/arch-v32/arch/spinlock.h | 2 ++ arch/ia64/include/asm/spinlock.h | 3 +++ arch/mips/include/asm/spinlock.h | 2 ++ arch/parisc/include/asm/spinlock.h | 3 +++ arch/powerpc/include/asm/spinlock.h | 3 +++ arch/s390/include/asm/spinlock.h | 3 +++ arch/sh/include/asm/spinlock.h | 3 +++ arch/sparc/include/asm/spinlock_32.h | 2 ++ arch/sparc/include/asm/spinlock_64.h | 2 ++ arch/x86/include/asm/spinlock.h | 3 +++ include/asm-m32r/spinlock.h | 3 +++ include/linux/spinlock.h | 6 ++++++ kernel/spinlock.c | 6 ++++-- 15 files changed, 45 insertions(+), 2 deletions(-)
arch/alpha/include/asm/spinlock.h renamed from arch/alpha/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -166,6 +166,9 @@ static inline void __raw_write_unlock(ra lock->lock =0 ; } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
arch/arm/include/asm/spinlock.h renamed from arch/arm/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -217,6 +217,9 @@ static inline int __raw_read_trylock(raw/* read_can_lock - would read_trylock() succeed? */ #define __raw_read_can_lock (x) ((x)->lock < 0x80000000) +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
arch/cris/include/arch-v32/arch/spinlock.h renamed from arch/cris/include/arch-v32/arch/spinlock.h~allow-rwlocks-to-re-enable-interrupts +2 -0
@@ -121,6 +121,8 @@ static inline int __raw_write_trylock(rreturn 1 ; } +#define _raw_read_lock_flags (lock, flags) _raw_read_lock(lock) +#define _raw_write_lock_flags (lock, flags) _raw_write_lock(lock)#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()
arch/ia64/include/asm/spinlock.h renamed from arch/ia64/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -213,6 +213,9 @@ static inline int __raw_read_trylock(rawreturn (u32 )ia64_cmpxchg4_acq ((__u32 *)(x), new.word, old.word) == old.word; } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
arch/mips/include/asm/spinlock.h renamed from arch/mips/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +2 -0
@@ -480,6 +480,8 @@ static inline int __raw_write_trylock(rareturn ret; } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock)#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()
arch/parisc/include/asm/spinlock.h renamed from arch/parisc/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -187,6 +187,9 @@ static __inline__ int __raw_write_can_loreturn !rw->counter; } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
arch/powerpc/include/asm/spinlock.h renamed from arch/powerpc/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -287,6 +287,9 @@ static inline void __raw_write_unlock(ra rw->lock =0 ; } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) __spin_yield(lock)#define _raw_read_relax (lock) __rw_yield(lock)#define _raw_write_relax (lock) __rw_yield(lock)
arch/s390/include/asm/spinlock.h renamed from arch/s390/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -172,6 +172,9 @@ static inline int __raw_write_trylock(rareturn _raw_write_trylock_retry (rw); } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
arch/sh/include/asm/spinlock.h renamed from arch/sh/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -216,6 +216,9 @@ static inline int __raw_write_trylock(rareturn (oldval > (RW_LOCK_BIAS -1 )); } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
arch/sparc/include/asm/spinlock_32.h renamed from arch/sparc/include/asm/spinlock_32.h~allow-rwlocks-to-re-enable-interrupts +2 -0
@@ -177,6 +177,8 @@ static inline int __read_trylock(raw_rwl#define __raw_write_unlock (rw) do { (rw)->lock = 0; } while(0)#define __raw_spin_lock_flags (lock, flags) __raw_spin_lock(lock) +#define __raw_read_lock_flags (rw, flags) __raw_read_lock(rw) +#define __raw_write_lock_flags (rw, flags) __raw_write_lock(rw)#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()
arch/sparc/include/asm/spinlock_64.h renamed from arch/sparc/include/asm/spinlock_64.h~allow-rwlocks-to-re-enable-interrupts +2 -0
@@ -211,9 +211,11 @@ static int inline __write_trylock(raw_rw }#define __raw_read_lock (p) __read_lock(p) +#define __raw_read_lock_flags (p, f) __read_lock(p)#define __raw_read_trylock (p) __read_trylock(p)#define __raw_read_unlock (p) __read_unlock(p)#define __raw_write_lock (p) __write_lock(p) +#define __raw_write_lock_flags (p, f) __write_lock(p)#define __raw_write_unlock (p) __write_unlock(p)#define __raw_write_trylock (p) __write_trylock(p)
arch/x86/include/asm/spinlock.h renamed from arch/x86/include/asm/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -295,6 +295,9 @@ static inline void __raw_write_unlock(ra : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
include/asm-m32r/spinlock.h renamed from include/asm-m32r/spinlock.h~allow-rwlocks-to-re-enable-interrupts +3 -0
@@ -316,6 +316,9 @@ static inline int __raw_write_trylock(rareturn 0 ; } +#define __raw_read_lock_flags (lock, flags) __raw_read_lock(lock) +#define __raw_write_lock_flags (lock, flags) __raw_write_lock(lock) +#define _raw_spin_relax (lock) cpu_relax()#define _raw_read_relax (lock) cpu_relax()#define _raw_write_relax (lock) cpu_relax()
include/linux/spinlock.h renamed from include/linux/spinlock.h~allow-rwlocks-to-re-enable-interrupts +6 -0
@@ -153,9 +153,11 @@ do { \extern int _raw_spin_trylock (spinlock_t *lock);extern void _raw_spin_unlock (spinlock_t *lock);extern void _raw_read_lock (rwlock_t *lock); +#define _raw_read_lock_flags (lock, flags) _raw_read_lock(lock)extern int _raw_read_trylock (rwlock_t *lock);extern void _raw_read_unlock (rwlock_t *lock);extern void _raw_write_lock (rwlock_t *lock); +#define _raw_write_lock_flags (lock, flags) _raw_write_lock(lock)extern int _raw_write_trylock (rwlock_t *lock);extern void _raw_write_unlock (rwlock_t *lock);#else
@@ -165,9 +167,13 @@ do { \# define _raw_spin_trylock (lock) __raw_spin_trylock(&(lock)->raw_lock)# define _raw_spin_unlock (lock) __raw_spin_unlock(&(lock)->raw_lock)# define _raw_read_lock (rwlock) __raw_read_lock(&(rwlock)->raw_lock) +# define _raw_read_lock_flags (lock, flags) \ + __raw_read_lock_flags(&(lock)->raw_lock, *(flags))# define _raw_read_trylock (rwlock) __raw_read_trylock(&(rwlock)->raw_lock)# define _raw_read_unlock (rwlock) __raw_read_unlock(&(rwlock)->raw_lock)# define _raw_write_lock (rwlock) __raw_write_lock(&(rwlock)->raw_lock) +# define _raw_write_lock_flags (lock, flags) \ + __raw_write_lock_flags(&(lock)->raw_lock, *(flags))# define _raw_write_trylock (rwlock) __raw_write_trylock(&(rwlock)->raw_lock)# define _raw_write_unlock (rwlock) __raw_write_unlock(&(rwlock)->raw_lock)#endif
kernel/spinlock.c renamed from kernel/spinlock.c~allow-rwlocks-to-re-enable-interrupts +4 -2
@@ -121,7 +121,8 @@ unsigned long __lockfunc _read_lock_irqslocal_irq_save (flags);preempt_disable ();rwlock_acquire_read (&lock->dep_map,0 ,0 , _RET_IP_); -LOCK_CONTENDED (lock, _raw_read_trylock, _raw_read_lock); +LOCK_CONTENDED_FLAGS (lock, _raw_read_trylock, _raw_read_lock, + _raw_read_lock_flags, &flags);return flags; }EXPORT_SYMBOL (_read_lock_irqsave);
@@ -151,7 +152,8 @@ unsigned long __lockfunc _write_lock_irqlocal_irq_save (flags);preempt_disable ();rwlock_acquire (&lock->dep_map,0 ,0 , _RET_IP_); -LOCK_CONTENDED (lock, _raw_write_trylock, _raw_write_lock); +LOCK_CONTENDED_FLAGS (lock, _raw_write_trylock, _raw_write_lock, + _raw_write_lock_flags, &flags);return flags; }EXPORT_SYMBOL (_write_lock_irqsave);
_