Commit 38e18d82 authored by Bart Van Assche's avatar Bart Van Assche Committed by Peter Zijlstra
Browse files

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: f16a802d ("locking/rwlock, spinlock: Support Clang's context analysis")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarMarco Elver <elver@google.com>
Link: https://patch.msgid.link/20260225183244.4035378-2-bvanassche@acm.org
parent 50214dc4

include/linux/rwlock.h

+2 −2
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ do { \ 


#ifdef CONFIG_DEBUG_SPINLOCK

 extern void do_raw_read_lock(rwlock_t *lock) __acquires_shared(lock);

 extern int do_raw_read_trylock(rwlock_t *lock);

 extern int do_raw_read_trylock(rwlock_t *lock) __cond_acquires_shared(true, lock);

 extern void do_raw_read_unlock(rwlock_t *lock) __releases_shared(lock);

 extern void do_raw_write_lock(rwlock_t *lock) __acquires(lock);

 extern int do_raw_write_trylock(rwlock_t *lock);

extern int do_raw_write_trylock(rwlock_t *lock) __cond_acquires(true, lock);

 extern void do_raw_write_unlock(rwlock_t *lock) __releases(lock);

#else

# define do_raw_read_lock(rwlock)	do {__acquire_shared(lock); arch_read_lock(&(rwlock)->raw_lock); } while (0)

include/linux/rwlock_api_smp.h

+4 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void __lockfunc _raw_write_lock_bh(rwlock_t *lock) __acquires(lock); 
void __lockfunc _raw_read_lock_irq(rwlock_t *lock)	__acquires_shared(lock);

void __lockfunc _raw_write_lock_irq(rwlock_t *lock)	__acquires(lock);

unsigned long __lockfunc _raw_read_lock_irqsave(rwlock_t *lock)

							__acquires(lock);

							__acquires_shared(lock);

unsigned long __lockfunc _raw_write_lock_irqsave(rwlock_t *lock)

							__acquires(lock);

int __lockfunc _raw_read_trylock(rwlock_t *lock)	__cond_acquires_shared(true, lock);
@@ -36,7 +36,7 @@ void __lockfunc _raw_read_unlock_irq(rwlock_t *lock) __releases_shared(lock); 
void __lockfunc _raw_write_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc

_raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(lock);

							__releases_shared(lock);

void __lockfunc

_raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(lock);
@@ -116,6 +116,7 @@ _raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 
#endif



static inline int __raw_read_trylock(rwlock_t *lock)

	__cond_acquires_shared(true, lock)

{

	preempt_disable();

	if (do_raw_read_trylock(lock)) {
@@ -127,6 +128,7 @@ static inline int __raw_read_trylock(rwlock_t *lock) 
}



static inline int __raw_write_trylock(rwlock_t *lock)

	__cond_acquires(true, lock)

{

	preempt_disable();

	if (do_raw_write_trylock(lock)) {

include/linux/spinlock.h

+2 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ do { \ 


#ifdef CONFIG_DEBUG_SPINLOCK

 extern void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock);

 extern int do_raw_spin_trylock(raw_spinlock_t *lock);

 extern int do_raw_spin_trylock(raw_spinlock_t *lock) __cond_acquires(true, lock);

 extern void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock);

#else

static inline void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock)
@@ -189,6 +189,7 @@ static inline void do_raw_spin_lock(raw_spinlock_t *lock) __acquires(lock) 
}



static inline int do_raw_spin_trylock(raw_spinlock_t *lock)

	__cond_acquires(true, lock)

{

	int ret = arch_spin_trylock(&(lock)->raw_lock);