From nobody Mon Apr 6 19:59:13 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 9739337647E; Wed, 18 Mar 2026 08:02:51 +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=1773820973; cv=none; b=slRVK6YxndCKRVxoGpMxO2wOnoIK/IN3pujhzjWd0e9oeCFicog1Em47JS2XnZoxEl2an+2bcC/ZdhbsBBkUyd4BxYgw8WqFZBhV2o5s7v1lcpH2T6bjiGxuTlKQMC7QO81ODcmjwx374gckWostQT93yQ1dHEEFS3zfX3EP5eE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773820973; c=relaxed/simple; bh=SmIoy7QdzWUiQ8qxo+/jM4QIMo5aNt60nNAXaNCXOXs=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=A6bf+U2eY3HSEGbluRYsg4BsEnOHRwbdv9icxs+mfOAQ114UakH+OKsbyRqycMMbzLdFfZ/tV7S5zaviQ0b+5QR/7xcZk8Iefx6MBDXQiuVl9AE33S4Gs2DK79Q8vW8ht5Hd6od/5GcpKP7LJbeXK+nM74tkywD3T3AhVUNO3AE= 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=UnSRk0Kv; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=kyhBSN4g; 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="UnSRk0Kv"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="kyhBSN4g" Date: Wed, 18 Mar 2026 08:02:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1773820967; 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=DTN7Yh5uBwjb8Hf/y4JMRLh3nqqOASo+zHaXMTo4Q9w=; b=UnSRk0KvVnv9cm13l+Hpsl7kLgtYwEItMMbwOHcnOJwSv/BPbzpjZzwc6iKapb6U502aYp Xl+FjBQIh0ZClo6KKcOHaWAUnl79vmSY7WGeNbJzIlSm9+sEbl8YlymFqgVCLPyav+uaEn G6zaKyyD8Ef1SdyoqsJCa6S75NktVY8sYPaxSteQotbFr/HuVmjhTvX7bRBpqrmbIxbmLa lF1voMB0a4O4NKZ/ZSa1MZHeLbB+2GOmkwSAwcIUIpbDnaUGeXDpXyWi8t9fmSdpX00jvy gsNoUBFYRENVSKv15wq4d3oXG774glralVEtsXpJTUQ2oB1Yl6xghj/X8CvEvQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1773820967; 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=DTN7Yh5uBwjb8Hf/y4JMRLh3nqqOASo+zHaXMTo4Q9w=; b=kyhBSN4gy3PUyffTi5eXkfh8m0cJF5srm5Z27phgGWeZR8209i06LWez7ziEuOsYkDz3wu spk0YXXdLyHaiWBA== 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: Add lock context annotations in the spinlock implementation Cc: Bart Van Assche , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260313171510.230998-4-bvanassche@acm.org> References: <20260313171510.230998-4-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: <177382096621.1647592.2828576441030845779.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: b06e988c4c52ce8750616ea9b23c8bd3b611b931 Gitweb: https://git.kernel.org/tip/b06e988c4c52ce8750616ea9b23c8bd3b= 611b931 Author: Bart Van Assche AuthorDate: Fri, 13 Mar 2026 10:15:09 -07:00 Committer: Peter Zijlstra CommitterDate: Mon, 16 Mar 2026 13:16:50 +01:00 locking: Add lock context annotations in the spinlock implementation Make the spinlock implementation compatible with lock context analysis (CONTEXT_ANALYSIS :=3D 1) by adding lock context annotations to the _raw_##op##_...() macros. Signed-off-by: Bart Van Assche Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260313171510.230998-4-bvanassche@acm.org --- kernel/locking/spinlock.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c index 7685def..b42d293 100644 --- a/kernel/locking/spinlock.c +++ b/kernel/locking/spinlock.c @@ -64,8 +64,9 @@ EXPORT_PER_CPU_SYMBOL(__mmiowb_state); * time (making _this_ CPU preemptible if possible), and we also signal * towards that other CPU that it should break the lock ASAP. */ -#define BUILD_LOCK_OPS(op, locktype) \ +#define BUILD_LOCK_OPS(op, locktype, lock_ctx_op) \ static void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ + lock_ctx_op(lock) \ { \ for (;;) { \ preempt_disable(); \ @@ -78,6 +79,7 @@ static void __lockfunc __raw_##op##_lock(locktype##_t *lo= ck) \ } \ \ static unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lo= ck) \ + lock_ctx_op(lock) \ { \ unsigned long flags; \ \ @@ -96,11 +98,13 @@ static unsigned long __lockfunc __raw_##op##_lock_irqsa= ve(locktype##_t *lock) \ } \ \ static void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ + lock_ctx_op(lock) \ { \ _raw_##op##_lock_irqsave(lock); \ } \ \ static void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ + lock_ctx_op(lock) \ { \ unsigned long flags; \ \ @@ -123,11 +127,11 @@ static void __lockfunc __raw_##op##_lock_bh(locktype#= #_t *lock) \ * __[spin|read|write]_lock_irqsave() * __[spin|read|write]_lock_bh() */ -BUILD_LOCK_OPS(spin, raw_spinlock); +BUILD_LOCK_OPS(spin, raw_spinlock, __acquires); =20 #ifndef CONFIG_PREEMPT_RT -BUILD_LOCK_OPS(read, rwlock); -BUILD_LOCK_OPS(write, rwlock); +BUILD_LOCK_OPS(read, rwlock, __acquires_shared); +BUILD_LOCK_OPS(write, rwlock, __acquires); #endif =20 #endif