From nobody Sat Jun 13 23:11:24 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79B992FD681; Tue, 5 May 2026 10:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978538; cv=none; b=sQPIQVyWPQH1cUfl1OLJFh73oW2pLWoXhU66opQmXOPLk4o7Xkf1xGgnCMcihotbIUEh6tA3yvVYtfrOAqq4CakwJEK4zx5LjqQmTIIkZlMKiYQ4tzkDNq3bV7vAy5knpTPLT1ScmywMgCjj9y0+oca4IMs451c7Purv/x4IvsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978538; c=relaxed/simple; bh=hSAy0/bvNj9JmULO/t1Gdhkmjvgyurf0ZcyyZAxpCX0=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=GCNd1+AfLU7K3qIjQKfTivR9p7Q6Ix7a9dWejyAVj36M/kpJWP8ucS9W6rOt5t5RPPWMiGrV6oKNIczogobizBuHaARJdxMJjIgSDl4gxTERu85Lg4J+Dp3CG7PcTSMxtrWTXR9EOSj+kdnfmiWpmV/LlUsgg62GW3mxjX+d/T0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Db6Zpcfi; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=snH1kXZs; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Db6Zpcfi"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="snH1kXZs" Date: Tue, 05 May 2026 10:55:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777978535; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d8pueLivudyrnjn4xuACULYTrvQMXLunLiCcOzX6xRk=; b=Db6ZpcfiIBuFnAZSjxJ+SYSM4OGbJvw5fPLtUm9Iy8c/sys3Etv9duG0HKhmrJHAO/jaG+ 8P83CtsFXguvrnE/fH5kWTl5dQ4pGf0cDmnFkk/2E1AYqxQmlbToCeCELYsdzuui3Vm+wb 1JrykrLZRBoJYi42cHG9pUyfz/wWCHbY4RctbZPH+N/+0jquDLq1519BAcMzI/7SoL1IuC EVLp1tkGFyiun+n1lg1Vc7wVaQIS+Ivhtq4yM5HVZ837bS+0215hU6S9XfIxzaQnpNOz+6 CngcKOLHlNoQBx7tfck1E957ig1uqvE9WwPPR5f7lQztIS+WewDs2x430tX7ng== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777978535; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d8pueLivudyrnjn4xuACULYTrvQMXLunLiCcOzX6xRk=; b=snH1kXZs4L8pC1CiaJnSo8tA14mobOtmQssXDqgWR5HrFJHjuCHqItInxF9jd6MhVJDA6j C0aml1Bwm2ga11Ag== From: "tip-bot2 for Bart Van Assche" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/rtmutex: Annotate API and implementation Cc: Bart Van Assche , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260505022649.870788-1-bvanassche@acm.org> References: <20260505022649.870788-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177797853432.424702.11529123964407349507.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the locking/core branch of tip: Commit-ID: d30a456aa7ce1bab05d9b364eeacad0c9cb10cc2 Gitweb: https://git.kernel.org/tip/d30a456aa7ce1bab05d9b364eeacad0c9= cb10cc2 Author: Bart Van Assche AuthorDate: Tue, 05 May 2026 04:26:44 +02:00 Committer: Peter Zijlstra CommitterDate: Tue, 05 May 2026 12:50:49 +02:00 locking/rtmutex: Annotate API and implementation Add lock context annotations to the rtmutex API and implementation and enable lock context analysis. Signed-off-by: Bart Van Assche Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260505022649.870788-1-bvanassche@acm.org --- include/linux/rtmutex.h | 22 +++++++++++++++------- kernel/locking/Makefile | 1 + kernel/locking/rtmutex.c | 5 +++++ kernel/locking/rtmutex_api.c | 6 ++++++ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h index 78e7e58..9e1f012 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h @@ -56,6 +56,8 @@ static inline struct task_struct *rt_mutex_owner(struct r= t_mutex_base *lock) #endif extern void rt_mutex_base_init(struct rt_mutex_base *rtb); =20 +context_lock_struct(rt_mutex); + /** * The rt_mutex structure * @@ -108,8 +110,10 @@ do { \ extern void __rt_mutex_init(struct rt_mutex *lock, const char *name, struc= t lock_class_key *key); =20 #ifdef CONFIG_DEBUG_LOCK_ALLOC -extern void rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subcl= ass); -extern void _rt_mutex_lock_nest_lock(struct rt_mutex *lock, struct lockdep= _map *nest_lock); +extern void rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subcl= ass) + __acquires(lock); +extern void _rt_mutex_lock_nest_lock(struct rt_mutex *lock, struct lockdep= _map *nest_lock) + __acquires(lock); #define rt_mutex_lock(lock) rt_mutex_lock_nested(lock, 0) #define rt_mutex_lock_nest_lock(lock, nest_lock) \ do { \ @@ -118,15 +122,19 @@ extern void _rt_mutex_lock_nest_lock(struct rt_mutex = *lock, struct lockdep_map * } while (0) =20 #else -extern void rt_mutex_lock(struct rt_mutex *lock); +extern void rt_mutex_lock(struct rt_mutex *lock) __acquires(lock); #define rt_mutex_lock_nested(lock, subclass) rt_mutex_lock(lock) #define rt_mutex_lock_nest_lock(lock, nest_lock) rt_mutex_lock(lock) #endif =20 -extern int rt_mutex_lock_interruptible(struct rt_mutex *lock); -extern int rt_mutex_lock_killable(struct rt_mutex *lock); -extern int rt_mutex_trylock(struct rt_mutex *lock); +extern int rt_mutex_lock_interruptible(struct rt_mutex *lock) + __cond_acquires(0, lock); +extern int rt_mutex_lock_killable(struct rt_mutex *lock) + __cond_acquires(0, lock); +extern int rt_mutex_trylock(struct rt_mutex *lock) + __cond_acquires(true, lock); =20 -extern void rt_mutex_unlock(struct rt_mutex *lock); +extern void rt_mutex_unlock(struct rt_mutex *lock) + __releases(lock); =20 #endif diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile index cee1901..24dc00e 100644 --- a/kernel/locking/Makefile +++ b/kernel/locking/Makefile @@ -4,6 +4,7 @@ KCOV_INSTRUMENT :=3D n =20 CONTEXT_ANALYSIS_mutex.o :=3D y +CONTEXT_ANALYSIS_rtmutex.o :=3D y CONTEXT_ANALYSIS_rtmutex_api.o :=3D y CONTEXT_ANALYSIS_ww_rt_mutex.o :=3D y CONTEXT_ANALYSIS_rwsem.o :=3D y diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 4f386ea..69759fd 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -484,6 +484,7 @@ static __always_inline bool __waiter_less(struct rb_nod= e *a, const struct rb_nod =20 static __always_inline void rt_mutex_enqueue(struct rt_mutex_base *lock, struct rt_mutex_waiter *waite= r) + __must_hold(&lock->wait_lock) { lockdep_assert_held(&lock->wait_lock); =20 @@ -492,6 +493,7 @@ rt_mutex_enqueue(struct rt_mutex_base *lock, struct rt_= mutex_waiter *waiter) =20 static __always_inline void rt_mutex_dequeue(struct rt_mutex_base *lock, struct rt_mutex_waiter *waite= r) + __must_hold(&lock->wait_lock) { lockdep_assert_held(&lock->wait_lock); =20 @@ -1092,6 +1094,7 @@ static int __sched rt_mutex_adjust_prio_chain(struct = task_struct *task, static int __sched try_to_take_rt_mutex(struct rt_mutex_base *lock, struct task_struct *task, struct rt_mutex_waiter *waiter) + __must_hold(&lock->wait_lock) { lockdep_assert_held(&lock->wait_lock); =20 @@ -1319,6 +1322,7 @@ static int __sched task_blocks_on_rt_mutex(struct rt_= mutex_base *lock, */ static void __sched mark_wakeup_next_waiter(struct rt_wake_q_head *wqh, struct rt_mutex_base *lock) + __must_hold(&lock->wait_lock) { struct rt_mutex_waiter *waiter; =20 @@ -1479,6 +1483,7 @@ static void __sched rt_mutex_slowunlock(struct rt_mut= ex_base *lock) } =20 static __always_inline void __rt_mutex_unlock(struct rt_mutex_base *lock) + __no_context_analysis { if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) return; diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c index 124219a..23ad997 100644 --- a/kernel/locking/rtmutex_api.c +++ b/kernel/locking/rtmutex_api.c @@ -41,6 +41,7 @@ static __always_inline int __rt_mutex_lock_common(struct = rt_mutex *lock, unsigned int state, struct lockdep_map *nest_lock, unsigned int subclass) + __cond_acquires(0, lock) { int ret; =20 @@ -66,12 +67,14 @@ EXPORT_SYMBOL(rt_mutex_base_init); * @subclass: the lockdep subclass */ void __sched rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subc= lass) + __no_context_analysis /* ignoring the return value below is fine in this = case */ { __rt_mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, NULL, subclass); } EXPORT_SYMBOL_GPL(rt_mutex_lock_nested); =20 void __sched _rt_mutex_lock_nest_lock(struct rt_mutex *lock, struct lockde= p_map *nest_lock) + __no_context_analysis /* ignoring the return value below is fine in this = case */ { __rt_mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, nest_lock, 0); } @@ -157,6 +160,7 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock) { mutex_release(&lock->dep_map, _RET_IP_); __rt_mutex_unlock(&lock->rtmutex); + __release(lock); } EXPORT_SYMBOL_GPL(rt_mutex_unlock); =20 @@ -182,6 +186,7 @@ int __sched __rt_mutex_futex_trylock(struct rt_mutex_ba= se *lock) */ bool __sched __rt_mutex_futex_unlock(struct rt_mutex_base *lock, struct rt_wake_q_head *wqh) + __must_hold(&lock->wait_lock) { lockdep_assert_held(&lock->wait_lock); =20 @@ -312,6 +317,7 @@ int __sched __rt_mutex_start_proxy_lock(struct rt_mutex= _base *lock, struct rt_mutex_waiter *waiter, struct task_struct *task, struct wake_q_head *wake_q) + __must_hold(&lock->wait_lock) { int ret; =20