From nobody Fri Apr 3 06:27:16 2026 Received: from bumble.maple.relay.mailchannels.net (bumble.maple.relay.mailchannels.net [23.83.214.25]) (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 CAB773783D0 for ; Tue, 17 Feb 2026 19:54:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=23.83.214.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771358059; cv=pass; b=MgkZw4BBTNwD7TNXZlEOKM5HF7kV/EOO5/OhuRR3KliFT88MZxMylLFRJ01KlRNawy4X+azJEo/wPh0XQsc3Bt/D52xlIHq0HexcJ0vg02FIHC2c3u2hELCHPgEvOEjinfyD2DIp4dxno86KWBjycBLUtPaclA71iHqgWZFY+IA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771358059; c=relaxed/simple; bh=84mNvt5bXXYZGqiCIoHJrFE4aRR/zRfvncjA0eebkE8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JvrybRxELvpHL3wmM9L+dlvNX7Cv2Z56bSnsJKVGq9RMijbyMC304jSaPOPhmwN2Pa9dB1VcXHvuJMqLnULbhOGjO8DB36HxwMgbk4Iw9kKDA7vCY1GIh7EDSR/VXJH8ZoL4yiZ7HzqmPBbusFM/7DK1/0Spj0e+6l+EDYh9IA4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net; spf=fail smtp.mailfrom=stgolabs.net; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b=BQVV2c67; arc=pass smtp.client-ip=23.83.214.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b="BQVV2c67" X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 6BE806C22A0; Tue, 17 Feb 2026 19:15:40 +0000 (UTC) Received: from pdx1-sub0-mail-a240.dreamhost.com (trex-green-1.trex.outbound.svc.cluster.local [100.103.28.163]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 104446C2155; Tue, 17 Feb 2026 19:15:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; d=mailchannels.net; s=arc-2022; cv=none; t=1771355740; b=wUuGq/8326nEEC8HyyBjMEkwJjGNO3m5FPWMuHIlitZfeqXmctWgegYjH2ZJxHKxhXxgsX 6mA8Tvl8V1XTNCdOPa1RFBJkhN10gBzAnndJcvcl8RkmlUcUjXLG3vMKnOhoc/VuA50Kjd 3N3gIHrLjcEaoosiT+DlUULa3/R/at0O0Ukn8TwTJoEIDuxlHtogrbTF7lDtMrjtlV6OsA OTO60OrFn9cXII2UOOad1bWDzWEliDc5WuMUk0cuWBjtUXcCZBc0oD0qmI5mjse0hENNrS kdsMyxhHLhARSMFc10jujpza4Qz9AORNHZAZWopw3DY7+pSURCh19rB335h0MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1771355740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eoxBXsuurGNQ13++gPTFpc67QWL2GWsdgiph3COER0M=; b=dkvV7ksgVmBtBS7kmKQJnUMO/ybQa+aAQKZHD7Ky9N2BvGR+RXKFf+LTn9rYAT81Rw/vCC ICGrzrHCZIUN4NxvoJeZDOxUDBZjvyZmfvSUzZYKel1xAawN3lf137g6B22kfgfy1iRZk6 qyRw5vOwQbZaX5RJt/iX+DcKgqjgALvjcNSZdF+me6PSB3TWbpu6+DegPVeF9Srq464Z+i JrLAWeExahXNK+NNr2zFrdiSnplzkYq8WWYeODVf8JbpPb1GHSMjq70//p+hfg/qZWzzVS 76rvXLkx9qw/HaMHe9O/XYG9gwcyAwmXAj5GmAfknQKqRbovvMtoFrsn6JNNGg== ARC-Authentication-Results: i=1; rspamd-84c84ff4fc-shct4; auth=pass smtp.auth=dreamhost smtp.mailfrom=dave@stgolabs.net X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Descriptive-Scare: 0e68631573cbe8d3_1771355740348_3208682669 X-MC-Loop-Signature: 1771355740348:4196044467 X-MC-Ingress-Time: 1771355740347 Received: from pdx1-sub0-mail-a240.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.103.28.163 (trex/7.1.3); Tue, 17 Feb 2026 19:15:40 +0000 Received: from offworld.lan (unknown [76.167.199.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a240.dreamhost.com (Postfix) with ESMTPSA id 4fFq9Q4lpTz107J; Tue, 17 Feb 2026 11:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1771355739; bh=eoxBXsuurGNQ13++gPTFpc67QWL2GWsdgiph3COER0M=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=BQVV2c67syg8iZOwfizKe6Ap+6aHNW7m0rpOS5EVzYEGxeKrTqjpOxZ/OFACCFmbi y3UMKgullrDCGz9d8uCZWnRc+XHtDPY5ZBqgdbrTGwtPUtXHiM6KPwx3+p+4RYh0ZG DP3wiLDX9UoSANtVSRQGrbdu4inxI4UnbriZyrr7+irQEQwfbqmFQcNO3rmHgcGXoc H6jxd+N28EGzrBtqcFfJK9JQtBLLIe3wBLbTtDeOfY6OvKUZbFyV9TfCtBiB4ZL/b4 ZoWawjl5HI60a4wSL65BHltYcxRdYhQPXT2rhTh8gImrYlsVYPoq6dSF9oDfOttI59 oExdN9oJWYcNA== From: Davidlohr Bueso To: peterz@infradead.org, mingo@kernel.org Cc: bigeasy@linutronix.de, longman@redhat.com, boqun@kernel.org, will@kernel.org, linux-kernel@vger.kernel.org, Davidlohr Bueso Subject: [PATCH 3/3] locking/mutex: Add killable flavor to guard definitions Date: Tue, 17 Feb 2026 11:15:12 -0800 Message-Id: <20260217191512.1180151-4-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260217191512.1180151-1-dave@stgolabs.net> References: <20260217191512.1180151-1-dave@stgolabs.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mutex guard family defines _try and _intr variants but is missing the killable one. Signed-off-by: Davidlohr Bueso --- include/linux/mutex.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/mutex.h b/include/linux/mutex.h index f57d2a97da57..2f648ee204e7 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -253,6 +253,7 @@ extern int atomic_dec_and_mutex_lock(atomic_t *cnt, str= uct mutex *lock) __cond_a DEFINE_LOCK_GUARD_1(mutex, struct mutex, mutex_lock(_T->lock), mutex_unloc= k(_T->lock)) DEFINE_LOCK_GUARD_1_COND(mutex, _try, mutex_trylock(_T->lock)) DEFINE_LOCK_GUARD_1_COND(mutex, _intr, mutex_lock_interruptible(_T->lock),= _RET =3D=3D 0) +DEFINE_LOCK_GUARD_1_COND(mutex, _kill, mutex_lock_killable(_T->lock), _RET= =3D=3D 0) DEFINE_LOCK_GUARD_1(mutex_init, struct mutex, mutex_init(_T->lock), /* */) =20 DECLARE_LOCK_GUARD_1_ATTRS(mutex, __acquires(_T), __releases(*(struct mute= x **)_T)) @@ -261,6 +262,8 @@ DECLARE_LOCK_GUARD_1_ATTRS(mutex_try, __acquires(_T), _= _releases(*(struct mutex #define class_mutex_try_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(mutex_try,= _T) DECLARE_LOCK_GUARD_1_ATTRS(mutex_intr, __acquires(_T), __releases(*(struct= mutex **)_T)) #define class_mutex_intr_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(mutex_int= r, _T) +DECLARE_LOCK_GUARD_1_ATTRS(mutex_kill, __acquires(_T), __releases(*(struct= mutex **)_T)) +#define class_mutex_kill_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(mutex_kil= l, _T) DECLARE_LOCK_GUARD_1_ATTRS(mutex_init, __acquires(_T), __releases(*(struct= mutex **)_T)) #define class_mutex_init_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(mutex_ini= t, _T) =20 --=20 2.39.5