security/apparmor: Replace homebrew use of write_can_lock with lockdep
Subsystems (17)
PATCH v2 1/4 security/apparmor: Replace homebrew use of write_can_lock with lockdep
The lockdep subsystem provides a robust way to assert that a lock is held, so use that instead of write_can_lock, which can give incorrect results for qrwlocks.
--- security/apparmor/include/lib.h | 11 ----------- security/apparmor/label.c | 8 ++++---- 2 files changed, 4 insertions(+), 15 deletions(-)
security/apparmor/include/lib.h +0 -11
@@ -19,17 +19,6 @@#include "match.h" -/* Provide our own test for whether a write lock is held for asserts -* this is because on none SMP systems write_can_lock will always -* resolve to true, which is what you want for code making decisions -* based on it, but wrong for asserts checking that the lock is held -*/ -#ifdef CONFIG_SMP -#define write_is_locked (X ) !write_can_lock(X) -#else -#define write_is_locked (X ) (1) -#endif /* CONFIG_SMP */ -/* * DEBUG remains global (no per profile flag) since it is mostly used in sysctl * which is not related to profile accesses.
security/apparmor/label.c +4 -4
@@ -80,7 +80,7 @@ void __aa_proxy_redirect(struct aa_label *orig, struct aa_label *new)AA_BUG (!orig);AA_BUG (!new); -AA_BUG (!write_is_locked (&labels_set (orig)->lock)); +lockdep_assert_held_exclusive (&labels_set (orig)->lock); tmp =rcu_dereference_protected (orig->proxy->label, &labels_ns (orig)->lock);
@@ -571,7 +571,7 @@ static bool __label_remove(struct aa_label *label, struct aa_label *new)AA_BUG (!ls);AA_BUG (!label); -AA_BUG (!write_is_locked (&ls->lock)); +lockdep_assert_held_exclusive (&ls->lock);if (new)__aa_proxy_redirect (label, new);
@@ -608,7 +608,7 @@ static bool __label_replace(struct aa_label *old, struct aa_label *new)AA_BUG (!ls);AA_BUG (!old);AA_BUG (!new); -AA_BUG (!write_is_locked (&ls->lock)); +lockdep_assert_held_exclusive (&ls->lock);AA_BUG (new->flags &FLAG_IN_TREE );if (!label_is_stale (old))
@@ -645,7 +645,7 @@ static struct aa_label *__label_insert(struct aa_labelset *ls,AA_BUG (!ls);AA_BUG (!label);AA_BUG (labels_set (label) != ls); -AA_BUG (!write_is_locked (&ls->lock)); +lockdep_assert_held_exclusive (&ls->lock);AA_BUG (label->flags &FLAG_IN_TREE );/* Figure out where to put new node */
Signature · 1 line
2.1.4
PATCH v2 2/4 locking: Remove {read,spin,write}_can_lock
Outside of the locking code itself, {read,spin,write}_can_lock have no users in tree. Apparmor (the last remaining user of write_can_lock) is moved over to lockdep by the previous patch.
This patch removes the use of {read,spin,write}_can_lock from the BUILD_LOCK_OPS macro, deferring to the trylock operation for testing the lock status, and subsequently removes the unused macros altogether. They aren't guaranteed to work in a concurrent environment and can give incorrect results in the case of qrwlock.
--- arch/alpha/include/asm/spinlock.h | 10 ---------- arch/arc/include/asm/spinlock.h | 3 --- arch/arm/include/asm/spinlock.h | 6 ------ arch/blackfin/include/asm/spinlock.h | 10 ---------- arch/hexagon/include/asm/spinlock.h | 10 ---------- arch/ia64/include/asm/spinlock.h | 3 --- arch/m32r/include/asm/spinlock.h | 12 ------------ arch/metag/include/asm/spinlock_lnkget.h | 30 ------------------------------ arch/metag/include/asm/spinlock_lock1.h | 20 -------------------- arch/mn10300/include/asm/spinlock.h | 12 ------------ arch/parisc/include/asm/spinlock.h | 18 ------------------ arch/powerpc/include/asm/spinlock.h | 3 --- arch/s390/include/asm/spinlock.h | 12 ------------ arch/sh/include/asm/spinlock-cas.h | 12 ------------ arch/sh/include/asm/spinlock-llsc.h | 12 ------------ arch/sparc/include/asm/spinlock_32.h | 3 --- arch/tile/include/asm/spinlock_32.h | 16 ---------------- arch/tile/include/asm/spinlock_64.h | 18 ------------------ arch/xtensa/include/asm/spinlock.h | 2 -- include/asm-generic/qrwlock.h | 20 -------------------- include/linux/rwlock.h | 3 --- include/linux/spinlock.h | 11 ----------- include/linux/spinlock_up.h | 3 --- kernel/locking/spinlock.c | 6 ++---- 24 files changed, 2 insertions(+), 253 deletions(-)
arch/alpha/include/asm/spinlock.h +0 -10
@@ -54,16 +54,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)/***********************************************************/ -static inline int arch_read_can_lock (arch_rwlock_t *lock) -{ -return (lock->lock &1 ) ==0 ; -} - -static inline int arch_write_can_lock (arch_rwlock_t *lock) -{ -return lock->lock ==0 ; -} -static inline void arch_read_lock (arch_rwlock_t *lock) {long regx;
arch/arc/include/asm/spinlock.h +0 -3
@@ -410,9 +410,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#endif -#define arch_read_can_lock (x) ((x)->counter > 0) -#define arch_write_can_lock (x) ((x)->counter == __ARCH_RW_LOCK_UNLOCKED__) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/arm/include/asm/spinlock.h +0 -6
@@ -193,9 +193,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)dsb_sev (); } -/* write_can_lock - would write_trylock() succeed? */ -#define arch_write_can_lock (x) (ACCESS_ONCE((x)->lock) == 0) -/* * Read locks are a bit more hairy: * - Exclusively load the lock value.
@@ -273,9 +270,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) } } -/* read_can_lock - would read_trylock() succeed? */ -#define arch_read_can_lock (x) (ACCESS_ONCE((x)->lock) < 0x80000000) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/blackfin/include/asm/spinlock.h +0 -10
@@ -48,16 +48,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)__raw_spin_unlock_asm (&lock->lock); } -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -return __raw_uncached_fetch_asm (&rw->lock) >0 ; -} - -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -return __raw_uncached_fetch_asm (&rw->lock) ==RW_LOCK_BIAS ; -} -static inline void arch_read_lock (arch_rwlock_t *rw) {__raw_read_lock_asm (&rw->lock);
arch/hexagon/include/asm/spinlock.h +0 -10
@@ -86,16 +86,6 @@ static inline int arch_read_trylock(arch_rwlock_t *lock)return temp; } -static inline int arch_read_can_lock (arch_rwlock_t *rwlock) -{ -return rwlock->lock ==0 ; -} - -static inline int arch_write_can_lock (arch_rwlock_t *rwlock) -{ -return rwlock->lock ==0 ; -} -/* Stuffs a -1 in the lock value? */ static inline void arch_write_lock (arch_rwlock_t *lock) {
arch/ia64/include/asm/spinlock.h +0 -3
@@ -127,9 +127,6 @@ static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock,arch_spin_lock (lock); } -#define arch_read_can_lock (rw) (*(volatile int *)(rw) >= 0) -#define arch_write_can_lock (rw) (*(volatile int *)(rw) == 0) -#ifdef ASM_SUPPORTED static __always_inline void
arch/m32r/include/asm/spinlock.h +0 -12
@@ -137,18 +137,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)* semaphore.h for details. -ben */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((int)(x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -static inline void arch_read_lock (arch_rwlock_t *rw) {unsigned long tmp0, tmp1;
arch/metag/include/asm/spinlock_lnkget.h +0 -30
@@ -136,21 +136,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) : "memory"); } -/* write_can_lock - would write_trylock() succeed? */ -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -int ret; - - asmvolatile ("LNKGETD %0, [%1]\n" -"CMP %0, #0\n" -"MOV %0, #1\n" -"XORNZ %0, %0, %0\n" - :"=&d" (ret) - :"da" (&rw->lock) - :"cc" ); -return ret; -} -/* * Read locks are a bit more hairy: * - Exclusively load the lock value.
@@ -224,21 +209,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)return tmp; } -/* read_can_lock - would read_trylock() succeed? */ -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -int tmp; - - asmvolatile ("LNKGETD %0, [%1]\n" -"CMP %0, %2\n" -"MOV %0, #1\n" -"XORZ %0, %0, %0\n" - :"=&d" (tmp) - :"da" (&rw->lock),"bd" (0x80000000 ) - :"cc" ); -return tmp; -} -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/metag/include/asm/spinlock_lock1.h +0 -20
@@ -104,16 +104,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) rw->lock =0 ; } -/* write_can_lock - would write_trylock() succeed? */ -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -unsigned int ret; - -barrier (); - ret = rw->lock; -return (ret ==0 ); -} -/* * Read locks are a bit more hairy: * - Exclusively load the lock value.
@@ -171,14 +161,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) return (ret < 0x80000000); } -/* read_can_lock - would read_trylock() succeed? */ -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -unsigned int ret; - -barrier (); - ret = rw->lock; -return (ret <0x80000000 ); -} -#endif /* __ASM_SPINLOCK_LOCK1_H */
arch/mn10300/include/asm/spinlock.h +0 -12
@@ -98,18 +98,6 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock,* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((int)(x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -/* * On mn10300, we implement read-write locks as a 32-bit counter * with the high bit (sign) being the "contended" bit.
arch/parisc/include/asm/spinlock.h +0 -18
@@ -168,24 +168,6 @@ static __inline__ int arch_write_trylock(arch_rwlock_t *rw)return result; } -/* -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -static __inline__int arch_read_can_lock (arch_rwlock_t *rw) -{ -return rw->counter >=0 ; -} - -/* -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -static __inline__int arch_write_can_lock (arch_rwlock_t *rw) -{ -return !rw->counter; -} -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/powerpc/include/asm/spinlock.h +0 -3
@@ -181,9 +181,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)* read-locks. */ -#define arch_read_can_lock (rw) ((rw)->lock >= 0) -#define arch_write_can_lock (rw) (!(rw)->lock) -#ifdef CONFIG_PPC64 #define __DO_SIGN_EXTEND "extsw %0,%0\n"#define WRLOCK_TOKEN LOCK_TOKEN/* it's negative */
arch/s390/include/asm/spinlock.h +0 -12
@@ -110,18 +110,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lp)* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((int)(x)->lock >= 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == 0) -extern int _raw_read_trylock_retry (arch_rwlock_t *lp);extern int _raw_write_trylock_retry (arch_rwlock_t *lp);
arch/sh/include/asm/spinlock-cas.h +0 -12
@@ -53,18 +53,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -static inline void arch_read_lock (arch_rwlock_t *rw) {unsigned old;
arch/sh/include/asm/spinlock-llsc.h +0 -12
@@ -89,18 +89,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -static inline void arch_read_lock (arch_rwlock_t *rw) {unsigned long tmp;
arch/sparc/include/asm/spinlock_32.h +0 -3
@@ -190,9 +190,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)#define arch_read_relax (lock) cpu_relax()#define arch_write_relax (lock) cpu_relax() -#define arch_read_can_lock (rw) (!((rw)->lock & 0xff)) -#define arch_write_can_lock (rw) (!(rw)->lock) -#endif /* !(__ASSEMBLY__) */ #endif /* __SPARC_SPINLOCK_H */
arch/tile/include/asm/spinlock_32.h +0 -16
@@ -80,22 +80,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)#define _RD_COUNT_WIDTH 8/** -* arch_read_can_lock() - would read_trylock() succeed? -*/ -static inline int arch_read_can_lock (arch_rwlock_t *rwlock) -{ -return (rwlock->lock << _RD_COUNT_WIDTH) ==0 ; -} - -/** -* arch_write_can_lock() - would write_trylock() succeed? -*/ -static inline int arch_write_can_lock (arch_rwlock_t *rwlock) -{ -return rwlock->lock ==0 ; -} - -/** * arch_read_lock() - acquire a read lock. */ void arch_read_lock (arch_rwlock_t *rwlock);
arch/tile/include/asm/spinlock_64.h +0 -18
@@ -93,24 +93,6 @@ static inline int arch_write_val_locked(int val)return val <0 ;/* Optimize "val & __WRITE_LOCK_BIT". */ } -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -return !arch_write_val_locked (rw->lock); -} - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -return rw->lock ==0 ; -} -extern void __read_lock_failed (arch_rwlock_t *rw);static inline void arch_read_lock (arch_rwlock_t *rw)
arch/xtensa/include/asm/spinlock.h +0 -2
@@ -97,8 +97,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)* 0x80000000 one writer owns the rwlock, no other writers, no readers */ -#define arch_write_can_lock (x) ((x)->lock == 0) -static inline void arch_write_lock (arch_rwlock_t *rw) {unsigned long tmp;
include/asm-generic/qrwlock.h +0 -20
@@ -53,24 +53,6 @@ extern void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts);extern void queued_write_lock_slowpath (struct qrwlock *lock);/** -* queued_read_can_lock- would read_trylock() succeed? -* @lock: Pointer to queue rwlock structure -*/ -static inline int queued_read_can_lock (struct qrwlock *lock) -{ -return !(atomic_read (&lock->cnts) & _QW_WMASK); -} - -/** -* queued_write_can_lock- would write_trylock() succeed? -* @lock: Pointer to queue rwlock structure -*/ -static inline int queued_write_can_lock (struct qrwlock *lock) -{ -return !atomic_read (&lock->cnts); -} - -/** * queued_read_trylock - try to acquire read lock of a queue rwlock * @lock : Pointer to queue rwlock structure * Return: 1 if lock acquired, 0 if failed
@@ -169,8 +151,6 @@ static inline void queued_write_unlock(struct qrwlock *lock)* Remapping rwlock architecture specific functions to the corresponding * queue rwlock functions. */ -#define arch_read_can_lock (l) queued_read_can_lock(l) -#define arch_write_can_lock (l) queued_write_can_lock(l)#define arch_read_lock (l) queued_read_lock(l)#define arch_write_lock (l) queued_write_lock(l)#define arch_read_trylock (l) queued_read_trylock(l)
include/linux/rwlock.h +0 -3
@@ -50,9 +50,6 @@ do { \# define do_raw_write_unlock (rwlock) do {arch_write_unlock(&(rwlock)->raw_lock); __release(lock); } while (0)#endif -#define read_can_lock (rwlock) arch_read_can_lock(&(rwlock)->raw_lock) -#define write_can_lock (rwlock) arch_write_can_lock(&(rwlock)->raw_lock) -/* * Define the various rw_lock methods. Note we define these * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
include/linux/spinlock.h +0 -11
@@ -278,12 +278,6 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) 1 : ({ local_irq_restore(flags); 0; }); \ }) -/** -* raw_spin_can_lock - would raw_spin_trylock() succeed? -* @lock: the spinlock in question. -*/ -#define raw_spin_can_lock (lock) (!raw_spin_is_locked(lock)) -/* Include rwlock functions */ #include <linux/rwlock.h>
@@ -396,11 +390,6 @@ static __always_inline int spin_is_contended(spinlock_t *lock)return raw_spin_is_contended (&lock->rlock); } -static __always_inline int spin_can_lock(spinlock_t *lock) -{ -return raw_spin_can_lock (&lock->rlock); -} -#define assert_spin_locked (lock) assert_raw_spin_locked(&(lock)->rlock)/*
include/linux/spinlock_up.h +0 -3
@@ -77,7 +77,4 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)#define arch_spin_is_contended (lock) (((void)(lock), 0)) -#define arch_read_can_lock (lock) (((void)(lock), 1)) -#define arch_write_can_lock (lock) (((void)(lock), 1)) -#endif /* __LINUX_SPINLOCK_UP_H */
kernel/locking/spinlock.c +2 -4
@@ -32,8 +32,6 @@* include/linux/spinlock_api_smp.h */ #else -#define raw_read_can_lock (l) read_can_lock(l) -#define raw_write_can_lock (l) write_can_lock(l)/* * Some architectures can relax in favour of the CPU owning the lock.
@@ -68,7 +66,7 @@ void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ \if (!(lock)->break_lock) \ (lock)->break_lock =1 ; \ - while (!raw_##op##_can_lock(lock) && (lock)->break_lock)\ +while ((lock)->break_lock) \ arch_##op##_relax(&lock->raw_lock); \ } \ (lock)->break_lock =0 ; \
@@ -88,7 +86,7 @@ unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ \if (!(lock)->break_lock) \ (lock)->break_lock =1 ; \ - while (!raw_##op##_can_lock(lock) && (lock)->break_lock)\ +while ((lock)->break_lock) \ arch_##op##_relax(&lock->raw_lock); \ } \ (lock)->break_lock =0 ; \
Signature · 1 line
2.1.4
tip-bot for Will Deacon
merge bot[tip:locking/core] locking/core: Remove {read,spin,write}_can_lock()
locking/core: Remove {read,spin,write}_can_lock()
Commit-ID: a8a217c22116eff6c120d753c9934089fb229af0 Gitweb: https://git.kernel.org/tip/a8a217c22116eff6c120d753c9934089fb229af0 Author: Will Deacon <[email protected]> AuthorDate: Tue, 3 Oct 2017 19:25:27 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Oct 2017 11:50:18 +0200
locking/core: Remove {read,spin,write}_can_lock()
Outside of the locking code itself, {read,spin,write}_can_lock() have no users in tree. Apparmor (the last remaining user of write_can_lock()) got moved over to lockdep by the previous patch.
This patch removes the use of {read,spin,write}_can_lock() from the BUILD_LOCK_OPS macro, deferring to the trylock operation for testing the lock status, and subsequently removes the unused macros altogether. They aren't guaranteed to work in a concurrent environment and can give incorrect results in the case of qrwlock.
--- arch/alpha/include/asm/spinlock.h | 10 ---------- arch/arc/include/asm/spinlock.h | 3 --- arch/arm/include/asm/spinlock.h | 6 ------ arch/blackfin/include/asm/spinlock.h | 10 ---------- arch/hexagon/include/asm/spinlock.h | 10 ---------- arch/ia64/include/asm/spinlock.h | 3 --- arch/m32r/include/asm/spinlock.h | 12 ------------ arch/metag/include/asm/spinlock_lnkget.h | 30 ------------------------------ arch/metag/include/asm/spinlock_lock1.h | 20 -------------------- arch/mn10300/include/asm/spinlock.h | 12 ------------ arch/parisc/include/asm/spinlock.h | 18 ------------------ arch/powerpc/include/asm/spinlock.h | 3 --- arch/s390/include/asm/spinlock.h | 12 ------------ arch/sh/include/asm/spinlock-cas.h | 12 ------------ arch/sh/include/asm/spinlock-llsc.h | 12 ------------ arch/sparc/include/asm/spinlock_32.h | 3 --- arch/tile/include/asm/spinlock_32.h | 16 ---------------- arch/tile/include/asm/spinlock_64.h | 18 ------------------ arch/xtensa/include/asm/spinlock.h | 2 -- include/asm-generic/qrwlock.h | 20 -------------------- include/linux/rwlock.h | 3 --- include/linux/spinlock.h | 11 ----------- include/linux/spinlock_up.h | 3 --- kernel/locking/spinlock.c | 6 ++---- 24 files changed, 2 insertions(+), 253 deletions(-)
arch/alpha/include/asm/spinlock.h +0 -10
@@ -54,16 +54,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)/***********************************************************/ -static inline int arch_read_can_lock (arch_rwlock_t *lock) -{ -return (lock->lock &1 ) ==0 ; -} - -static inline int arch_write_can_lock (arch_rwlock_t *lock) -{ -return lock->lock ==0 ; -} -static inline void arch_read_lock (arch_rwlock_t *lock) {long regx;
arch/arc/include/asm/spinlock.h +0 -3
@@ -410,9 +410,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#endif -#define arch_read_can_lock (x) ((x)->counter > 0) -#define arch_write_can_lock (x) ((x)->counter == __ARCH_RW_LOCK_UNLOCKED__) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/arm/include/asm/spinlock.h +0 -6
@@ -193,9 +193,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)dsb_sev (); } -/* write_can_lock - would write_trylock() succeed? */ -#define arch_write_can_lock (x) (ACCESS_ONCE((x)->lock) == 0) -/* * Read locks are a bit more hairy: * - Exclusively load the lock value.
@@ -273,9 +270,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) } } -/* read_can_lock - would read_trylock() succeed? */ -#define arch_read_can_lock (x) (ACCESS_ONCE((x)->lock) < 0x80000000) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/blackfin/include/asm/spinlock.h +0 -10
@@ -48,16 +48,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)__raw_spin_unlock_asm (&lock->lock); } -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -return __raw_uncached_fetch_asm (&rw->lock) >0 ; -} - -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -return __raw_uncached_fetch_asm (&rw->lock) ==RW_LOCK_BIAS ; -} -static inline void arch_read_lock (arch_rwlock_t *rw) {__raw_read_lock_asm (&rw->lock);
arch/hexagon/include/asm/spinlock.h +0 -10
@@ -86,16 +86,6 @@ static inline int arch_read_trylock(arch_rwlock_t *lock)return temp; } -static inline int arch_read_can_lock (arch_rwlock_t *rwlock) -{ -return rwlock->lock ==0 ; -} - -static inline int arch_write_can_lock (arch_rwlock_t *rwlock) -{ -return rwlock->lock ==0 ; -} -/* Stuffs a -1 in the lock value? */ static inline void arch_write_lock (arch_rwlock_t *lock) {
arch/ia64/include/asm/spinlock.h +0 -3
@@ -127,9 +127,6 @@ static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock,arch_spin_lock (lock); } -#define arch_read_can_lock (rw) (*(volatile int *)(rw) >= 0) -#define arch_write_can_lock (rw) (*(volatile int *)(rw) == 0) -#ifdef ASM_SUPPORTED static __always_inline void
arch/m32r/include/asm/spinlock.h +0 -12
@@ -137,18 +137,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)* semaphore.h for details. -ben */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((int)(x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -static inline void arch_read_lock (arch_rwlock_t *rw) {unsigned long tmp0, tmp1;
arch/metag/include/asm/spinlock_lnkget.h +0 -30
@@ -136,21 +136,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) : "memory"); } -/* write_can_lock - would write_trylock() succeed? */ -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -int ret; - - asmvolatile ("LNKGETD %0, [%1]\n" -"CMP %0, #0\n" -"MOV %0, #1\n" -"XORNZ %0, %0, %0\n" - :"=&d" (ret) - :"da" (&rw->lock) - :"cc" ); -return ret; -} -/* * Read locks are a bit more hairy: * - Exclusively load the lock value.
@@ -224,21 +209,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)return tmp; } -/* read_can_lock - would read_trylock() succeed? */ -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -int tmp; - - asmvolatile ("LNKGETD %0, [%1]\n" -"CMP %0, %2\n" -"MOV %0, #1\n" -"XORZ %0, %0, %0\n" - :"=&d" (tmp) - :"da" (&rw->lock),"bd" (0x80000000 ) - :"cc" ); -return tmp; -} -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/metag/include/asm/spinlock_lock1.h +0 -20
@@ -104,16 +104,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) rw->lock =0 ; } -/* write_can_lock - would write_trylock() succeed? */ -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -unsigned int ret; - -barrier (); - ret = rw->lock; -return (ret ==0 ); -} -/* * Read locks are a bit more hairy: * - Exclusively load the lock value.
@@ -171,14 +161,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) return (ret < 0x80000000); } -/* read_can_lock - would read_trylock() succeed? */ -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -unsigned int ret; - -barrier (); - ret = rw->lock; -return (ret <0x80000000 ); -} -#endif /* __ASM_SPINLOCK_LOCK1_H */
arch/mn10300/include/asm/spinlock.h +0 -12
@@ -98,18 +98,6 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock,* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((int)(x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -/* * On mn10300, we implement read-write locks as a 32-bit counter * with the high bit (sign) being the "contended" bit.
arch/parisc/include/asm/spinlock.h +0 -18
@@ -168,24 +168,6 @@ static __inline__ int arch_write_trylock(arch_rwlock_t *rw)return result; } -/* -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -static __inline__int arch_read_can_lock (arch_rwlock_t *rw) -{ -return rw->counter >=0 ; -} - -/* -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -static __inline__int arch_write_can_lock (arch_rwlock_t *rw) -{ -return !rw->counter; -} -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock)
arch/powerpc/include/asm/spinlock.h +0 -3
@@ -181,9 +181,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)* read-locks. */ -#define arch_read_can_lock (rw) ((rw)->lock >= 0) -#define arch_write_can_lock (rw) (!(rw)->lock) -#ifdef CONFIG_PPC64 #define __DO_SIGN_EXTEND "extsw %0,%0\n"#define WRLOCK_TOKEN LOCK_TOKEN/* it's negative */
arch/s390/include/asm/spinlock.h +0 -12
@@ -110,18 +110,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lp)* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((int)(x)->lock >= 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == 0) -extern int _raw_read_trylock_retry (arch_rwlock_t *lp);extern int _raw_write_trylock_retry (arch_rwlock_t *lp);
arch/sh/include/asm/spinlock-cas.h +0 -12
@@ -53,18 +53,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -static inline void arch_read_lock (arch_rwlock_t *rw) {unsigned old;
arch/sh/include/asm/spinlock-llsc.h +0 -12
@@ -89,18 +89,6 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)* read-locks. */ -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_read_can_lock (x) ((x)->lock > 0) - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -#define arch_write_can_lock (x) ((x)->lock == RW_LOCK_BIAS) -static inline void arch_read_lock (arch_rwlock_t *rw) {unsigned long tmp;
arch/sparc/include/asm/spinlock_32.h +0 -3
@@ -190,9 +190,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)#define arch_read_relax (lock) cpu_relax()#define arch_write_relax (lock) cpu_relax() -#define arch_read_can_lock (rw) (!((rw)->lock & 0xff)) -#define arch_write_can_lock (rw) (!(rw)->lock) -#endif /* !(__ASSEMBLY__) */ #endif /* __SPARC_SPINLOCK_H */
arch/tile/include/asm/spinlock_32.h +0 -16
@@ -80,22 +80,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)#define _RD_COUNT_WIDTH 8/** -* arch_read_can_lock() - would read_trylock() succeed? -*/ -static inline int arch_read_can_lock (arch_rwlock_t *rwlock) -{ -return (rwlock->lock << _RD_COUNT_WIDTH) ==0 ; -} - -/** -* arch_write_can_lock() - would write_trylock() succeed? -*/ -static inline int arch_write_can_lock (arch_rwlock_t *rwlock) -{ -return rwlock->lock ==0 ; -} - -/** * arch_read_lock() - acquire a read lock. */ void arch_read_lock (arch_rwlock_t *rwlock);
arch/tile/include/asm/spinlock_64.h +0 -18
@@ -93,24 +93,6 @@ static inline int arch_write_val_locked(int val)return val <0 ;/* Optimize "val & __WRITE_LOCK_BIT". */ } -/** -* read_can_lock - would read_trylock() succeed? -* @lock: the rwlock in question. -*/ -static inline int arch_read_can_lock (arch_rwlock_t *rw) -{ -return !arch_write_val_locked (rw->lock); -} - -/** -* write_can_lock - would write_trylock() succeed? -* @lock: the rwlock in question. -*/ -static inline int arch_write_can_lock (arch_rwlock_t *rw) -{ -return rw->lock ==0 ; -} -extern void __read_lock_failed (arch_rwlock_t *rw);static inline void arch_read_lock (arch_rwlock_t *rw)
arch/xtensa/include/asm/spinlock.h +0 -2
@@ -97,8 +97,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)* 0x80000000 one writer owns the rwlock, no other writers, no readers */ -#define arch_write_can_lock (x) ((x)->lock == 0) -static inline void arch_write_lock (arch_rwlock_t *rw) {unsigned long tmp;
include/asm-generic/qrwlock.h +0 -20
@@ -53,24 +53,6 @@ extern void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts);extern void queued_write_lock_slowpath (struct qrwlock *lock);/** -* queued_read_can_lock- would read_trylock() succeed? -* @lock: Pointer to queue rwlock structure -*/ -static inline int queued_read_can_lock (struct qrwlock *lock) -{ -return !(atomic_read (&lock->cnts) & _QW_WMASK); -} - -/** -* queued_write_can_lock- would write_trylock() succeed? -* @lock: Pointer to queue rwlock structure -*/ -static inline int queued_write_can_lock (struct qrwlock *lock) -{ -return !atomic_read (&lock->cnts); -} - -/** * queued_read_trylock - try to acquire read lock of a queue rwlock * @lock : Pointer to queue rwlock structure * Return: 1 if lock acquired, 0 if failed
@@ -169,8 +151,6 @@ static inline void queued_write_unlock(struct qrwlock *lock)* Remapping rwlock architecture specific functions to the corresponding * queue rwlock functions. */ -#define arch_read_can_lock (l) queued_read_can_lock(l) -#define arch_write_can_lock (l) queued_write_can_lock(l)#define arch_read_lock (l) queued_read_lock(l)#define arch_write_lock (l) queued_write_lock(l)#define arch_read_trylock (l) queued_read_trylock(l)
include/linux/rwlock.h +0 -3
@@ -50,9 +50,6 @@ do { \# define do_raw_write_unlock (rwlock) do {arch_write_unlock(&(rwlock)->raw_lock); __release(lock); } while (0)#endif -#define read_can_lock (rwlock) arch_read_can_lock(&(rwlock)->raw_lock) -#define write_can_lock (rwlock) arch_write_can_lock(&(rwlock)->raw_lock) -/* * Define the various rw_lock methods. Note we define these * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
include/linux/spinlock.h +0 -11
@@ -278,12 +278,6 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) 1 : ({ local_irq_restore(flags); 0; }); \ }) -/** -* raw_spin_can_lock - would raw_spin_trylock() succeed? -* @lock: the spinlock in question. -*/ -#define raw_spin_can_lock (lock) (!raw_spin_is_locked(lock)) -/* Include rwlock functions */ #include <linux/rwlock.h>
@@ -396,11 +390,6 @@ static __always_inline int spin_is_contended(spinlock_t *lock)return raw_spin_is_contended (&lock->rlock); } -static __always_inline int spin_can_lock(spinlock_t *lock) -{ -return raw_spin_can_lock (&lock->rlock); -} -#define assert_spin_locked (lock) assert_raw_spin_locked(&(lock)->rlock)/*
include/linux/spinlock_up.h +0 -3
@@ -77,7 +77,4 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)#define arch_spin_is_contended (lock) (((void)(lock), 0)) -#define arch_read_can_lock (lock) (((void)(lock), 1)) -#define arch_write_can_lock (lock) (((void)(lock), 1)) -#endif /* __LINUX_SPINLOCK_UP_H */
kernel/locking/spinlock.c +2 -4
@@ -32,8 +32,6 @@* include/linux/spinlock_api_smp.h */ #else -#define raw_read_can_lock (l) read_can_lock(l) -#define raw_write_can_lock (l) write_can_lock(l)/* * Some architectures can relax in favour of the CPU owning the lock.
@@ -68,7 +66,7 @@ void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ \if (!(lock)->break_lock) \ (lock)->break_lock =1 ; \ - while (!raw_##op##_can_lock(lock) && (lock)->break_lock)\ +while ((lock)->break_lock) \ arch_##op##_relax(&lock->raw_lock); \ } \ (lock)->break_lock =0 ; \
@@ -88,7 +86,7 @@ unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ \if (!(lock)->break_lock) \ (lock)->break_lock =1 ; \ - while (!raw_##op##_can_lock(lock) && (lock)->break_lock)\ +while ((lock)->break_lock) \ arch_##op##_relax(&lock->raw_lock); \ } \ (lock)->break_lock =0 ; \
PATCH v2 3/4 locking: Remove dummy arch_{read,spin,write}_relax implementations
In reply to Will Deaconarch_{read,spin,write}_relax are defined as cpu_relax() by the core code, so architectures that can't do better (i.e. most of them) don't need to bother with the dummy definitions.
--- arch/arc/include/asm/spinlock.h | 4 ---- arch/arm/include/asm/spinlock.h | 4 ---- arch/arm64/include/asm/spinlock.h | 4 ---- arch/blackfin/include/asm/spinlock.h | 4 ---- arch/ia64/include/asm/spinlock.h | 4 ---- arch/m32r/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock_lnkget.h | 4 ---- arch/mips/include/asm/spinlock.h | 4 ---- arch/s390/include/asm/spinlock.h | 3 +++ arch/sh/include/asm/spinlock-cas.h | 4 ---- arch/sh/include/asm/spinlock-llsc.h | 4 ---- arch/sparc/include/asm/spinlock_32.h | 4 ---- arch/sparc/include/asm/spinlock_64.h | 4 ---- arch/x86/include/asm/spinlock.h | 4 ---- 15 files changed, 3 insertions(+), 56 deletions(-)
arch/arc/include/asm/spinlock.h +0 -4
@@ -413,8 +413,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_H */
arch/arm/include/asm/spinlock.h +0 -4
@@ -273,8 +273,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_H */
arch/arm64/include/asm/spinlock.h +0 -4
@@ -306,10 +306,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -/* See include/linux/spinlock.h */ #define smp_mb__after_spinlock () smp_mb()
arch/blackfin/include/asm/spinlock.h +0 -4
@@ -82,10 +82,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)__raw_write_unlock_asm (&rw->lock); } -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif #endif /* !__BFIN_SPINLOCK_H */
arch/ia64/include/asm/spinlock.h +0 -4
@@ -269,8 +269,4 @@ static inline int arch_read_trylock(arch_rwlock_t *x) return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; } -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_IA64_SPINLOCK_H */
arch/m32r/include/asm/spinlock.h +0 -4
@@ -308,8 +308,4 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_M32R_SPINLOCK_H */
arch/metag/include/asm/spinlock.h +0 -4
@@ -20,8 +20,4 @@#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_H */
arch/metag/include/asm/spinlock_lnkget.h +0 -4
@@ -212,8 +212,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_LNKGET_H */
arch/mips/include/asm/spinlock.h +0 -4
@@ -16,8 +16,4 @@#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_SPINLOCK_H */
arch/s390/include/asm/spinlock.h +3 -0
@@ -45,6 +45,7 @@ static inline void arch_spin_relax(arch_spinlock_t *lock) {arch_lock_relax (lock->lock); } +#define arch_spin_relax arch_spin_relaxstatic inline u32 arch_spin_lockval (int cpu) {
@@ -256,10 +257,12 @@ static inline void arch_read_relax(arch_rwlock_t *rw) {arch_lock_relax (rw->owner); } +#define arch_read_relax arch_read_relaxstatic inline void arch_write_relax (arch_rwlock_t *rw) {arch_lock_relax (rw->owner); } +#define arch_write_relax arch_write_relax#endif /* __ASM_SPINLOCK_H */
arch/sh/include/asm/spinlock-cas.h +0 -4
@@ -93,8 +93,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SH_SPINLOCK_CAS_H */
arch/sh/include/asm/spinlock-llsc.h +0 -4
@@ -200,8 +200,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SH_SPINLOCK_LLSC_H */
arch/sparc/include/asm/spinlock_32.h +0 -4
@@ -186,10 +186,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (rw, flags) arch_read_lock(rw)#define arch_write_lock_flags (rw, flags) arch_write_lock(rw) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* !(__ASSEMBLY__) */ #endif /* __SPARC_SPINLOCK_H */
arch/sparc/include/asm/spinlock_64.h +0 -4
@@ -16,10 +16,6 @@#define arch_read_lock_flags (p, f) arch_read_lock(p)#define arch_write_lock_flags (p, f) arch_write_lock(p) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* !(__ASSEMBLY__) */ #endif /* !(__SPARC64_SPINLOCK_H) */
arch/x86/include/asm/spinlock.h +0 -4
@@ -44,8 +44,4 @@#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_X86_SPINLOCK_H */
Signature · 1 line
2.1.4
tip-bot for Will Deacon
merge bot[tip:locking/core] locking/arch: Remove dummy arch_{read,spin,write}_relax() implementations
locking/arch: Remove dummy arch_{read,spin,write}_relax() implementations
Commit-ID: 0160fb177d484367e041ac251fca591a3e49660c Gitweb: https://git.kernel.org/tip/0160fb177d484367e041ac251fca591a3e49660c Author: Will Deacon <[email protected]> AuthorDate: Tue, 3 Oct 2017 19:25:28 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Oct 2017 11:50:18 +0200
locking/arch: Remove dummy arch_{read,spin,write}_relax() implementations
arch_{read,spin,write}_relax() are defined as cpu_relax() by the core code, so architectures that can't do better (i.e. most of them) don't need to bother with the dummy definitions.
--- arch/arc/include/asm/spinlock.h | 4 ---- arch/arm/include/asm/spinlock.h | 4 ---- arch/arm64/include/asm/spinlock.h | 4 ---- arch/blackfin/include/asm/spinlock.h | 4 ---- arch/ia64/include/asm/spinlock.h | 4 ---- arch/m32r/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock_lnkget.h | 4 ---- arch/mips/include/asm/spinlock.h | 4 ---- arch/s390/include/asm/spinlock.h | 3 +++ arch/sh/include/asm/spinlock-cas.h | 4 ---- arch/sh/include/asm/spinlock-llsc.h | 4 ---- arch/sparc/include/asm/spinlock_32.h | 4 ---- arch/sparc/include/asm/spinlock_64.h | 4 ---- arch/x86/include/asm/spinlock.h | 4 ---- 15 files changed, 3 insertions(+), 56 deletions(-)
arch/arc/include/asm/spinlock.h +0 -4
@@ -413,8 +413,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_H */
arch/arm/include/asm/spinlock.h +0 -4
@@ -273,8 +273,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_H */
arch/arm64/include/asm/spinlock.h +0 -4
@@ -306,10 +306,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -/* See include/linux/spinlock.h */ #define smp_mb__after_spinlock () smp_mb()
arch/blackfin/include/asm/spinlock.h +0 -4
@@ -82,10 +82,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)__raw_write_unlock_asm (&rw->lock); } -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif #endif /* !__BFIN_SPINLOCK_H */
arch/ia64/include/asm/spinlock.h +0 -4
@@ -269,8 +269,4 @@ static inline int arch_read_trylock(arch_rwlock_t *x) return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; } -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_IA64_SPINLOCK_H */
arch/m32r/include/asm/spinlock.h +0 -4
@@ -308,8 +308,4 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_M32R_SPINLOCK_H */
arch/metag/include/asm/spinlock.h +0 -4
@@ -20,8 +20,4 @@#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_H */
arch/metag/include/asm/spinlock_lnkget.h +0 -4
@@ -212,8 +212,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SPINLOCK_LNKGET_H */
arch/mips/include/asm/spinlock.h +0 -4
@@ -16,8 +16,4 @@#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_SPINLOCK_H */
arch/s390/include/asm/spinlock.h +3 -0
@@ -45,6 +45,7 @@ static inline void arch_spin_relax(arch_spinlock_t *lock) {arch_lock_relax (lock->lock); } +#define arch_spin_relax arch_spin_relaxstatic inline u32 arch_spin_lockval (int cpu) {
@@ -256,10 +257,12 @@ static inline void arch_read_relax(arch_rwlock_t *rw) {arch_lock_relax (rw->owner); } +#define arch_read_relax arch_read_relaxstatic inline void arch_write_relax (arch_rwlock_t *rw) {arch_lock_relax (rw->owner); } +#define arch_write_relax arch_write_relax#endif /* __ASM_SPINLOCK_H */
arch/sh/include/asm/spinlock-cas.h +0 -4
@@ -93,8 +93,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SH_SPINLOCK_CAS_H */
arch/sh/include/asm/spinlock-llsc.h +0 -4
@@ -200,8 +200,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* __ASM_SH_SPINLOCK_LLSC_H */
arch/sparc/include/asm/spinlock_32.h +0 -4
@@ -186,10 +186,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)#define arch_read_lock_flags (rw, flags) arch_read_lock(rw)#define arch_write_lock_flags (rw, flags) arch_write_lock(rw) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* !(__ASSEMBLY__) */ #endif /* __SPARC_SPINLOCK_H */
arch/sparc/include/asm/spinlock_64.h +0 -4
@@ -16,10 +16,6 @@#define arch_read_lock_flags (p, f) arch_read_lock(p)#define arch_write_lock_flags (p, f) arch_write_lock(p) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* !(__ASSEMBLY__) */ #endif /* !(__SPARC64_SPINLOCK_H) */
arch/x86/include/asm/spinlock.h +0 -4
@@ -44,8 +44,4 @@#define arch_read_lock_flags (lock, flags) arch_read_lock(lock)#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) cpu_relax() -#define arch_read_relax (lock) cpu_relax() -#define arch_write_relax (lock) cpu_relax() -#endif /* _ASM_X86_SPINLOCK_H */
PATCH v2 4/4 locking: Remove dummy arch_{read,spin,write}_lock_flags implementations
In reply to Will DeaconThe arch_{read,spin,write}_lock_flags macros are simply mapped to the non-flags versions by the majority of architectures, so do this in core code and remove the dummy implementations. Also remove the implementation in spinlock_up.h, since all callers of do_raw_spin_lock_flags call local_irq_save(flags) anyway.
--- arch/alpha/include/asm/spinlock.h | 4 ---- arch/arc/include/asm/spinlock.h | 4 ---- arch/arm/include/asm/spinlock.h | 5 ----- arch/arm64/include/asm/spinlock.h | 5 ----- arch/blackfin/include/asm/spinlock.h | 6 ------ arch/hexagon/include/asm/spinlock.h | 5 ----- arch/ia64/include/asm/spinlock.h | 5 +++-- arch/m32r/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock.h | 5 ----- arch/metag/include/asm/spinlock_lnkget.h | 3 --- arch/mips/include/asm/spinlock.h | 3 --- arch/mn10300/include/asm/spinlock.h | 4 +--- arch/parisc/include/asm/spinlock.h | 4 +--- arch/powerpc/include/asm/spinlock.h | 4 +--- arch/s390/include/asm/spinlock.h | 4 +--- arch/sh/include/asm/spinlock-cas.h | 4 ---- arch/sh/include/asm/spinlock-llsc.h | 4 ---- arch/sparc/include/asm/spinlock_32.h | 4 ---- arch/sparc/include/asm/spinlock_64.h | 3 --- arch/tile/include/asm/spinlock_32.h | 6 ------ arch/tile/include/asm/spinlock_64.h | 6 ------ arch/x86/include/asm/spinlock.h | 3 --- arch/xtensa/include/asm/spinlock.h | 5 ----- include/asm-generic/qspinlock.h | 1 - include/linux/rwlock.h | 9 +++++++++ include/linux/spinlock.h | 4 ++++ include/linux/spinlock_up.h | 8 -------- 27 files changed, 20 insertions(+), 102 deletions(-)
arch/alpha/include/asm/spinlock.h +0 -4
@@ -13,7 +13,6 @@* We make no fairness assumptions. They have a cost. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)#define arch_spin_is_locked (x) ((x)->lock != 0)static inline int arch_spin_value_unlocked (arch_spinlock_t lock)
@@ -160,7 +159,4 @@ static inline void arch_write_unlock(arch_rwlock_t * lock) lock->lock = 0; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ALPHA_SPINLOCK_H */
arch/arc/include/asm/spinlock.h +0 -4
@@ -14,7 +14,6 @@#include <asm/barrier.h> #define arch_spin_is_locked (x) ((x)->slock != __ARCH_SPIN_LOCK_UNLOCKED__) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)#ifdef CONFIG_ARC_HAS_LLSC
@@ -410,7 +409,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#endif -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/arm/include/asm/spinlock.h +0 -5
@@ -52,8 +52,6 @@ static inline void dsb_sev(void)* memory. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline void arch_spin_lock (arch_spinlock_t *lock) {unsigned long tmp;
@@ -270,7 +268,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) } } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/arm64/include/asm/spinlock.h +0 -5
@@ -27,8 +27,6 @@* instructions. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline void arch_spin_lock (arch_spinlock_t *lock) {unsigned int tmp;
@@ -303,9 +301,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)/* read_can_lock - would read_trylock() succeed? */ #define arch_read_can_lock (x) ((x)->lock < 0x80000000) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -/* See include/linux/spinlock.h */ #define smp_mb__after_spinlock () smp_mb()
arch/blackfin/include/asm/spinlock.h +0 -6
@@ -36,8 +36,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)__raw_spin_lock_asm (&lock->lock); } -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline int arch_spin_trylock (arch_spinlock_t *lock) {return __raw_spin_trylock_asm (&lock->lock);
@@ -53,8 +51,6 @@ static inline void arch_read_lock(arch_rwlock_t *rw)__raw_read_lock_asm (&rw->lock); } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -static inline int arch_read_trylock (arch_rwlock_t *rw) {return __raw_read_trylock_asm (&rw->lock);
@@ -70,8 +66,6 @@ static inline void arch_write_lock(arch_rwlock_t *rw)__raw_write_lock_asm (&rw->lock); } -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -static inline int arch_write_trylock (arch_rwlock_t *rw) {return __raw_write_trylock_asm (&rw->lock);
arch/hexagon/include/asm/spinlock.h +0 -5
@@ -167,11 +167,6 @@ static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock)/* * SMP spinlocks are intended to allow only a single CPU at the lock */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -#define arch_spin_is_locked (x) ((x)->lock != 0) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif
arch/ia64/include/asm/spinlock.h +3 -2
@@ -126,6 +126,7 @@ static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock, {arch_spin_lock (lock); } +#define arch_spin_lock_flags arch_spin_lock_flags#ifdef ASM_SUPPORTED
@@ -153,6 +154,7 @@ arch_read_lock_flags(arch_rwlock_t *lock, unsigned long flags) : "p6", "p7", "r2", "memory"); } +#define arch_read_lock_flags arch_read_lock_flags#define arch_read_lock (lock) arch_read_lock_flags(lock, 0)#else /* !ASM_SUPPORTED */
@@ -205,6 +207,7 @@ arch_write_lock_flags(arch_rwlock_t *lock, unsigned long flags) : "ar.ccv", "p6", "p7", "r2", "r29", "memory"); } +#define arch_write_lock_flags arch_write_lock_flags#define arch_write_lock (rw) arch_write_lock_flags(rw, 0)#define arch_write_trylock (rw) \
@@ -228,8 +231,6 @@ static inline void arch_write_unlock(arch_rwlock_t *x)#else /* !ASM_SUPPORTED */ -#define arch_write_lock_flags (l, flags) arch_write_lock(l) -#define arch_write_lock (l) \ ({ \ __u64 ia64_val, ia64_set_val = ia64_dep_mi(-1, 0, 31, 1); \
arch/m32r/include/asm/spinlock.h +0 -4
@@ -28,7 +28,6 @@*/ #define arch_spin_is_locked (x) (*(volatile int *)(&(x)->slock) <= 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)/** * arch_spin_trylock - Try spin lock and return a result
@@ -305,7 +304,4 @@ static inline int arch_write_trylock(arch_rwlock_t *lock) return 0; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_M32R_SPINLOCK_H */
arch/metag/include/asm/spinlock.h +0 -5
@@ -15,9 +15,4 @@* locked. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) - -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/metag/include/asm/spinlock_lnkget.h +0 -3
@@ -209,7 +209,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) return tmp; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_LNKGET_H */
arch/mips/include/asm/spinlock.h +0 -3
@@ -13,7 +13,4 @@#include <asm/qrwlock.h> #include <asm/qspinlock.h> -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_SPINLOCK_H */
arch/mn10300/include/asm/spinlock.h +1 -3
@@ -84,6 +84,7 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, : "d" (flags), "a"(&lock->slock), "i"(EPSW_IE | MN10300_CLI_LEVEL) : "memory", "cc"); } +#define arch_spin_lock_flags arch_spin_lock_flags#ifdef __KERNEL__
@@ -171,9 +172,6 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)return 0 ; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_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/parisc/include/asm/spinlock.h +1 -3
@@ -31,6 +31,7 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *x,cpu_relax ();mb (); } +#define arch_spin_lock_flags arch_spin_lock_flagsstatic inline void arch_spin_unlock (arch_spinlock_t *x) {
@@ -168,7 +169,4 @@ static __inline__ int arch_write_trylock(arch_rwlock_t *rw) return result; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/powerpc/include/asm/spinlock.h +1 -3
@@ -161,6 +161,7 @@ void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)local_irq_restore (flags_dis); } } +#define arch_spin_lock_flags arch_spin_lock_flagsstatic inline void arch_spin_unlock (arch_spinlock_t *lock) {
@@ -299,9 +300,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) rw->lock =0 ; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) __spin_yield(lock)#define arch_read_relax (lock) __rw_yield(lock)#define arch_write_relax (lock) __rw_yield(lock)
arch/s390/include/asm/spinlock.h +1 -3
@@ -81,6 +81,7 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lp,if (!arch_spin_trylock_once (lp))arch_spin_lock_wait_flags (lp, flags); } +#define arch_spin_lock_flags arch_spin_lock_flagsstatic inline int arch_spin_trylock (arch_spinlock_t *lp) {
@@ -114,9 +115,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lp)extern int _raw_read_trylock_retry (arch_rwlock_t *lp);extern int _raw_write_trylock_retry (arch_rwlock_t *lp); -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -static inline int arch_read_trylock_once (arch_rwlock_t *rw) {int old =ACCESS_ONCE (rw->lock);
arch/sh/include/asm/spinlock-cas.h +0 -4
@@ -27,7 +27,6 @@ static inline unsigned __sl_cas(volatile unsigned *p, unsigned old, unsigned new*/ #define arch_spin_is_locked (x) ((x)->lock <= 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)static inline void arch_spin_lock (arch_spinlock_t *lock) {
@@ -90,7 +89,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) return __sl_cas(&rw->lock, RW_LOCK_BIAS, 0) == RW_LOCK_BIAS; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SH_SPINLOCK_CAS_H */
arch/sh/include/asm/spinlock-llsc.h +0 -4
@@ -19,7 +19,6 @@*/ #define arch_spin_is_locked (x) ((x)->lock <= 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)/* * Simple spin lock operations. There are two variants, one clears IRQ's
@@ -197,7 +196,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) return (oldval > (RW_LOCK_BIAS - 1)); } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SH_SPINLOCK_LLSC_H */
arch/sparc/include/asm/spinlock_32.h +0 -4
@@ -182,10 +182,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw) res; \ }) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -#define arch_read_lock_flags (rw, flags) arch_read_lock(rw) -#define arch_write_lock_flags (rw, flags) arch_write_lock(rw) -#endif /* !(__ASSEMBLY__) */ #endif /* __SPARC_SPINLOCK_H */
arch/sparc/include/asm/spinlock_64.h +0 -3
@@ -13,9 +13,6 @@#include <asm/qrwlock.h> #include <asm/qspinlock.h> -#define arch_read_lock_flags (p, f) arch_read_lock(p) -#define arch_write_lock_flags (p, f) arch_write_lock(p) -#endif /* !(__ASSEMBLY__) */ #endif /* !(__SPARC64_SPINLOCK_H) */
arch/tile/include/asm/spinlock_32.h +0 -6
@@ -51,9 +51,6 @@ static inline int arch_spin_is_locked(arch_spinlock_t *lock)void arch_spin_lock (arch_spinlock_t *lock); -/* We cannot take an interrupt after getting a ticket, so don't enable them. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -int arch_spin_trylock (arch_spinlock_t *lock);static inline void arch_spin_unlock (arch_spinlock_t *lock)
@@ -109,7 +106,4 @@ void arch_read_unlock(arch_rwlock_t *rwlock);*/ void arch_write_unlock (arch_rwlock_t *rwlock); -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_TILE_SPINLOCK_32_H */
arch/tile/include/asm/spinlock_64.h +0 -6
@@ -75,9 +75,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)/* Try to get the lock, and return whether we succeeded. */ int arch_spin_trylock (arch_spinlock_t *lock); -/* We cannot take an interrupt after getting a ticket, so don't enable them. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -/* * Read-write spinlocks, allowing multiple readers * but only one writer.
@@ -138,7 +135,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) return 0; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_TILE_SPINLOCK_64_H */
arch/x86/include/asm/spinlock.h +0 -3
@@ -41,7 +41,4 @@#include <asm/qrwlock.h> -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_X86_SPINLOCK_H */
arch/xtensa/include/asm/spinlock.h +0 -5
@@ -33,8 +33,6 @@#define arch_spin_is_locked (x) ((x)->slock != 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline void arch_spin_lock (arch_spinlock_t *lock) {unsigned long tmp;
@@ -198,7 +196,4 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) : "memory"); } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _XTENSA_SPINLOCK_H */
include/asm-generic/qspinlock.h +0 -1
@@ -121,6 +121,5 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock)#define arch_spin_lock (l) queued_spin_lock(l)#define arch_spin_trylock (l) queued_spin_trylock(l)#define arch_spin_unlock (l) queued_spin_unlock(l) -#define arch_spin_lock_flags (l, f) queued_spin_lock(l)#endif /* __ASM_GENERIC_QSPINLOCK_H */
include/linux/rwlock.h +9 -0
@@ -38,6 +38,15 @@ do { \extern int do_raw_write_trylock (rwlock_t *lock); extern void do_raw_write_unlock(rwlock_t *lock) __releases(lock);#else + +#ifndef arch_read_lock_flags +# define arch_read_lock_flags (lock, flags) arch_read_lock(lock) +#endif + +#ifndef arch_write_lock_flags +# define arch_write_lock_flags (lock, flags) arch_write_lock(lock) +#endif +# define do_raw_read_lock (rwlock) do {__acquire(lock); arch_read_lock(&(rwlock)->raw_lock); } while (0)# define do_raw_read_lock_flags (lock, flags) \ do {__acquire(lock); arch_read_lock_flags(&(lock)->raw_lock, *(flags)); } while (0)
include/linux/spinlock.h +4 -0
@@ -165,6 +165,10 @@ static inline void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock)arch_spin_lock (&lock->raw_lock); } +#ifndef arch_spin_lock_flags +#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) +#endif +static inline void do_raw_spin_lock_flags (raw_spinlock_t *lock,unsigned long *flags)__acquires (lock) {
include/linux/spinlock_up.h +0 -8
@@ -32,14 +32,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)barrier (); } -static inline void -arch_spin_lock_flags (arch_spinlock_t *lock,unsigned long flags) -{ -local_irq_save (flags); - lock->slock =0 ; -barrier (); -} -static inline int arch_spin_trylock (arch_spinlock_t *lock) {char oldval = lock->slock;
Signature · 1 line
2.1.4
tip-bot for Will Deacon
merge bot[tip:locking/core] locking/arch: Remove dummy arch_{read,spin,write}_lock_flags() implementations
locking/arch: Remove dummy arch_{read,spin,write}_lock_flags() implementations
Commit-ID: a4c1887d4c1462b0ec5a8989f8ba3cdd9057a299 Gitweb: https://git.kernel.org/tip/a4c1887d4c1462b0ec5a8989f8ba3cdd9057a299 Author: Will Deacon <[email protected]> AuthorDate: Tue, 3 Oct 2017 19:25:29 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Oct 2017 11:50:19 +0200
locking/arch: Remove dummy arch_{read,spin,write}_lock_flags() implementations
The arch_{read,spin,write}_lock_flags() macros are simply mapped to the non-flags versions by the majority of architectures, so do this in core code and remove the dummy implementations. Also remove the implementation in spinlock_up.h, since all callers of do_raw_spin_lock_flags() call local_irq_save(flags) anyway.
--- arch/alpha/include/asm/spinlock.h | 4 ---- arch/arc/include/asm/spinlock.h | 4 ---- arch/arm/include/asm/spinlock.h | 5 ----- arch/arm64/include/asm/spinlock.h | 5 ----- arch/blackfin/include/asm/spinlock.h | 6 ------ arch/hexagon/include/asm/spinlock.h | 5 ----- arch/ia64/include/asm/spinlock.h | 5 +++-- arch/m32r/include/asm/spinlock.h | 4 ---- arch/metag/include/asm/spinlock.h | 5 ----- arch/metag/include/asm/spinlock_lnkget.h | 3 --- arch/mips/include/asm/spinlock.h | 3 --- arch/mn10300/include/asm/spinlock.h | 4 +--- arch/parisc/include/asm/spinlock.h | 4 +--- arch/powerpc/include/asm/spinlock.h | 4 +--- arch/s390/include/asm/spinlock.h | 4 +--- arch/sh/include/asm/spinlock-cas.h | 4 ---- arch/sh/include/asm/spinlock-llsc.h | 4 ---- arch/sparc/include/asm/spinlock_32.h | 4 ---- arch/sparc/include/asm/spinlock_64.h | 3 --- arch/tile/include/asm/spinlock_32.h | 6 ------ arch/tile/include/asm/spinlock_64.h | 6 ------ arch/x86/include/asm/spinlock.h | 3 --- arch/xtensa/include/asm/spinlock.h | 5 ----- include/asm-generic/qspinlock.h | 1 - include/linux/rwlock.h | 9 +++++++++ include/linux/spinlock.h | 4 ++++ include/linux/spinlock_up.h | 8 -------- 27 files changed, 20 insertions(+), 102 deletions(-)
arch/alpha/include/asm/spinlock.h +0 -4
@@ -13,7 +13,6 @@* We make no fairness assumptions. They have a cost. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)#define arch_spin_is_locked (x) ((x)->lock != 0)static inline int arch_spin_value_unlocked (arch_spinlock_t lock)
@@ -160,7 +159,4 @@ static inline void arch_write_unlock(arch_rwlock_t * lock) lock->lock = 0; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ALPHA_SPINLOCK_H */
arch/arc/include/asm/spinlock.h +0 -4
@@ -14,7 +14,6 @@#include <asm/barrier.h> #define arch_spin_is_locked (x) ((x)->slock != __ARCH_SPIN_LOCK_UNLOCKED__) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)#ifdef CONFIG_ARC_HAS_LLSC
@@ -410,7 +409,4 @@ static inline void arch_write_unlock(arch_rwlock_t *rw)#endif -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/arm/include/asm/spinlock.h +0 -5
@@ -52,8 +52,6 @@ static inline void dsb_sev(void)* memory. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline void arch_spin_lock (arch_spinlock_t *lock) {unsigned long tmp;
@@ -270,7 +268,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) } } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/arm64/include/asm/spinlock.h +0 -5
@@ -27,8 +27,6 @@* instructions. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline void arch_spin_lock (arch_spinlock_t *lock) {unsigned int tmp;
@@ -303,9 +301,6 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)/* read_can_lock - would read_trylock() succeed? */ #define arch_read_can_lock (x) ((x)->lock < 0x80000000) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -/* See include/linux/spinlock.h */ #define smp_mb__after_spinlock () smp_mb()
arch/blackfin/include/asm/spinlock.h +0 -6
@@ -36,8 +36,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)__raw_spin_lock_asm (&lock->lock); } -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline int arch_spin_trylock (arch_spinlock_t *lock) {return __raw_spin_trylock_asm (&lock->lock);
@@ -53,8 +51,6 @@ static inline void arch_read_lock(arch_rwlock_t *rw)__raw_read_lock_asm (&rw->lock); } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -static inline int arch_read_trylock (arch_rwlock_t *rw) {return __raw_read_trylock_asm (&rw->lock);
@@ -70,8 +66,6 @@ static inline void arch_write_lock(arch_rwlock_t *rw)__raw_write_lock_asm (&rw->lock); } -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -static inline int arch_write_trylock (arch_rwlock_t *rw) {return __raw_write_trylock_asm (&rw->lock);
arch/hexagon/include/asm/spinlock.h +0 -5
@@ -167,11 +167,6 @@ static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock)/* * SMP spinlocks are intended to allow only a single CPU at the lock */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -#define arch_spin_is_locked (x) ((x)->lock != 0) -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif
arch/ia64/include/asm/spinlock.h +3 -2
@@ -126,6 +126,7 @@ static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock, {arch_spin_lock (lock); } +#define arch_spin_lock_flags arch_spin_lock_flags#ifdef ASM_SUPPORTED
@@ -153,6 +154,7 @@ arch_read_lock_flags(arch_rwlock_t *lock, unsigned long flags) : "p6", "p7", "r2", "memory"); } +#define arch_read_lock_flags arch_read_lock_flags#define arch_read_lock (lock) arch_read_lock_flags(lock, 0)#else /* !ASM_SUPPORTED */
@@ -205,6 +207,7 @@ arch_write_lock_flags(arch_rwlock_t *lock, unsigned long flags) : "ar.ccv", "p6", "p7", "r2", "r29", "memory"); } +#define arch_write_lock_flags arch_write_lock_flags#define arch_write_lock (rw) arch_write_lock_flags(rw, 0)#define arch_write_trylock (rw) \
@@ -228,8 +231,6 @@ static inline void arch_write_unlock(arch_rwlock_t *x)#else /* !ASM_SUPPORTED */ -#define arch_write_lock_flags (l, flags) arch_write_lock(l) -#define arch_write_lock (l) \ ({ \ __u64 ia64_val, ia64_set_val = ia64_dep_mi(-1, 0, 31, 1); \
arch/m32r/include/asm/spinlock.h +0 -4
@@ -28,7 +28,6 @@*/ #define arch_spin_is_locked (x) (*(volatile int *)(&(x)->slock) <= 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)/** * arch_spin_trylock - Try spin lock and return a result
@@ -305,7 +304,4 @@ static inline int arch_write_trylock(arch_rwlock_t *lock) return 0; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_M32R_SPINLOCK_H */
arch/metag/include/asm/spinlock.h +0 -5
@@ -15,9 +15,4 @@* locked. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) - -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/metag/include/asm/spinlock_lnkget.h +0 -3
@@ -209,7 +209,4 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) return tmp; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_LNKGET_H */
arch/mips/include/asm/spinlock.h +0 -3
@@ -13,7 +13,4 @@#include <asm/qrwlock.h> #include <asm/qspinlock.h> -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_SPINLOCK_H */
arch/mn10300/include/asm/spinlock.h +1 -3
@@ -84,6 +84,7 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, : "d" (flags), "a"(&lock->slock), "i"(EPSW_IE | MN10300_CLI_LEVEL) : "memory", "cc"); } +#define arch_spin_lock_flags arch_spin_lock_flags#ifdef __KERNEL__
@@ -171,9 +172,6 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)return 0 ; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_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/parisc/include/asm/spinlock.h +1 -3
@@ -31,6 +31,7 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *x,cpu_relax ();mb (); } +#define arch_spin_lock_flags arch_spin_lock_flagsstatic inline void arch_spin_unlock (arch_spinlock_t *x) {
@@ -168,7 +169,4 @@ static __inline__ int arch_write_trylock(arch_rwlock_t *rw) return result; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SPINLOCK_H */
arch/powerpc/include/asm/spinlock.h +1 -3
@@ -161,6 +161,7 @@ void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)local_irq_restore (flags_dis); } } +#define arch_spin_lock_flags arch_spin_lock_flagsstatic inline void arch_spin_unlock (arch_spinlock_t *lock) {
@@ -299,9 +300,6 @@ static inline void arch_write_unlock(arch_rwlock_t *rw) rw->lock =0 ; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#define arch_spin_relax (lock) __spin_yield(lock)#define arch_read_relax (lock) __rw_yield(lock)#define arch_write_relax (lock) __rw_yield(lock)
arch/s390/include/asm/spinlock.h +1 -3
@@ -81,6 +81,7 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lp,if (!arch_spin_trylock_once (lp))arch_spin_lock_wait_flags (lp, flags); } +#define arch_spin_lock_flags arch_spin_lock_flagsstatic inline int arch_spin_trylock (arch_spinlock_t *lp) {
@@ -114,9 +115,6 @@ static inline void arch_spin_unlock(arch_spinlock_t *lp)extern int _raw_read_trylock_retry (arch_rwlock_t *lp);extern int _raw_write_trylock_retry (arch_rwlock_t *lp); -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -static inline int arch_read_trylock_once (arch_rwlock_t *rw) {int old =ACCESS_ONCE (rw->lock);
arch/sh/include/asm/spinlock-cas.h +0 -4
@@ -27,7 +27,6 @@ static inline unsigned __sl_cas(volatile unsigned *p, unsigned old, unsigned new*/ #define arch_spin_is_locked (x) ((x)->lock <= 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)static inline void arch_spin_lock (arch_spinlock_t *lock) {
@@ -90,7 +89,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) return __sl_cas(&rw->lock, RW_LOCK_BIAS, 0) == RW_LOCK_BIAS; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SH_SPINLOCK_CAS_H */
arch/sh/include/asm/spinlock-llsc.h +0 -4
@@ -19,7 +19,6 @@*/ #define arch_spin_is_locked (x) ((x)->lock <= 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock)/* * Simple spin lock operations. There are two variants, one clears IRQ's
@@ -197,7 +196,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) return (oldval > (RW_LOCK_BIAS - 1)); } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* __ASM_SH_SPINLOCK_LLSC_H */
arch/sparc/include/asm/spinlock_32.h +0 -4
@@ -182,10 +182,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw) res; \ }) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -#define arch_read_lock_flags (rw, flags) arch_read_lock(rw) -#define arch_write_lock_flags (rw, flags) arch_write_lock(rw) -#endif /* !(__ASSEMBLY__) */ #endif /* __SPARC_SPINLOCK_H */
arch/sparc/include/asm/spinlock_64.h +0 -3
@@ -13,9 +13,6 @@#include <asm/qrwlock.h> #include <asm/qspinlock.h> -#define arch_read_lock_flags (p, f) arch_read_lock(p) -#define arch_write_lock_flags (p, f) arch_write_lock(p) -#endif /* !(__ASSEMBLY__) */ #endif /* !(__SPARC64_SPINLOCK_H) */
arch/tile/include/asm/spinlock_32.h +0 -6
@@ -51,9 +51,6 @@ static inline int arch_spin_is_locked(arch_spinlock_t *lock)void arch_spin_lock (arch_spinlock_t *lock); -/* We cannot take an interrupt after getting a ticket, so don't enable them. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -int arch_spin_trylock (arch_spinlock_t *lock);static inline void arch_spin_unlock (arch_spinlock_t *lock)
@@ -109,7 +106,4 @@ void arch_read_unlock(arch_rwlock_t *rwlock);*/ void arch_write_unlock (arch_rwlock_t *rwlock); -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_TILE_SPINLOCK_32_H */
arch/tile/include/asm/spinlock_64.h +0 -6
@@ -75,9 +75,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)/* Try to get the lock, and return whether we succeeded. */ int arch_spin_trylock (arch_spinlock_t *lock); -/* We cannot take an interrupt after getting a ticket, so don't enable them. */ -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -/* * Read-write spinlocks, allowing multiple readers * but only one writer.
@@ -138,7 +135,4 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) return 0; } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_TILE_SPINLOCK_64_H */
arch/x86/include/asm/spinlock.h +0 -3
@@ -41,7 +41,4 @@#include <asm/qrwlock.h> -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _ASM_X86_SPINLOCK_H */
arch/xtensa/include/asm/spinlock.h +0 -5
@@ -33,8 +33,6 @@#define arch_spin_is_locked (x) ((x)->slock != 0) -#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) -static inline void arch_spin_lock (arch_spinlock_t *lock) {unsigned long tmp;
@@ -198,7 +196,4 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) : "memory"); } -#define arch_read_lock_flags (lock, flags) arch_read_lock(lock) -#define arch_write_lock_flags (lock, flags) arch_write_lock(lock) -#endif /* _XTENSA_SPINLOCK_H */
include/asm-generic/qspinlock.h +0 -1
@@ -121,6 +121,5 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock)#define arch_spin_lock (l) queued_spin_lock(l)#define arch_spin_trylock (l) queued_spin_trylock(l)#define arch_spin_unlock (l) queued_spin_unlock(l) -#define arch_spin_lock_flags (l, f) queued_spin_lock(l)#endif /* __ASM_GENERIC_QSPINLOCK_H */
include/linux/rwlock.h +9 -0
@@ -38,6 +38,15 @@ do { \extern int do_raw_write_trylock (rwlock_t *lock); extern void do_raw_write_unlock(rwlock_t *lock) __releases(lock);#else + +#ifndef arch_read_lock_flags +# define arch_read_lock_flags (lock, flags) arch_read_lock(lock) +#endif + +#ifndef arch_write_lock_flags +# define arch_write_lock_flags (lock, flags) arch_write_lock(lock) +#endif +# define do_raw_read_lock (rwlock) do {__acquire(lock); arch_read_lock(&(rwlock)->raw_lock); } while (0)# define do_raw_read_lock_flags (lock, flags) \ do {__acquire(lock); arch_read_lock_flags(&(lock)->raw_lock, *(flags)); } while (0)
include/linux/spinlock.h +4 -0
@@ -165,6 +165,10 @@ static inline void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock)arch_spin_lock (&lock->raw_lock); } +#ifndef arch_spin_lock_flags +#define arch_spin_lock_flags (lock, flags) arch_spin_lock(lock) +#endif +static inline void do_raw_spin_lock_flags (raw_spinlock_t *lock,unsigned long *flags)__acquires (lock) {
include/linux/spinlock_up.h +0 -8
@@ -32,14 +32,6 @@ static inline void arch_spin_lock(arch_spinlock_t *lock)barrier (); } -static inline void -arch_spin_lock_flags (arch_spinlock_t *lock,unsigned long flags) -{ -local_irq_save (flags); - lock->slock =0 ; -barrier (); -} -static inline int arch_spin_trylock (arch_spinlock_t *lock) {char oldval = lock->slock;
tip-bot for Will Deacon
merge bot[tip:locking/core] locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() with lockdep
In reply to Will Deaconlocking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() with lockdep
Commit-ID: 26c4eb192c6224e5297496cead36404b62fb071b Gitweb: https://git.kernel.org/tip/26c4eb192c6224e5297496cead36404b62fb071b Author: Will Deacon <[email protected]> AuthorDate: Tue, 3 Oct 2017 19:25:26 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Oct 2017 11:50:17 +0200
locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() with lockdep
The lockdep subsystem provides a robust way to assert that a lock is held, so use that instead of write_can_lock, which can give incorrect results for qrwlocks.
--- security/apparmor/include/lib.h | 11 ----------- security/apparmor/label.c | 8 ++++---- 2 files changed, 4 insertions(+), 15 deletions(-)
security/apparmor/include/lib.h +0 -11
@@ -19,17 +19,6 @@#include "match.h" -/* Provide our own test for whether a write lock is held for asserts -* this is because on none SMP systems write_can_lock will always -* resolve to true, which is what you want for code making decisions -* based on it, but wrong for asserts checking that the lock is held -*/ -#ifdef CONFIG_SMP -#define write_is_locked (X ) !write_can_lock(X) -#else -#define write_is_locked (X ) (1) -#endif /* CONFIG_SMP */ -/* * DEBUG remains global (no per profile flag) since it is mostly used in sysctl * which is not related to profile accesses.
security/apparmor/label.c +4 -4
@@ -80,7 +80,7 @@ void __aa_proxy_redirect(struct aa_label *orig, struct aa_label *new)AA_BUG (!orig);AA_BUG (!new); -AA_BUG (!write_is_locked (&labels_set (orig)->lock)); +lockdep_assert_held_exclusive (&labels_set (orig)->lock); tmp =rcu_dereference_protected (orig->proxy->label, &labels_ns (orig)->lock);
@@ -571,7 +571,7 @@ static bool __label_remove(struct aa_label *label, struct aa_label *new)AA_BUG (!ls);AA_BUG (!label); -AA_BUG (!write_is_locked (&ls->lock)); +lockdep_assert_held_exclusive (&ls->lock);if (new)__aa_proxy_redirect (label, new);
@@ -608,7 +608,7 @@ static bool __label_replace(struct aa_label *old, struct aa_label *new)AA_BUG (!ls);AA_BUG (!old);AA_BUG (!new); -AA_BUG (!write_is_locked (&ls->lock)); +lockdep_assert_held_exclusive (&ls->lock);AA_BUG (new->flags &FLAG_IN_TREE );if (!label_is_stale (old))
@@ -645,7 +645,7 @@ static struct aa_label *__label_insert(struct aa_labelset *ls,AA_BUG (!ls);AA_BUG (!label);AA_BUG (labels_set (label) != ls); -AA_BUG (!write_is_locked (&ls->lock)); +lockdep_assert_held_exclusive (&ls->lock);AA_BUG (label->flags &FLAG_IN_TREE );/* Figure out where to put new node */