locking: Fix rwlock and spinlock lock context annotations

Fix two incorrect rwlock_t lock context annotations. Add the raw_spinlock_t
lock context annotations that are missing.

Fixes: f16a802d402d ("locking/rwlock, spinlock: Support Clang's context analysis")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Marco Elver <elver@google.com>
Link: https://patch.msgid.link/20260225183244.4035378-2-bvanassche@acm.org

authored by

Bart Van Assche and committed by

Peter Zijlstra 2 months ago 38e18d82 50214dc4

+8 -5

3 changed files

expand all

include

linux

rwlock.h

rwlock_api_smp.h

spinlock.h

+2 -2

include/linux/rwlock.h

··· 30 30 31 31 #ifdef CONFIG_DEBUG_SPINLOCK 32 32 extern void do_raw_read_lock(rwlock_t *lock) __acquires_shared(lock); 33 - extern int do_raw_read_trylock(rwlock_t *lock); 33 + extern int do_raw_read_trylock(rwlock_t *lock) __cond_acquires_shared(true, lock); 34 34 extern void do_raw_read_unlock(rwlock_t *lock) __releases_shared(lock); 35 35 extern void do_raw_write_lock(rwlock_t *lock) __acquires(lock); 36 - extern int do_raw_write_trylock(rwlock_t *lock); 36 + extern int do_raw_write_trylock(rwlock_t *lock) __cond_acquires(true, lock); 37 37 extern void do_raw_write_unlock(rwlock_t *lock) __releases(lock); 38 38 #else 39 39 # define do_raw_read_lock(rwlock) do {__acquire_shared(lock); arch_read_lock(&(rwlock)->raw_lock); } while (0)

+4 -2

include/linux/rwlock_api_smp.h

··· 23 23 void __lockfunc _raw_read_lock_irq(rwlock_t *lock) __acquires_shared(lock); 24 24 void __lockfunc _raw_write_lock_irq(rwlock_t *lock) __acquires(lock); 25 25 unsigned long __lockfunc _raw_read_lock_irqsave(rwlock_t *lock) 26 - __acquires(lock); 26 + __acquires_shared(lock); 27 27 unsigned long __lockfunc _raw_write_lock_irqsave(rwlock_t *lock) 28 28 __acquires(lock); 29 29 int __lockfunc _raw_read_trylock(rwlock_t *lock) __cond_acquires_shared(true, lock); ··· 36 36 void __lockfunc _raw_write_unlock_irq(rwlock_t *lock) __releases(lock); 37 37 void __lockfunc 38 38 _raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 39 - __releases(lock); 39 + __releases_shared(lock); 40 40 void __lockfunc 41 41 _raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 42 42 __releases(lock); ··· 116 116 #endif 117 117 118 118 static inline int __raw_read_trylock(rwlock_t *lock) 119 + __cond_acquires_shared(true, lock) 119 120 { 120 121 preempt_disable(); 121 122 if (do_raw_read_trylock(lock)) { ··· 128 127 } 129 128 130 129 static inline int __raw_write_trylock(rwlock_t *lock) 130 + __cond_acquires(true, lock) 131 131 { 132 132 preempt_disable(); 133 133 if (do_raw_write_trylock(lock)) {

+2 -1

include/linux/spinlock.h

··· 178 178 179 179 #ifdef CONFIG_DEBUG_SPINLOCK 180 180 extern void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock); 181 - extern int do_raw_spin_trylock(raw_spinlock_t *lock); 181 + extern int do_raw_spin_trylock(raw_spinlock_t *lock) __cond_acquires(true, lock); 182 182 extern void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock); 183 183 #else 184 184 static inline void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock) ··· 189 189 } 190 190 191 191 static inline int do_raw_spin_trylock(raw_spinlock_t *lock) 192 + __cond_acquires(true, lock) 192 193 { 193 194 int ret = arch_spin_trylock(&(lock)->raw_lock); 194 195

Configure Feed

Configure Feed