From nobody Mon Nov 25 00:21:45 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 D2BD31CC8AF for ; Thu, 31 Oct 2024 23:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730416244; cv=none; b=Qt0WsEOD6M73Wc75SQw7u99Hp/My22qgvPdknjApXiFZFTmxBulBtCbpbdifWEwUH+r+FPhgx6qdRsGXW9B2vRTRjKg5l4/8T9qhZU1Y6K9NIs3il0UYr7VppZM7WfrewLWVWaEdRkSliEgy9Zk9yAeG78klqeIuLH4KyhHeY2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730416244; c=relaxed/simple; bh=69kvWKlD1ljOOxc/Rkv1VEHjR2Fv0Qive7nBgZf9sY8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pHZSGjbgR3Wg6iwWHYjrFhh74Zlob2k1gIN9AP7qht05V3Zcl4Z8QbaXQvfWRNPpsnp/Sn4S5g2PGnK7DwRUlYgHJFGROhT48ZlX9X3nigONFMKrdjPo/qUh3KUcKAWF1NqT+pJZcX7QSQAoe7KOGNCWDn59yJzX9M8nxoyoNQw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=H7EziEK0; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H7EziEK0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730416237; 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; bh=FYmU1GYrdZKJraLw100LERJyFohB8EFrmmyYd49xywA=; b=H7EziEK0yWK8OF547nzrQ9t9uCb0F5qld1V+M13ZlE/RCpBY61IGCYuY5ljVdaYb2PenBe Gog++07mBwq/dsQ9Ktjua99dVd5xsSaO7/GFcKMwv3FO8mvP7iDsBSnUvb2tfbjEVR1Hct lZtvNSOQvvt5aKFvvEQigvoTV7285ow= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-wdCnbxWQNI6AryepPlmDbQ-1; Thu, 31 Oct 2024 19:10:36 -0400 X-MC-Unique: wdCnbxWQNI6AryepPlmDbQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 36B5819560B7; Thu, 31 Oct 2024 23:10:34 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.88.202]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C8E931956052; Thu, 31 Oct 2024 23:10:30 +0000 (UTC) From: Lyude Paul To: rust-for-linux@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Martin Rodriguez Reboredo , Valentin Obst , Filipe Xavier Subject: [PATCH v3 1/2] rust: sync: Add Lock::from_raw() for Lock<(), B> Date: Thu, 31 Oct 2024 19:08:44 -0400 Message-ID: <20241031231025.3466571-2-lyude@redhat.com> In-Reply-To: <20241031231025.3466571-1-lyude@redhat.com> References: <20241031231025.3466571-1-lyude@redhat.com> 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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" A few of the APIs I've been writing bindings for (KMS in particular) rely on the user manually acquiring specific locks before calling certain functions. At the moment though, the only way of acquiring these locks in bindings is to simply call the C locking functions directly - since said locks are not acquired on the rust side of things. However - if we add `#[repr(C)]` to `Lock<(), B>`, then given `()` is a ZST - `Lock<(), B>` becomes equivalent in data layout to its inner `B::State` type. Since locks in C don't have data explicitly associated with them anyway, we can take advantage of this to add a `Lock::from_raw()` function that can translate a raw pointer to `B::State` into its proper `Lock<(), B>` equivalent. This lets us simply acquire a reference to the lock in question and work with it like it was initialized on the rust side of things, allowing us to use less unsafe code to implement bindings with lock requirements. Signed-off-by: Lyude Paul --- V2: * Don't implement this for all ZST types, just implement it for () V3: * Get rid of some unused imports * Make sure that we run rustfmt Signed-off-by: Lyude Paul --- rust/kernel/sync/lock.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index 90cc5416529bd..c7b0c6351f793 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -88,6 +88,7 @@ unsafe fn relock(ptr: *mut Self::State, guard_state: &mut= Self::GuardState) { /// /// Exposes one of the kernel locking primitives. Which one is exposed dep= ends on the lock /// [`Backend`] specified as the generic parameter `B`. +#[repr(C)] #[pin_data] pub struct Lock { /// The kernel lock object. @@ -126,6 +127,27 @@ pub fn new(t: T, name: &'static CStr, key: &'static Lo= ckClassKey) -> impl PinIni } } =20 +impl Lock<(), B> { + /// Constructs a [`Lock`] from a raw pointer. + /// + /// This can be useful for interacting with a lock which was initialis= ed outside of rust. + /// + /// # Safety + /// + /// The caller promises that `ptr` points to a valid initialised insta= nce of [`State`]. + /// + /// [`State`]: Backend::State + pub unsafe fn from_raw<'a>(ptr: *mut B::State) -> &'a Self { + // SAFETY: + // * By the safety contract `ptr` must point to a valid initialise= d instance of `B::State` + // * Since the lock data type is `()` which is a ZST, `state` is t= he only non-ZST member of + // the struct + // * Combined with `#[repr(C)]`, this guarantees `Self` has an equ= ivalent data layout to + // `B::State`. + unsafe { &*ptr.cast() } + } +} + impl Lock { /// Acquires the lock and gives the caller access to the data protecte= d by it. pub fn lock(&self) -> Guard<'_, T, B> { --=20 2.47.0 From nobody Mon Nov 25 00:21:45 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 36D4D1E2829 for ; Thu, 31 Oct 2024 23:10:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730416250; cv=none; b=MOPf44Y/Q/XMxosV0TOVjLe8r3crv/nulMxTCCaPfOdMfvKaLZ7g69fcEFPPgCxICK7IFrugFC0F34LP7D5+erkQenzWUGizcGQQ/s5bWg/CHk7OTY+rR2LbT4glRT0e5sBWgwRgXpYe52UZA93PTBeMEe740kyNvamFXf/77zU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730416250; c=relaxed/simple; bh=lAb+KoAdQ87cofb05ltyd5UIDk8kT+Z5t0DWa4dPvI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XgP6XB6ePsAcuG6HM8Vd44vRrMrup7B1Y34ksyMIeylC55BlGP37LxvggexqFlORWl+Is05nZaRJPKb687Q2NbDZeyVxBjDSz5jjWajxMWuO/C3GxFo1REojL6zpkX448Dzb0SXRtbCvSOAbmoGNCU+pYsn2yp7H4D3KjGT2+XQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YhEuwGSn; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YhEuwGSn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730416243; 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; bh=/DZnsYyIg0Og+DO16uL+SmlJ8+QeUunLJYMjB8ZHgwo=; b=YhEuwGSnbQuAhf9l4/nidqCRUuyR1CvNfP+XAJb5BezDwzi8kMvAAO6A0Eb4Xb1rMtDTz+ Y/98ao6JSL1EWmpRUYWgo8Lmg64KotzORnp2cBfrTvnqeI4+jBXPn8o8gtD8uciVTNl/A3 FXhhTs3b+AcFgJAFGe1LdEyUziPoQEU= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-CcWf5aMIOQihoeTAbhAwvA-1; Thu, 31 Oct 2024 19:10:40 -0400 X-MC-Unique: CcWf5aMIOQihoeTAbhAwvA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2716219560B1; Thu, 31 Oct 2024 23:10:38 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.88.202]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0DE8F1956052; Thu, 31 Oct 2024 23:10:34 +0000 (UTC) From: Lyude Paul To: rust-for-linux@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Martin Rodriguez Reboredo , Valentin Obst , Filipe Xavier Subject: [PATCH v3 2/2] rust: sync: Make Guard::new() public Date: Thu, 31 Oct 2024 19:08:45 -0400 Message-ID: <20241031231025.3466571-3-lyude@redhat.com> In-Reply-To: <20241031231025.3466571-1-lyude@redhat.com> References: <20241031231025.3466571-1-lyude@redhat.com> 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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Since we added a Lock::from_raw() function previously, it makes sense to also introduce an interface for creating a Guard from a reference to a Lock for instances where we've derived the Lock from a raw pointer and know that the lock is already acquired, something we do in the KMS API. Signed-off-by: Lyude Paul Reviewed-by: Alice Ryhl --- rust/kernel/sync/lock.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index c7b0c6351f793..4d6d5e00ca334 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -225,7 +225,7 @@ impl<'a, T: ?Sized, B: Backend> Guard<'a, T, B> { /// # Safety /// /// The caller must ensure that it owns the lock. - pub(crate) unsafe fn new(lock: &'a Lock, state: B::GuardState) -= > Self { + pub unsafe fn new(lock: &'a Lock, state: B::GuardState) -> Self { Self { lock, state, --=20 2.47.0