Konstantin Demin
c3d09a3e94
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Mon, 12 Aug 2024 12:39:05 +0200
|
|
Subject: [PATCH 4/4] locking/rt: Annotate unlock followed by lock for sparse.
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
|
|
|
rt_mutex_slowlock_block() and rtlock_slowlock_locked() both unlock
|
|
lock::wait_lock and then lock it later. This is unusual and sparse
|
|
complains about it.
|
|
|
|
Add __releases() + __acquires() annotation to mark that it is expected.
|
|
|
|
Link: https://lore.kernel.org/r/20240812104200.2239232-5-bigeasy@linutronix.de
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/locking/rtmutex.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/kernel/locking/rtmutex.c
|
|
+++ b/kernel/locking/rtmutex.c
|
|
@@ -1601,6 +1601,7 @@ static int __sched rt_mutex_slowlock_blo
|
|
unsigned int state,
|
|
struct hrtimer_sleeper *timeout,
|
|
struct rt_mutex_waiter *waiter)
|
|
+ __releases(&lock->wait_lock) __acquires(&lock->wait_lock)
|
|
{
|
|
struct rt_mutex *rtm = container_of(lock, struct rt_mutex, rtmutex);
|
|
struct task_struct *owner;
|
|
@@ -1805,6 +1806,7 @@ static __always_inline int __rt_mutex_lo
|
|
* @lock: The underlying RT mutex
|
|
*/
|
|
static void __sched rtlock_slowlock_locked(struct rt_mutex_base *lock)
|
|
+ __releases(&lock->wait_lock) __acquires(&lock->wait_lock)
|
|
{
|
|
struct rt_mutex_waiter waiter;
|
|
struct task_struct *owner;
|