Konstantin Demin
c3d09a3e94
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
59 lines
2.6 KiB
Diff
59 lines
2.6 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Mon, 12 Aug 2024 12:39:02 +0200
|
|
Subject: [PATCH 1/4] locking/rt: Add sparse annotation PREEMPT_RT's sleeping
|
|
locks.
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
|
|
|
The sleeping locks on PREEMPT_RT (rt_spin_lock() and friends) lack
|
|
sparse annotation. Therefore a missing spin_unlock() won't be spotted by
|
|
sparse in a PREEMPT_RT build while it is noticed on a !PREEMPT_RT build.
|
|
|
|
Add the __acquires/__releases macros to the lock/ unlock functions. The
|
|
trylock functions already use the __cond_lock() wrapper.
|
|
|
|
Link: https://lore.kernel.org/r/20240812104200.2239232-2-bigeasy@linutronix.de
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
include/linux/rwlock_rt.h | 10 +++++-----
|
|
include/linux/spinlock_rt.h | 8 ++++----
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/include/linux/rwlock_rt.h
|
|
+++ b/include/linux/rwlock_rt.h
|
|
@@ -24,13 +24,13 @@ do { \
|
|
__rt_rwlock_init(rwl, #rwl, &__key); \
|
|
} while (0)
|
|
|
|
-extern void rt_read_lock(rwlock_t *rwlock);
|
|
+extern void rt_read_lock(rwlock_t *rwlock) __acquires(rwlock);
|
|
extern int rt_read_trylock(rwlock_t *rwlock);
|
|
-extern void rt_read_unlock(rwlock_t *rwlock);
|
|
-extern void rt_write_lock(rwlock_t *rwlock);
|
|
-extern void rt_write_lock_nested(rwlock_t *rwlock, int subclass);
|
|
+extern void rt_read_unlock(rwlock_t *rwlock) __releases(rwlock);
|
|
+extern void rt_write_lock(rwlock_t *rwlock) __acquires(rwlock);
|
|
+extern void rt_write_lock_nested(rwlock_t *rwlock, int subclass) __acquires(rwlock);
|
|
extern int rt_write_trylock(rwlock_t *rwlock);
|
|
-extern void rt_write_unlock(rwlock_t *rwlock);
|
|
+extern void rt_write_unlock(rwlock_t *rwlock) __releases(rwlock);
|
|
|
|
static __always_inline void read_lock(rwlock_t *rwlock)
|
|
{
|
|
--- a/include/linux/spinlock_rt.h
|
|
+++ b/include/linux/spinlock_rt.h
|
|
@@ -32,10 +32,10 @@ do { \
|
|
__rt_spin_lock_init(slock, #slock, &__key, true); \
|
|
} while (0)
|
|
|
|
-extern void rt_spin_lock(spinlock_t *lock);
|
|
-extern void rt_spin_lock_nested(spinlock_t *lock, int subclass);
|
|
-extern void rt_spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *nest_lock);
|
|
-extern void rt_spin_unlock(spinlock_t *lock);
|
|
+extern void rt_spin_lock(spinlock_t *lock) __acquires(lock);
|
|
+extern void rt_spin_lock_nested(spinlock_t *lock, int subclass) __acquires(lock);
|
|
+extern void rt_spin_lock_nest_lock(spinlock_t *lock, struct lockdep_map *nest_lock) __acquires(lock);
|
|
+extern void rt_spin_unlock(spinlock_t *lock) __releases(lock);
|
|
extern void rt_spin_lock_unlock(spinlock_t *lock);
|
|
extern int rt_spin_trylock_bh(spinlock_t *lock);
|
|
extern int rt_spin_trylock(spinlock_t *lock);
|