From nobody Sun Nov 24 23:22:32 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 032791D47DC for ; Tue, 19 Nov 2024 23:12:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732057924; cv=none; b=SFgDMGOfIMujR2yaC5vtZEDLzXgXTh3c9auNqxUHkAUvSGt/RK/AHeYKPJ3m0HeYHauNhg9jxvJTkn7yLAarnDssQpBYvxDtBtWcbmvvs6/Devu+SBvUET1PcNsD3uhmZGgvC4q4A1Rs/kk83wNer6mLc/MqpQwd+BVOrgdH+hM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732057924; c=relaxed/simple; bh=mDrVfKm68H9Lt8M5M2TJ9UWUgDhY0gs8uSoapCQIRl8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ddBIUO4OAxGA7fpGcgyncIV4564TF2ym8zKrBc9MC1yip32HsFmqc5F8yFb+/Bh3YuHGCltMdAs0Em5ZYYhdNawjv0qRzkt61403MK1+O5d0qsP/MgH3/Tyuok1DFTiRvm1pUI13AAa0FYQGDG3qWyaBb/gCsXEQGdaV/X3/ixU= 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=NQTALvVR; arc=none smtp.client-ip=170.10.133.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="NQTALvVR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732057921; 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=irOV6jSVhz78wp4LVQsCSePNnXVEznkS8FVGwjEs6IY=; b=NQTALvVRjF3l1X8M+YvVkyCZRO/TAHtTh2SskgL7sK3OIjSlDNadnX4LS0Rg+N9QUyhWIV WGM059aeX/MVRhEHzzfzIk8ihBS7YFIpMv7P3UXs/iTYZgecisNyG7ujU7tYh6GOIcI/tN zw8Pgr+m8G2wW9I26myG5vqbJp0UHMQ= 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-608-FdhaoK23NjOZjd1XhoIAJA-1; Tue, 19 Nov 2024 18:11:57 -0500 X-MC-Unique: FdhaoK23NjOZjd1XhoIAJA-1 X-Mimecast-MFC-AGG-ID: FdhaoK23NjOZjd1XhoIAJA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 6A4081955F45; Tue, 19 Nov 2024 23:11:55 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.88.23]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A7D8C30000DF; Tue, 19 Nov 2024 23:11:52 +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 v4 1/2] rust: sync: Add Lock::from_raw() for Lock<(), B> Date: Tue, 19 Nov 2024 18:11:03 -0500 Message-ID: <20241119231146.2298971-2-lyude@redhat.com> In-Reply-To: <20241119231146.2298971-1-lyude@redhat.com> References: <20241119231146.2298971-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.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" The KMS bindings ( https://patchwork.freedesktop.org/series/131522/ ) have a few bindings that require 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 Reviewed-by: Alice Ryhl --- 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 V4: * Documentation fixes from Boqun * Reword commit message (Boqun) Signed-off-by: Lyude Paul --- rust/kernel/sync/lock.rs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index 6d3c8874eb26a..ea65f84b76f8e 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -91,6 +91,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. @@ -129,6 +130,28 @@ 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`] during + /// the whole lifetime of `'a`. + /// + /// [`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 Sun Nov 24 23:22:32 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 0F7CE1D6DD1 for ; Tue, 19 Nov 2024 23:12:06 +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=1732057928; cv=none; b=k24iJ0elefwx1mHPII3cyJTHlGwm5GgvlDm8hBKhA1pPhUPEThfEsJfI1IAzTM2qL/6Y8wWFmaZ3Gl54A98UoWKZz402CVUtGqc+3kRp1KLahFObhSnKTpRoiLHVYG3QzC4RauwZ9MNhGjq3WHyoaIMe5NwF/TwNt3X5cQ4q8z4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732057928; c=relaxed/simple; bh=gPr2XVwTvpeMGoGKKjy1o51c1OdPhbUKPI0zWGhZTCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eoRbxJS+j8z/gjo7qicXhlxtjfLkPvKP8lFBTNgaad5zAxNPApuf6RS3gPF2JI2IboQ9rhC3eMeByv3yoXd5qc+Rk7kiBkh3UGbU8blolFDRRH/FauDC/qWsXnWCP94Y+jtfcce3SooXamvrKOX8j8eFx7qHsXC3oig7g7UBOow= 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=HgKJ+45T; 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="HgKJ+45T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732057926; 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=we497OO4sE4VwaggdPe1vay+83PO5OaOAYCik3HBUv8=; b=HgKJ+45TdZKghGQVcn9BE6PaKxhM/8MfJM89olicFXWyvKvYVsF0oboiGCSRD+SPBiHSre k6ISTDp11d4mFYuUZCSzZmgEI5RTbIIZYvNr4YmDXGRA5h/BcjL0pXIOoNPOF/zy8DzeSV 5R/wfpw3J4VPh2nVfnkDIKFXFpP4qH0= Received: from mx-prod-mc-05.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-103-Ctp0QUDxNAaeQxlaH8BMmA-1; Tue, 19 Nov 2024 18:12:02 -0500 X-MC-Unique: Ctp0QUDxNAaeQxlaH8BMmA-1 X-Mimecast-MFC-AGG-ID: Ctp0QUDxNAaeQxlaH8BMmA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9B5721956088; Tue, 19 Nov 2024 23:11:58 +0000 (UTC) Received: from chopper.redhat.com (unknown [10.22.88.23]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 27ED130000DF; Tue, 19 Nov 2024 23:11:56 +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 v4 2/2] rust: sync: Make Guard::new() public Date: Tue, 19 Nov 2024 18:11:04 -0500 Message-ID: <20241119231146.2298971-3-lyude@redhat.com> In-Reply-To: <20241119231146.2298971-1-lyude@redhat.com> References: <20241119231146.2298971-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.4.1 on 10.30.177.4 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 --- 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 ea65f84b76f8e..139f17f2ec86b 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -229,7 +229,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