Message ID | 20221228060346.352362-1-wedsonaf@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1738383wrt; Tue, 27 Dec 2022 22:05:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXswyRoYN/nK+VCFclmt6Lv1cKNlQGX6JiwI3S3xboY55XnN7MxN/zKjFt03QbXyKK7L4AKA X-Received: by 2002:a17:90a:244:b0:219:94b2:78a with SMTP id t4-20020a17090a024400b0021994b2078amr26647114pje.30.1672207508496; Tue, 27 Dec 2022 22:05:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672207508; cv=none; d=google.com; s=arc-20160816; b=GHNwel6eUA/UzEQNlR8vCKEwrZhthkQNU5ooeKEKB2+PuitgllSm7ejILPtwO7b5Mq CW1JnkkSL3rzmy/SrzV+qsqknNW+Xlp7+s9s6iQsd56EgREoiEwEY5uVSHbycjWPIyew W5qGJsNYyB9s+6n/77eOn0Z8/I5VsuMTjWznQFHNNPSiuySCqFUsvnCb+HVpgUfLeC2Q ScHJWWRTCq8MvBHQR6p1fsT6e5s0hzQsy/QlLqHji8rJ11fxUv8EvbWSYYZ3aAgAaODZ z3ch1VlBS6KbY/JtIiraxRsQ+ka1eLqpFWa75ZaO5zaqqgQKSHHiQEpFd7TYQAARZ1Xk u6sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gRIFFRiWtKhehgMZp5r2SWnueOlS4dTgUKCwXFukHZk=; b=uzXOyeittvUf9D+nJI5lPdrTjndDstPTR29D/EaNAnw98TqHNBWultA81YGZdXYjRi SwQlbQ6LFztkLa878B7UJ9T319srwyl5+KB0eB+h9Nshna4LHZZWllvwlBOUM+szYTHZ oSxPnkBmOyG9a3+hzIC1szMC2gliW47sHZlTkecvQ9zjJqSAoRVxy6Xpso2wmhV86bHH 295h7MPJvfEtlXjoC7xEojH7JHKyWFhu4J9ytStUkEAPr5I4vCELXkF/U7sW90i6Yw/T kph63V8+upSXSXIaI8/FdrOg+kBrOoui8qzksF+WpU1PRTH36wBAtf8TO41Vf14G2TEe hRjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AphQNvib; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ls10-20020a17090b350a00b002192a6c09d5si11420999pjb.10.2022.12.27.22.04.56; Tue, 27 Dec 2022 22:05:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AphQNvib; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbiL1GEo (ORCPT <rfc822;eddaouddi.ayoub@gmail.com> + 99 others); Wed, 28 Dec 2022 01:04:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbiL1GEi (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 28 Dec 2022 01:04:38 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01337DEFD; Tue, 27 Dec 2022 22:04:36 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id h16so14046839wrz.12; Tue, 27 Dec 2022 22:04:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gRIFFRiWtKhehgMZp5r2SWnueOlS4dTgUKCwXFukHZk=; b=AphQNvib3d7n3b7NiAUKifYkeUSItHpgkIzA5zXVf6T64S2O/FLo2wG2knvFLrtvr5 3jx+RIDnT8Eko3zxpuxKn+6c4jCPWpIUpy0ga49EGt4C9clKJACj6GBihfHFbCCH1I1F 2+I+VfT6RDAu0UmGn8gDxB9+xcEUoFY5FekqUtZ+bJpF2rIt2IOc642gBuMAezKwp3L1 0Wh8L4Cm3N34GHg6PP4qt2nNan9jDkNQOd22RCcQ88DQBaOjR6EShT48ya2FKIB9bOWi TZulVhLvzAbhv8hVE7kZbesL+ORkY3EQc1UruKPTKlyEO/MmjV3FirFOtAAOPoHbkCYN uYOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gRIFFRiWtKhehgMZp5r2SWnueOlS4dTgUKCwXFukHZk=; b=tlHWyI4E6zHjnx667fLmO7Nim3GhI+Kk6N+7t9Um11nqplqdYKS/IyOEvHaeFPWfnP clNiAstY9B6VBn5iNPk8uFlzUq8WsSoj4y/Umx1DVMOh6yqrTy0by4lL1iF6VAu5LToe 1/F4FPz6wVws4hb+N7Ch4WHv81gudTOj85doO9CtntwBkQ7jGyZMU92y19t8KNmeUpY0 +yn5cf2jipBPf5cqQfDQ72fLGBbS+5jUlyJIh3DMRNw8srnQLS7lyuvU/MuWrSraLTN1 RujZjzj3qfvIjsP+c/d+LeHGf3ClWWvynzqTweNnOTTfjELYwoRAzlgqmYfJQivduc6F 1Pow== X-Gm-Message-State: AFqh2kpHjEkB3RxVIkGTOI/c3HXBCtVGhof/Bs1bG9wisoOR2o/UZ5N2 wt+f+ixL3GWME8rO8KwHz9kULaOv0fQcxg== X-Received: by 2002:a5d:6104:0:b0:280:cc12:286d with SMTP id v4-20020a5d6104000000b00280cc12286dmr4105974wrt.67.1672207475343; Tue, 27 Dec 2022 22:04:35 -0800 (PST) Received: from wedsonaf-dev.. ([81.2.152.129]) by smtp.googlemail.com with ESMTPSA id x16-20020a5d6510000000b002755e301eeasm12128867wru.100.2022.12.27.22.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 22:04:34 -0800 (PST) From: Wedson Almeida Filho <wedsonaf@gmail.com> To: rust-for-linux@vger.kernel.org Cc: Miguel Ojeda <ojeda@kernel.org>, Alex Gaynor <alex.gaynor@gmail.com>, Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>, =?utf-8?q?B?= =?utf-8?q?j=C3=B6rn_Roy_Baron?= <bjorn3_gh@protonmail.com>, linux-kernel@vger.kernel.org, Wedson Almeida Filho <wedsonaf@gmail.com>, Will Deacon <will@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Mark Rutland <mark.rutland@arm.com> Subject: [PATCH 1/7] rust: sync: add `Arc` for ref-counted allocations Date: Wed, 28 Dec 2022 06:03:40 +0000 Message-Id: <20221228060346.352362-1-wedsonaf@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753436660353771432?= X-GMAIL-MSGID: =?utf-8?q?1753436660353771432?= |
Series |
[1/7] rust: sync: add `Arc` for ref-counted allocations
|
|
Commit Message
Wedson Almeida Filho
Dec. 28, 2022, 6:03 a.m. UTC
This is a basic implementation of `Arc` backed by C's `refcount_t`. It
allows Rust code to idiomatically allocate memory that is ref-counted.
Cc: Will Deacon <will@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com>
---
rust/bindings/bindings_helper.h | 1 +
rust/bindings/lib.rs | 1 +
rust/helpers.c | 19 ++++
rust/kernel/lib.rs | 1 +
rust/kernel/sync.rs | 10 ++
rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++
6 files changed, 189 insertions(+)
create mode 100644 rust/kernel/sync.rs
create mode 100644 rust/kernel/sync/arc.rs
Comments
On Dec 27, 2022, at 10:03 PM, Wedson Almeida Filho <wedsonaf@gmail.com> wrote: > > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > allows Rust code to idiomatically allocate memory that is ref-counted. > > Cc: Will Deacon <will@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Boqun Feng <boqun.feng@gmail.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> > --- > rust/bindings/bindings_helper.h | 1 + > rust/bindings/lib.rs | 1 + > rust/helpers.c | 19 ++++ > rust/kernel/lib.rs | 1 + > rust/kernel/sync.rs | 10 ++ > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > 6 files changed, 189 insertions(+) > create mode 100644 rust/kernel/sync.rs > create mode 100644 rust/kernel/sync/arc.rs > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > index c48bc284214a..75d85bd6c592 100644 > --- a/rust/bindings/bindings_helper.h > +++ b/rust/bindings/bindings_helper.h > @@ -7,6 +7,7 @@ > */ > > #include <linux/slab.h> > +#include <linux/refcount.h> > > /* `bindgen` gets confused at certain things. */ > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > index 6c50ee62c56b..7b246454e009 100644 > --- a/rust/bindings/lib.rs > +++ b/rust/bindings/lib.rs > @@ -41,6 +41,7 @@ mod bindings_raw { > #[allow(dead_code)] > mod bindings_helper { > // Import the generated bindings for types. > + use super::bindings_raw::*; > include!(concat!( > env!("OBJTREE"), > "/rust/bindings/bindings_helpers_generated.rs" > diff --git a/rust/helpers.c b/rust/helpers.c > index b4f15eee2ffd..09a4d93f9d62 100644 > --- a/rust/helpers.c > +++ b/rust/helpers.c > @@ -20,6 +20,7 @@ > > #include <linux/bug.h> > #include <linux/build_bug.h> > +#include <linux/refcount.h> > > __noreturn void rust_helper_BUG(void) > { > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > } > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > +{ > + return (refcount_t)REFCOUNT_INIT(n); > +} > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > + > +void rust_helper_refcount_inc(refcount_t *r) > +{ > + refcount_inc(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > + > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > +{ > + return refcount_dec_and_test(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > + > /* > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > * as the Rust `usize` type, so we can use it in contexts where Rust > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > index 53040fa9e897..ace064a3702a 100644 > --- a/rust/kernel/lib.rs > +++ b/rust/kernel/lib.rs > @@ -31,6 +31,7 @@ mod static_assert; > #[doc(hidden)] > pub mod std_vendor; > pub mod str; > +pub mod sync; > pub mod types; > > #[doc(hidden)] > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > new file mode 100644 > index 000000000000..39b379dd548f > --- /dev/null > +++ b/rust/kernel/sync.rs > @@ -0,0 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! Synchronisation primitives. > +//! > +//! This module contains the kernel APIs related to synchronisation that have been ported or > +//! wrapped for usage by Rust code in the kernel. > + > +mod arc; > + > +pub use arc::Arc; > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > new file mode 100644 > index 000000000000..22290eb5ab9b > --- /dev/null > +++ b/rust/kernel/sync/arc.rs > @@ -0,0 +1,157 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! A reference-counted pointer. > +//! > +//! This module implements a way for users to create reference-counted objects and pointers to > +//! them. Such a pointer automatically increments and decrements the count, and drops the > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > +//! threads. > +//! > +//! It is different from the standard library's [`Arc`] in a few ways: > +//! 1. It is backed by the kernel's `refcount_t` type. > +//! 2. It does not support weak references, which allows it to be half the size. > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. This makes me worry, and the rest of the code confirms it. This is not a safe abstraction: what happens if the count saturates and then everything is dropped again? The count “goes negative” (which is to say, use-after-free). > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > +//! > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > + > +use crate::{bindings, error::Result, types::Opaque}; > +use alloc::boxed::Box; > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > + > +/// A reference-counted pointer to an instance of `T`. > +/// > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > +/// > +/// # Invariants > +/// > +/// The reference count on an instance of [`Arc`] is always non-zero. > +/// The object pointed to by [`Arc`] is always pinned. > +/// > +/// # Examples > +/// > +/// ``` > +/// use kernel::sync::Arc; > +/// > +/// struct Example { > +/// a: u32, > +/// b: u32, > +/// } > +/// > +/// // Create a ref-counted instance of `Example`. > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > +/// > +/// // Get a new pointer to `obj` and increment the refcount. > +/// let cloned = obj.clone(); > +/// > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > +/// > +/// // Destroy `obj` and decrement its refcount. > +/// drop(obj); > +/// > +/// // Check that the values are still accessible through `cloned`. > +/// assert_eq!(cloned.a, 10); > +/// assert_eq!(cloned.b, 20); > +/// > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > +/// ``` > +pub struct Arc<T: ?Sized> { > + ptr: NonNull<ArcInner<T>>, > + _p: PhantomData<ArcInner<T>>, > +} > + > +#[repr(C)] > +struct ArcInner<T: ?Sized> { > + refcount: Opaque<bindings::refcount_t>, > + data: T, > +} > + > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > +// example, when the reference count reaches zero and `T` is dropped. > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > + > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > + > +impl<T> Arc<T> { > + /// Constructs a new reference counted instance of `T`. > + pub fn try_new(contents: T) -> Result<Self> { > + // INVARIANT: The refcount is initialised to a non-zero value. > + let value = ArcInner { > + // SAFETY: There are no safety requirements for this FFI call. > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > + data: contents, > + }; > + > + let inner = Box::try_new(value)?; > + > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > + // `Arc` object. > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > + } > +} > + > +impl<T: ?Sized> Arc<T> { > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > + /// > + /// # Safety > + /// > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > + /// count, one of which will be owned by the new [`Arc`] instance. > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > + // INVARIANT: By the safety requirements, the invariants hold. > + Arc { > + ptr: inner, > + _p: PhantomData, > + } > + } > +} > + > +impl<T: ?Sized> Deref for Arc<T> { > + type Target = T; > + > + fn deref(&self) -> &Self::Target { > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to dereference it. > + unsafe { &self.ptr.as_ref().data } > + } > +} > + > +impl<T: ?Sized> Clone for Arc<T> { > + fn clone(&self) -> Self { > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to increment the refcount. > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; This needs to be a fallible process; maybe provide a try_clone inherent method instead of the trait impl. It’s not worth the “convenience” to have something that can break safety (see above). There is a reason for the original one panicking here! > + > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > + unsafe { Self::from_inner(self.ptr) } > + } > +} > + > +impl<T: ?Sized> Drop for Arc<T> { > + fn drop(&mut self) { > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > + // freed/invalid memory as long as it is never dereferenced. > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > + > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > + // this instance is being dropped, so the broken invariant is not observable. > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > + if is_zero { > + // The count reached zero, we must free the memory. > + // > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > + } > + } > +} > -- > 2.34.1 > >
On Tue, Dec 27, 2022 at 11:09:57PM -0800, Laine Taffin Altman wrote: > On Dec 27, 2022, at 10:03 PM, Wedson Almeida Filho <wedsonaf@gmail.com> wrote: > > > > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > > allows Rust code to idiomatically allocate memory that is ref-counted. > > > > Cc: Will Deacon <will@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Cc: Boqun Feng <boqun.feng@gmail.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> > > --- > > rust/bindings/bindings_helper.h | 1 + > > rust/bindings/lib.rs | 1 + > > rust/helpers.c | 19 ++++ > > rust/kernel/lib.rs | 1 + > > rust/kernel/sync.rs | 10 ++ > > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > > 6 files changed, 189 insertions(+) > > create mode 100644 rust/kernel/sync.rs > > create mode 100644 rust/kernel/sync/arc.rs > > > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > > index c48bc284214a..75d85bd6c592 100644 > > --- a/rust/bindings/bindings_helper.h > > +++ b/rust/bindings/bindings_helper.h > > @@ -7,6 +7,7 @@ > > */ > > > > #include <linux/slab.h> > > +#include <linux/refcount.h> > > > > /* `bindgen` gets confused at certain things. */ > > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > > index 6c50ee62c56b..7b246454e009 100644 > > --- a/rust/bindings/lib.rs > > +++ b/rust/bindings/lib.rs > > @@ -41,6 +41,7 @@ mod bindings_raw { > > #[allow(dead_code)] > > mod bindings_helper { > > // Import the generated bindings for types. > > + use super::bindings_raw::*; > > include!(concat!( > > env!("OBJTREE"), > > "/rust/bindings/bindings_helpers_generated.rs" > > diff --git a/rust/helpers.c b/rust/helpers.c > > index b4f15eee2ffd..09a4d93f9d62 100644 > > --- a/rust/helpers.c > > +++ b/rust/helpers.c > > @@ -20,6 +20,7 @@ > > > > #include <linux/bug.h> > > #include <linux/build_bug.h> > > +#include <linux/refcount.h> > > > > __noreturn void rust_helper_BUG(void) > > { > > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > > } > > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > > +{ > > + return (refcount_t)REFCOUNT_INIT(n); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > > + > > +void rust_helper_refcount_inc(refcount_t *r) > > +{ > > + refcount_inc(r); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > > + > > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > > +{ > > + return refcount_dec_and_test(r); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > > + > > /* > > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > > * as the Rust `usize` type, so we can use it in contexts where Rust > > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > > index 53040fa9e897..ace064a3702a 100644 > > --- a/rust/kernel/lib.rs > > +++ b/rust/kernel/lib.rs > > @@ -31,6 +31,7 @@ mod static_assert; > > #[doc(hidden)] > > pub mod std_vendor; > > pub mod str; > > +pub mod sync; > > pub mod types; > > > > #[doc(hidden)] > > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > > new file mode 100644 > > index 000000000000..39b379dd548f > > --- /dev/null > > +++ b/rust/kernel/sync.rs > > @@ -0,0 +1,10 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > + > > +//! Synchronisation primitives. > > +//! > > +//! This module contains the kernel APIs related to synchronisation that have been ported or > > +//! wrapped for usage by Rust code in the kernel. > > + > > +mod arc; > > + > > +pub use arc::Arc; > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > > new file mode 100644 > > index 000000000000..22290eb5ab9b > > --- /dev/null > > +++ b/rust/kernel/sync/arc.rs > > @@ -0,0 +1,157 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > + > > +//! A reference-counted pointer. > > +//! > > +//! This module implements a way for users to create reference-counted objects and pointers to > > +//! them. Such a pointer automatically increments and decrements the count, and drops the > > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > > +//! threads. > > +//! > > +//! It is different from the standard library's [`Arc`] in a few ways: > > +//! 1. It is backed by the kernel's `refcount_t` type. > > +//! 2. It does not support weak references, which allows it to be half the size. > > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. > > This makes me worry, and the rest of the code confirms it. This is not a safe abstraction: what happens if the count saturates and then everything is dropped again? The count “goes negative” (which is to say, use-after-free). Are you familiar with how refcount_t is implemented? Once the counter saturates, it stays stuck in this saturated state. There is no user-after-free. > > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > > +//! > > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > > + > > +use crate::{bindings, error::Result, types::Opaque}; > > +use alloc::boxed::Box; > > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > > + > > +/// A reference-counted pointer to an instance of `T`. > > +/// > > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > > +/// > > +/// # Invariants > > +/// > > +/// The reference count on an instance of [`Arc`] is always non-zero. > > +/// The object pointed to by [`Arc`] is always pinned. > > +/// > > +/// # Examples > > +/// > > +/// ``` > > +/// use kernel::sync::Arc; > > +/// > > +/// struct Example { > > +/// a: u32, > > +/// b: u32, > > +/// } > > +/// > > +/// // Create a ref-counted instance of `Example`. > > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > > +/// > > +/// // Get a new pointer to `obj` and increment the refcount. > > +/// let cloned = obj.clone(); > > +/// > > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > > +/// > > +/// // Destroy `obj` and decrement its refcount. > > +/// drop(obj); > > +/// > > +/// // Check that the values are still accessible through `cloned`. > > +/// assert_eq!(cloned.a, 10); > > +/// assert_eq!(cloned.b, 20); > > +/// > > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > > +/// ``` > > +pub struct Arc<T: ?Sized> { > > + ptr: NonNull<ArcInner<T>>, > > + _p: PhantomData<ArcInner<T>>, > > +} > > + > > +#[repr(C)] > > +struct ArcInner<T: ?Sized> { > > + refcount: Opaque<bindings::refcount_t>, > > + data: T, > > +} > > + > > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > > +// example, when the reference count reaches zero and `T` is dropped. > > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > > + > > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > > + > > +impl<T> Arc<T> { > > + /// Constructs a new reference counted instance of `T`. > > + pub fn try_new(contents: T) -> Result<Self> { > > + // INVARIANT: The refcount is initialised to a non-zero value. > > + let value = ArcInner { > > + // SAFETY: There are no safety requirements for this FFI call. > > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > > + data: contents, > > + }; > > + > > + let inner = Box::try_new(value)?; > > + > > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > > + // `Arc` object. > > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > > + } > > +} > > + > > +impl<T: ?Sized> Arc<T> { > > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > > + /// > > + /// # Safety > > + /// > > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > > + /// count, one of which will be owned by the new [`Arc`] instance. > > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > > + // INVARIANT: By the safety requirements, the invariants hold. > > + Arc { > > + ptr: inner, > > + _p: PhantomData, > > + } > > + } > > +} > > + > > +impl<T: ?Sized> Deref for Arc<T> { > > + type Target = T; > > + > > + fn deref(&self) -> &Self::Target { > > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > > + // safe to dereference it. > > + unsafe { &self.ptr.as_ref().data } > > + } > > +} > > + > > +impl<T: ?Sized> Clone for Arc<T> { > > + fn clone(&self) -> Self { > > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > > + // safe to increment the refcount. > > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; > > This needs to be a fallible process; maybe provide a try_clone inherent method instead of the trait impl. It’s not worth the “convenience” to have something that can break safety (see above). There is a reason for the original one panicking here! Thanks for your input, but I'm afraid your lack of familiarity with refcount_t is clouding your judgement. May I suggest that you read the comments at the top of refcount.h? > > > + > > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > > + unsafe { Self::from_inner(self.ptr) } > > + } > > +} > > + > > +impl<T: ?Sized> Drop for Arc<T> { > > + fn drop(&mut self) { > > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > > + // freed/invalid memory as long as it is never dereferenced. > > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > > + > > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > > + // this instance is being dropped, so the broken invariant is not observable. > > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > > + if is_zero { > > + // The count reached zero, we must free the memory. > > + // > > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > > + } > > + } > > +} > > -- > > 2.34.1 > > > > >
On Dec 27, 2022, at 11:27 PM, Wedson Almeida Filho <wedsonaf@gmail.com> wrote: > > I suggest that you read the > comments at the top of refcount.h? Thank you for correcting me! You’re absolutely right, and I completely misunderstood how `refcount_t` works. Sorry for the noise! I retract my comments on those two patches (the other two comments are unrelated). — Laine Taffin Altman
On 12/28/22 07:03, Wedson Almeida Filho wrote: > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > allows Rust code to idiomatically allocate memory that is ref-counted. > > Cc: Will Deacon <will@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Boqun Feng <boqun.feng@gmail.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Instead of Box::leak, it would be more idiomatic to use Box::into_raw, but both approaches will work. Regards, Alice Ryhl > --- > rust/bindings/bindings_helper.h | 1 + > rust/bindings/lib.rs | 1 + > rust/helpers.c | 19 ++++ > rust/kernel/lib.rs | 1 + > rust/kernel/sync.rs | 10 ++ > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > 6 files changed, 189 insertions(+) > create mode 100644 rust/kernel/sync.rs > create mode 100644 rust/kernel/sync/arc.rs > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > index c48bc284214a..75d85bd6c592 100644 > --- a/rust/bindings/bindings_helper.h > +++ b/rust/bindings/bindings_helper.h > @@ -7,6 +7,7 @@ > */ > > #include <linux/slab.h> > +#include <linux/refcount.h> > > /* `bindgen` gets confused at certain things. */ > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > index 6c50ee62c56b..7b246454e009 100644 > --- a/rust/bindings/lib.rs > +++ b/rust/bindings/lib.rs > @@ -41,6 +41,7 @@ mod bindings_raw { > #[allow(dead_code)] > mod bindings_helper { > // Import the generated bindings for types. > + use super::bindings_raw::*; > include!(concat!( > env!("OBJTREE"), > "/rust/bindings/bindings_helpers_generated.rs" > diff --git a/rust/helpers.c b/rust/helpers.c > index b4f15eee2ffd..09a4d93f9d62 100644 > --- a/rust/helpers.c > +++ b/rust/helpers.c > @@ -20,6 +20,7 @@ > > #include <linux/bug.h> > #include <linux/build_bug.h> > +#include <linux/refcount.h> > > __noreturn void rust_helper_BUG(void) > { > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > } > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > +{ > + return (refcount_t)REFCOUNT_INIT(n); > +} > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > + > +void rust_helper_refcount_inc(refcount_t *r) > +{ > + refcount_inc(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > + > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > +{ > + return refcount_dec_and_test(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > + > /* > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > * as the Rust `usize` type, so we can use it in contexts where Rust > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > index 53040fa9e897..ace064a3702a 100644 > --- a/rust/kernel/lib.rs > +++ b/rust/kernel/lib.rs > @@ -31,6 +31,7 @@ mod static_assert; > #[doc(hidden)] > pub mod std_vendor; > pub mod str; > +pub mod sync; > pub mod types; > > #[doc(hidden)] > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > new file mode 100644 > index 000000000000..39b379dd548f > --- /dev/null > +++ b/rust/kernel/sync.rs > @@ -0,0 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! Synchronisation primitives. > +//! > +//! This module contains the kernel APIs related to synchronisation that have been ported or > +//! wrapped for usage by Rust code in the kernel. > + > +mod arc; > + > +pub use arc::Arc; > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > new file mode 100644 > index 000000000000..22290eb5ab9b > --- /dev/null > +++ b/rust/kernel/sync/arc.rs > @@ -0,0 +1,157 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! A reference-counted pointer. > +//! > +//! This module implements a way for users to create reference-counted objects and pointers to > +//! them. Such a pointer automatically increments and decrements the count, and drops the > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > +//! threads. > +//! > +//! It is different from the standard library's [`Arc`] in a few ways: > +//! 1. It is backed by the kernel's `refcount_t` type. > +//! 2. It does not support weak references, which allows it to be half the size. > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > +//! > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > + > +use crate::{bindings, error::Result, types::Opaque}; > +use alloc::boxed::Box; > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > + > +/// A reference-counted pointer to an instance of `T`. > +/// > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > +/// > +/// # Invariants > +/// > +/// The reference count on an instance of [`Arc`] is always non-zero. > +/// The object pointed to by [`Arc`] is always pinned. > +/// > +/// # Examples > +/// > +/// ``` > +/// use kernel::sync::Arc; > +/// > +/// struct Example { > +/// a: u32, > +/// b: u32, > +/// } > +/// > +/// // Create a ref-counted instance of `Example`. > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > +/// > +/// // Get a new pointer to `obj` and increment the refcount. > +/// let cloned = obj.clone(); > +/// > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > +/// > +/// // Destroy `obj` and decrement its refcount. > +/// drop(obj); > +/// > +/// // Check that the values are still accessible through `cloned`. > +/// assert_eq!(cloned.a, 10); > +/// assert_eq!(cloned.b, 20); > +/// > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > +/// ``` > +pub struct Arc<T: ?Sized> { > + ptr: NonNull<ArcInner<T>>, > + _p: PhantomData<ArcInner<T>>, > +} > + > +#[repr(C)] > +struct ArcInner<T: ?Sized> { > + refcount: Opaque<bindings::refcount_t>, > + data: T, > +} > + > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > +// example, when the reference count reaches zero and `T` is dropped. > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > + > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > + > +impl<T> Arc<T> { > + /// Constructs a new reference counted instance of `T`. > + pub fn try_new(contents: T) -> Result<Self> { > + // INVARIANT: The refcount is initialised to a non-zero value. > + let value = ArcInner { > + // SAFETY: There are no safety requirements for this FFI call. > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > + data: contents, > + }; > + > + let inner = Box::try_new(value)?; > + > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > + // `Arc` object. > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > + } > +} > + > +impl<T: ?Sized> Arc<T> { > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > + /// > + /// # Safety > + /// > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > + /// count, one of which will be owned by the new [`Arc`] instance. > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > + // INVARIANT: By the safety requirements, the invariants hold. > + Arc { > + ptr: inner, > + _p: PhantomData, > + } > + } > +} > + > +impl<T: ?Sized> Deref for Arc<T> { > + type Target = T; > + > + fn deref(&self) -> &Self::Target { > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to dereference it. > + unsafe { &self.ptr.as_ref().data } > + } > +} > + > +impl<T: ?Sized> Clone for Arc<T> { > + fn clone(&self) -> Self { > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to increment the refcount. > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; > + > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > + unsafe { Self::from_inner(self.ptr) } > + } > +} > + > +impl<T: ?Sized> Drop for Arc<T> { > + fn drop(&mut self) { > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > + // freed/invalid memory as long as it is never dereferenced. > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > + > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > + // this instance is being dropped, so the broken invariant is not observable. > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > + if is_zero { > + // The count reached zero, we must free the memory. > + // > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > + } > + } > +}
On Wed, 28 Dec 2022 at 10:02, Alice Ryhl <alice@ryhl.io> wrote: > > On 12/28/22 07:03, Wedson Almeida Filho wrote: > > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > > allows Rust code to idiomatically allocate memory that is ref-counted. > > > > Cc: Will Deacon <will@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Cc: Boqun Feng <boqun.feng@gmail.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> > > Reviewed-by: Alice Ryhl <aliceryhl@google.com> Thanks for reviewing! > Instead of Box::leak, it would be more idiomatic to use Box::into_raw, > but both approaches will work. `Box::into_raw` returns a `*mut T`, whose conversion to `NonNull<T>` is fallible (because it could be null). `Box::leak`, OTOH, returns an `&mut T`, which cannot be null so it can be converted to `NonNull<T>` infallibly. > Regards, > Alice Ryhl > > > --- > > rust/bindings/bindings_helper.h | 1 + > > rust/bindings/lib.rs | 1 + > > rust/helpers.c | 19 ++++ > > rust/kernel/lib.rs | 1 + > > rust/kernel/sync.rs | 10 ++ > > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > > 6 files changed, 189 insertions(+) > > create mode 100644 rust/kernel/sync.rs > > create mode 100644 rust/kernel/sync/arc.rs > > > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > > index c48bc284214a..75d85bd6c592 100644 > > --- a/rust/bindings/bindings_helper.h > > +++ b/rust/bindings/bindings_helper.h > > @@ -7,6 +7,7 @@ > > */ > > > > #include <linux/slab.h> > > +#include <linux/refcount.h> > > > > /* `bindgen` gets confused at certain things. */ > > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > > index 6c50ee62c56b..7b246454e009 100644 > > --- a/rust/bindings/lib.rs > > +++ b/rust/bindings/lib.rs > > @@ -41,6 +41,7 @@ mod bindings_raw { > > #[allow(dead_code)] > > mod bindings_helper { > > // Import the generated bindings for types. > > + use super::bindings_raw::*; > > include!(concat!( > > env!("OBJTREE"), > > "/rust/bindings/bindings_helpers_generated.rs" > > diff --git a/rust/helpers.c b/rust/helpers.c > > index b4f15eee2ffd..09a4d93f9d62 100644 > > --- a/rust/helpers.c > > +++ b/rust/helpers.c > > @@ -20,6 +20,7 @@ > > > > #include <linux/bug.h> > > #include <linux/build_bug.h> > > +#include <linux/refcount.h> > > > > __noreturn void rust_helper_BUG(void) > > { > > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > > } > > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > > +{ > > + return (refcount_t)REFCOUNT_INIT(n); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > > + > > +void rust_helper_refcount_inc(refcount_t *r) > > +{ > > + refcount_inc(r); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > > + > > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > > +{ > > + return refcount_dec_and_test(r); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > > + > > /* > > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > > * as the Rust `usize` type, so we can use it in contexts where Rust > > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > > index 53040fa9e897..ace064a3702a 100644 > > --- a/rust/kernel/lib.rs > > +++ b/rust/kernel/lib.rs > > @@ -31,6 +31,7 @@ mod static_assert; > > #[doc(hidden)] > > pub mod std_vendor; > > pub mod str; > > +pub mod sync; > > pub mod types; > > > > #[doc(hidden)] > > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > > new file mode 100644 > > index 000000000000..39b379dd548f > > --- /dev/null > > +++ b/rust/kernel/sync.rs > > @@ -0,0 +1,10 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > + > > +//! Synchronisation primitives. > > +//! > > +//! This module contains the kernel APIs related to synchronisation that have been ported or > > +//! wrapped for usage by Rust code in the kernel. > > + > > +mod arc; > > + > > +pub use arc::Arc; > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > > new file mode 100644 > > index 000000000000..22290eb5ab9b > > --- /dev/null > > +++ b/rust/kernel/sync/arc.rs > > @@ -0,0 +1,157 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > + > > +//! A reference-counted pointer. > > +//! > > +//! This module implements a way for users to create reference-counted objects and pointers to > > +//! them. Such a pointer automatically increments and decrements the count, and drops the > > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > > +//! threads. > > +//! > > +//! It is different from the standard library's [`Arc`] in a few ways: > > +//! 1. It is backed by the kernel's `refcount_t` type. > > +//! 2. It does not support weak references, which allows it to be half the size. > > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. > > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > > +//! > > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > > + > > +use crate::{bindings, error::Result, types::Opaque}; > > +use alloc::boxed::Box; > > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > > + > > +/// A reference-counted pointer to an instance of `T`. > > +/// > > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > > +/// > > +/// # Invariants > > +/// > > +/// The reference count on an instance of [`Arc`] is always non-zero. > > +/// The object pointed to by [`Arc`] is always pinned. > > +/// > > +/// # Examples > > +/// > > +/// ``` > > +/// use kernel::sync::Arc; > > +/// > > +/// struct Example { > > +/// a: u32, > > +/// b: u32, > > +/// } > > +/// > > +/// // Create a ref-counted instance of `Example`. > > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > > +/// > > +/// // Get a new pointer to `obj` and increment the refcount. > > +/// let cloned = obj.clone(); > > +/// > > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > > +/// > > +/// // Destroy `obj` and decrement its refcount. > > +/// drop(obj); > > +/// > > +/// // Check that the values are still accessible through `cloned`. > > +/// assert_eq!(cloned.a, 10); > > +/// assert_eq!(cloned.b, 20); > > +/// > > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > > +/// ``` > > +pub struct Arc<T: ?Sized> { > > + ptr: NonNull<ArcInner<T>>, > > + _p: PhantomData<ArcInner<T>>, > > +} > > + > > +#[repr(C)] > > +struct ArcInner<T: ?Sized> { > > + refcount: Opaque<bindings::refcount_t>, > > + data: T, > > +} > > + > > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > > +// example, when the reference count reaches zero and `T` is dropped. > > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > > + > > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > > + > > +impl<T> Arc<T> { > > + /// Constructs a new reference counted instance of `T`. > > + pub fn try_new(contents: T) -> Result<Self> { > > + // INVARIANT: The refcount is initialised to a non-zero value. > > + let value = ArcInner { > > + // SAFETY: There are no safety requirements for this FFI call. > > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > > + data: contents, > > + }; > > + > > + let inner = Box::try_new(value)?; > > + > > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > > + // `Arc` object. > > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > > + } > > +} > > + > > +impl<T: ?Sized> Arc<T> { > > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > > + /// > > + /// # Safety > > + /// > > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > > + /// count, one of which will be owned by the new [`Arc`] instance. > > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > > + // INVARIANT: By the safety requirements, the invariants hold. > > + Arc { > > + ptr: inner, > > + _p: PhantomData, > > + } > > + } > > +} > > + > > +impl<T: ?Sized> Deref for Arc<T> { > > + type Target = T; > > + > > + fn deref(&self) -> &Self::Target { > > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > > + // safe to dereference it. > > + unsafe { &self.ptr.as_ref().data } > > + } > > +} > > + > > +impl<T: ?Sized> Clone for Arc<T> { > > + fn clone(&self) -> Self { > > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > > + // safe to increment the refcount. > > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; > > + > > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > > + unsafe { Self::from_inner(self.ptr) } > > + } > > +} > > + > > +impl<T: ?Sized> Drop for Arc<T> { > > + fn drop(&mut self) { > > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > > + // freed/invalid memory as long as it is never dereferenced. > > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > > + > > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > > + // this instance is being dropped, so the broken invariant is not observable. > > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > > + if is_zero { > > + // The count reached zero, we must free the memory. > > + // > > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > > + } > > + } > > +}
On 12/28/22 11:14, Wedson Almeida Filho wrote: > On Wed, 28 Dec 2022 at 10:02, Alice Ryhl <alice@ryhl.io> wrote: >> >> On 12/28/22 07:03, Wedson Almeida Filho wrote: >>> This is a basic implementation of `Arc` backed by C's `refcount_t`. It >>> allows Rust code to idiomatically allocate memory that is ref-counted. >>> >>> Cc: Will Deacon <will@kernel.org> >>> Cc: Peter Zijlstra <peterz@infradead.org> >>> Cc: Boqun Feng <boqun.feng@gmail.com> >>> Cc: Mark Rutland <mark.rutland@arm.com> >>> Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> >> >> Reviewed-by: Alice Ryhl <aliceryhl@google.com> > > Thanks for reviewing! > >> Instead of Box::leak, it would be more idiomatic to use Box::into_raw, >> but both approaches will work. > > `Box::into_raw` returns a `*mut T`, whose conversion to `NonNull<T>` > is fallible (because it could be null). `Box::leak`, OTOH, returns an > `&mut T`, which cannot be null so it can be converted to `NonNull<T>` > infallibly. > The raw pointer returned by Box::into_raw is guaranteed to be non-null, so the conversion isn't fallible. You can go through NonNull::new_unchecked. (It's the same pointer as the one Box::leak returns, so it must be non-null.) Regardless, researching more on this topic, it appears that other people think that going through leak *is* the idiomatic way, even though it involves going through a reference and back, which is otherwise very unidiomatic for code dealing with raw pointers. I am fine with keeping it as-is. > >> Regards, >> Alice Ryhl >> >>> --- >>> rust/bindings/bindings_helper.h | 1 + >>> rust/bindings/lib.rs | 1 + >>> rust/helpers.c | 19 ++++ >>> rust/kernel/lib.rs | 1 + >>> rust/kernel/sync.rs | 10 ++ >>> rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ >>> 6 files changed, 189 insertions(+) >>> create mode 100644 rust/kernel/sync.rs >>> create mode 100644 rust/kernel/sync/arc.rs >>> >>> diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h >>> index c48bc284214a..75d85bd6c592 100644 >>> --- a/rust/bindings/bindings_helper.h >>> +++ b/rust/bindings/bindings_helper.h >>> @@ -7,6 +7,7 @@ >>> */ >>> >>> #include <linux/slab.h> >>> +#include <linux/refcount.h> >>> >>> /* `bindgen` gets confused at certain things. */ >>> const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; >>> diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs >>> index 6c50ee62c56b..7b246454e009 100644 >>> --- a/rust/bindings/lib.rs >>> +++ b/rust/bindings/lib.rs >>> @@ -41,6 +41,7 @@ mod bindings_raw { >>> #[allow(dead_code)] >>> mod bindings_helper { >>> // Import the generated bindings for types. >>> + use super::bindings_raw::*; >>> include!(concat!( >>> env!("OBJTREE"), >>> "/rust/bindings/bindings_helpers_generated.rs" >>> diff --git a/rust/helpers.c b/rust/helpers.c >>> index b4f15eee2ffd..09a4d93f9d62 100644 >>> --- a/rust/helpers.c >>> +++ b/rust/helpers.c >>> @@ -20,6 +20,7 @@ >>> >>> #include <linux/bug.h> >>> #include <linux/build_bug.h> >>> +#include <linux/refcount.h> >>> >>> __noreturn void rust_helper_BUG(void) >>> { >>> @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) >>> } >>> EXPORT_SYMBOL_GPL(rust_helper_BUG); >>> >>> +refcount_t rust_helper_REFCOUNT_INIT(int n) >>> +{ >>> + return (refcount_t)REFCOUNT_INIT(n); >>> +} >>> +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); >>> + >>> +void rust_helper_refcount_inc(refcount_t *r) >>> +{ >>> + refcount_inc(r); >>> +} >>> +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); >>> + >>> +bool rust_helper_refcount_dec_and_test(refcount_t *r) >>> +{ >>> + return refcount_dec_and_test(r); >>> +} >>> +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); >>> + >>> /* >>> * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type >>> * as the Rust `usize` type, so we can use it in contexts where Rust >>> diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs >>> index 53040fa9e897..ace064a3702a 100644 >>> --- a/rust/kernel/lib.rs >>> +++ b/rust/kernel/lib.rs >>> @@ -31,6 +31,7 @@ mod static_assert; >>> #[doc(hidden)] >>> pub mod std_vendor; >>> pub mod str; >>> +pub mod sync; >>> pub mod types; >>> >>> #[doc(hidden)] >>> diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs >>> new file mode 100644 >>> index 000000000000..39b379dd548f >>> --- /dev/null >>> +++ b/rust/kernel/sync.rs >>> @@ -0,0 +1,10 @@ >>> +// SPDX-License-Identifier: GPL-2.0 >>> + >>> +//! Synchronisation primitives. >>> +//! >>> +//! This module contains the kernel APIs related to synchronisation that have been ported or >>> +//! wrapped for usage by Rust code in the kernel. >>> + >>> +mod arc; >>> + >>> +pub use arc::Arc; >>> diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs >>> new file mode 100644 >>> index 000000000000..22290eb5ab9b >>> --- /dev/null >>> +++ b/rust/kernel/sync/arc.rs >>> @@ -0,0 +1,157 @@ >>> +// SPDX-License-Identifier: GPL-2.0 >>> + >>> +//! A reference-counted pointer. >>> +//! >>> +//! This module implements a way for users to create reference-counted objects and pointers to >>> +//! them. Such a pointer automatically increments and decrements the count, and drops the >>> +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple >>> +//! threads. >>> +//! >>> +//! It is different from the standard library's [`Arc`] in a few ways: >>> +//! 1. It is backed by the kernel's `refcount_t` type. >>> +//! 2. It does not support weak references, which allows it to be half the size. >>> +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. >>> +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. >>> +//! >>> +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html >>> + >>> +use crate::{bindings, error::Result, types::Opaque}; >>> +use alloc::boxed::Box; >>> +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; >>> + >>> +/// A reference-counted pointer to an instance of `T`. >>> +/// >>> +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented >>> +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. >>> +/// >>> +/// # Invariants >>> +/// >>> +/// The reference count on an instance of [`Arc`] is always non-zero. >>> +/// The object pointed to by [`Arc`] is always pinned. >>> +/// >>> +/// # Examples >>> +/// >>> +/// ``` >>> +/// use kernel::sync::Arc; >>> +/// >>> +/// struct Example { >>> +/// a: u32, >>> +/// b: u32, >>> +/// } >>> +/// >>> +/// // Create a ref-counted instance of `Example`. >>> +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; >>> +/// >>> +/// // Get a new pointer to `obj` and increment the refcount. >>> +/// let cloned = obj.clone(); >>> +/// >>> +/// // Assert that both `obj` and `cloned` point to the same underlying object. >>> +/// assert!(core::ptr::eq(&*obj, &*cloned)); >>> +/// >>> +/// // Destroy `obj` and decrement its refcount. >>> +/// drop(obj); >>> +/// >>> +/// // Check that the values are still accessible through `cloned`. >>> +/// assert_eq!(cloned.a, 10); >>> +/// assert_eq!(cloned.b, 20); >>> +/// >>> +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. >>> +/// ``` >>> +pub struct Arc<T: ?Sized> { >>> + ptr: NonNull<ArcInner<T>>, >>> + _p: PhantomData<ArcInner<T>>, >>> +} >>> + >>> +#[repr(C)] >>> +struct ArcInner<T: ?Sized> { >>> + refcount: Opaque<bindings::refcount_t>, >>> + data: T, >>> +} >>> + >>> +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because >>> +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs >>> +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for >>> +// example, when the reference count reaches zero and `T` is dropped. >>> +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} >>> + >>> +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the >>> +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` >>> +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. >>> +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} >>> + >>> +impl<T> Arc<T> { >>> + /// Constructs a new reference counted instance of `T`. >>> + pub fn try_new(contents: T) -> Result<Self> { >>> + // INVARIANT: The refcount is initialised to a non-zero value. >>> + let value = ArcInner { >>> + // SAFETY: There are no safety requirements for this FFI call. >>> + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), >>> + data: contents, >>> + }; >>> + >>> + let inner = Box::try_new(value)?; >>> + >>> + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new >>> + // `Arc` object. >>> + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) >>> + } >>> +} >>> + >>> +impl<T: ?Sized> Arc<T> { >>> + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. >>> + /// >>> + /// # Safety >>> + /// >>> + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference >>> + /// count, one of which will be owned by the new [`Arc`] instance. >>> + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { >>> + // INVARIANT: By the safety requirements, the invariants hold. >>> + Arc { >>> + ptr: inner, >>> + _p: PhantomData, >>> + } >>> + } >>> +} >>> + >>> +impl<T: ?Sized> Deref for Arc<T> { >>> + type Target = T; >>> + >>> + fn deref(&self) -> &Self::Target { >>> + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is >>> + // safe to dereference it. >>> + unsafe { &self.ptr.as_ref().data } >>> + } >>> +} >>> + >>> +impl<T: ?Sized> Clone for Arc<T> { >>> + fn clone(&self) -> Self { >>> + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. >>> + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is >>> + // safe to increment the refcount. >>> + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; >>> + >>> + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. >>> + unsafe { Self::from_inner(self.ptr) } >>> + } >>> +} >>> + >>> +impl<T: ?Sized> Drop for Arc<T> { >>> + fn drop(&mut self) { >>> + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot >>> + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU >>> + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to >>> + // freed/invalid memory as long as it is never dereferenced. >>> + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); >>> + >>> + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and >>> + // this instance is being dropped, so the broken invariant is not observable. >>> + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. >>> + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; >>> + if is_zero { >>> + // The count reached zero, we must free the memory. >>> + // >>> + // SAFETY: The pointer was initialised from the result of `Box::leak`. >>> + unsafe { Box::from_raw(self.ptr.as_ptr()) }; >>> + } >>> + } >>> +}
On Wed, 28 Dec 2022 06:03:40 +0000 Wedson Almeida Filho <wedsonaf@gmail.com> wrote: > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > allows Rust code to idiomatically allocate memory that is ref-counted. > > Cc: Will Deacon <will@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Boqun Feng <boqun.feng@gmail.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> Reviewed-by: Gary Guo <gary@garyguo.net> > --- > rust/bindings/bindings_helper.h | 1 + > rust/bindings/lib.rs | 1 + > rust/helpers.c | 19 ++++ > rust/kernel/lib.rs | 1 + > rust/kernel/sync.rs | 10 ++ > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > 6 files changed, 189 insertions(+) > create mode 100644 rust/kernel/sync.rs > create mode 100644 rust/kernel/sync/arc.rs
On Wed Dec 28, 2022 at 7:03 AM CET, Wedson Almeida Filho wrote: Reviewed-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com> > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > allows Rust code to idiomatically allocate memory that is ref-counted. > > Cc: Will Deacon <will@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Boqun Feng <boqun.feng@gmail.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> > --- > rust/bindings/bindings_helper.h | 1 + > rust/bindings/lib.rs | 1 + > rust/helpers.c | 19 ++++ > rust/kernel/lib.rs | 1 + > rust/kernel/sync.rs | 10 ++ > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > 6 files changed, 189 insertions(+) > create mode 100644 rust/kernel/sync.rs > create mode 100644 rust/kernel/sync/arc.rs > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > index c48bc284214a..75d85bd6c592 100644 > --- a/rust/bindings/bindings_helper.h > +++ b/rust/bindings/bindings_helper.h > @@ -7,6 +7,7 @@ > */ > > #include <linux/slab.h> > +#include <linux/refcount.h> > > /* `bindgen` gets confused at certain things. */ > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > index 6c50ee62c56b..7b246454e009 100644 > --- a/rust/bindings/lib.rs > +++ b/rust/bindings/lib.rs > @@ -41,6 +41,7 @@ mod bindings_raw { > #[allow(dead_code)] > mod bindings_helper { > // Import the generated bindings for types. > + use super::bindings_raw::*; > include!(concat!( > env!("OBJTREE"), > "/rust/bindings/bindings_helpers_generated.rs" > diff --git a/rust/helpers.c b/rust/helpers.c > index b4f15eee2ffd..09a4d93f9d62 100644 > --- a/rust/helpers.c > +++ b/rust/helpers.c > @@ -20,6 +20,7 @@ > > #include <linux/bug.h> > #include <linux/build_bug.h> > +#include <linux/refcount.h> > > __noreturn void rust_helper_BUG(void) > { > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > } > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > +{ > + return (refcount_t)REFCOUNT_INIT(n); > +} > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > + > +void rust_helper_refcount_inc(refcount_t *r) > +{ > + refcount_inc(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > + > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > +{ > + return refcount_dec_and_test(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > + > /* > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > * as the Rust `usize` type, so we can use it in contexts where Rust > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > index 53040fa9e897..ace064a3702a 100644 > --- a/rust/kernel/lib.rs > +++ b/rust/kernel/lib.rs > @@ -31,6 +31,7 @@ mod static_assert; > #[doc(hidden)] > pub mod std_vendor; > pub mod str; > +pub mod sync; > pub mod types; > > #[doc(hidden)] > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > new file mode 100644 > index 000000000000..39b379dd548f > --- /dev/null > +++ b/rust/kernel/sync.rs > @@ -0,0 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! Synchronisation primitives. > +//! > +//! This module contains the kernel APIs related to synchronisation that have been ported or > +//! wrapped for usage by Rust code in the kernel. > + > +mod arc; > + > +pub use arc::Arc; > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > new file mode 100644 > index 000000000000..22290eb5ab9b > --- /dev/null > +++ b/rust/kernel/sync/arc.rs > @@ -0,0 +1,157 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! A reference-counted pointer. > +//! > +//! This module implements a way for users to create reference-counted objects and pointers to > +//! them. Such a pointer automatically increments and decrements the count, and drops the > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > +//! threads. > +//! > +//! It is different from the standard library's [`Arc`] in a few ways: > +//! 1. It is backed by the kernel's `refcount_t` type. > +//! 2. It does not support weak references, which allows it to be half the size. > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > +//! > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > + > +use crate::{bindings, error::Result, types::Opaque}; > +use alloc::boxed::Box; > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > + > +/// A reference-counted pointer to an instance of `T`. > +/// > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > +/// > +/// # Invariants > +/// > +/// The reference count on an instance of [`Arc`] is always non-zero. > +/// The object pointed to by [`Arc`] is always pinned. > +/// > +/// # Examples > +/// > +/// ``` > +/// use kernel::sync::Arc; > +/// > +/// struct Example { > +/// a: u32, > +/// b: u32, > +/// } > +/// > +/// // Create a ref-counted instance of `Example`. > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > +/// > +/// // Get a new pointer to `obj` and increment the refcount. > +/// let cloned = obj.clone(); > +/// > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > +/// > +/// // Destroy `obj` and decrement its refcount. > +/// drop(obj); > +/// > +/// // Check that the values are still accessible through `cloned`. > +/// assert_eq!(cloned.a, 10); > +/// assert_eq!(cloned.b, 20); > +/// > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > +/// ``` > +pub struct Arc<T: ?Sized> { > + ptr: NonNull<ArcInner<T>>, > + _p: PhantomData<ArcInner<T>>, > +} > + > +#[repr(C)] > +struct ArcInner<T: ?Sized> { > + refcount: Opaque<bindings::refcount_t>, > + data: T, > +} > + > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > +// example, when the reference count reaches zero and `T` is dropped. > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > + > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > + > +impl<T> Arc<T> { > + /// Constructs a new reference counted instance of `T`. > + pub fn try_new(contents: T) -> Result<Self> { > + // INVARIANT: The refcount is initialised to a non-zero value. > + let value = ArcInner { > + // SAFETY: There are no safety requirements for this FFI call. > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > + data: contents, > + }; > + > + let inner = Box::try_new(value)?; > + > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > + // `Arc` object. > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > + } > +} > + > +impl<T: ?Sized> Arc<T> { > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > + /// > + /// # Safety > + /// > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > + /// count, one of which will be owned by the new [`Arc`] instance. > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > + // INVARIANT: By the safety requirements, the invariants hold. > + Arc { > + ptr: inner, > + _p: PhantomData, > + } > + } > +} > + > +impl<T: ?Sized> Deref for Arc<T> { > + type Target = T; > + > + fn deref(&self) -> &Self::Target { > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to dereference it. > + unsafe { &self.ptr.as_ref().data } > + } > +} > + > +impl<T: ?Sized> Clone for Arc<T> { > + fn clone(&self) -> Self { > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to increment the refcount. > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; > + > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > + unsafe { Self::from_inner(self.ptr) } > + } > +} > + > +impl<T: ?Sized> Drop for Arc<T> { > + fn drop(&mut self) { > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > + // freed/invalid memory as long as it is never dereferenced. > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > + > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > + // this instance is being dropped, so the broken invariant is not observable. > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > + if is_zero { > + // The count reached zero, we must free the memory. > + // > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > + } > + } > +} > -- > 2.34.1
Hi, On Wed, Dec 28, 2022 at 06:03:40AM +0000, Wedson Almeida Filho wrote: > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > allows Rust code to idiomatically allocate memory that is ref-counted. > > Cc: Will Deacon <will@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Boqun Feng <boqun.feng@gmail.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> The whole series look good to me. I just want to bring up a few things before I give an Acked-by as atomics subsystem reviewer. First, I'd really appreciate it that Will, Peter or Mark can take a look at the series and see if they are happy or not ;-) And from the atomics subsystem POV, I think it's better that there are a few self/unit tests along with the series, because the implementation of `Arc` clearly depends on refcount_t APIs and has some requirement on these APIs, which can be better described by tests. Although the semantics of refcount_t APIs is unlikely to change, but the future is always difficult to predict, plus there would always be new architecutres implementing these APIs. Anyway, I don't think the request for tests blocks the series, just want to have more tools for kernel C developers to collaborate with Rust developers. And put my Rust hat on, Will, Peter and Mark, please tell me whether we are doing OK or how we can improve to give you some level of understanding for the code ;-) Thanks! Regards, Boqun > --- > rust/bindings/bindings_helper.h | 1 + > rust/bindings/lib.rs | 1 + > rust/helpers.c | 19 ++++ > rust/kernel/lib.rs | 1 + > rust/kernel/sync.rs | 10 ++ > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > 6 files changed, 189 insertions(+) > create mode 100644 rust/kernel/sync.rs > create mode 100644 rust/kernel/sync/arc.rs > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > index c48bc284214a..75d85bd6c592 100644 > --- a/rust/bindings/bindings_helper.h > +++ b/rust/bindings/bindings_helper.h > @@ -7,6 +7,7 @@ > */ > > #include <linux/slab.h> > +#include <linux/refcount.h> > > /* `bindgen` gets confused at certain things. */ > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > index 6c50ee62c56b..7b246454e009 100644 > --- a/rust/bindings/lib.rs > +++ b/rust/bindings/lib.rs > @@ -41,6 +41,7 @@ mod bindings_raw { > #[allow(dead_code)] > mod bindings_helper { > // Import the generated bindings for types. > + use super::bindings_raw::*; > include!(concat!( > env!("OBJTREE"), > "/rust/bindings/bindings_helpers_generated.rs" > diff --git a/rust/helpers.c b/rust/helpers.c > index b4f15eee2ffd..09a4d93f9d62 100644 > --- a/rust/helpers.c > +++ b/rust/helpers.c > @@ -20,6 +20,7 @@ > > #include <linux/bug.h> > #include <linux/build_bug.h> > +#include <linux/refcount.h> > > __noreturn void rust_helper_BUG(void) > { > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > } > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > +{ > + return (refcount_t)REFCOUNT_INIT(n); > +} > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > + > +void rust_helper_refcount_inc(refcount_t *r) > +{ > + refcount_inc(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > + > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > +{ > + return refcount_dec_and_test(r); > +} > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > + > /* > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > * as the Rust `usize` type, so we can use it in contexts where Rust > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > index 53040fa9e897..ace064a3702a 100644 > --- a/rust/kernel/lib.rs > +++ b/rust/kernel/lib.rs > @@ -31,6 +31,7 @@ mod static_assert; > #[doc(hidden)] > pub mod std_vendor; > pub mod str; > +pub mod sync; > pub mod types; > > #[doc(hidden)] > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > new file mode 100644 > index 000000000000..39b379dd548f > --- /dev/null > +++ b/rust/kernel/sync.rs > @@ -0,0 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! Synchronisation primitives. > +//! > +//! This module contains the kernel APIs related to synchronisation that have been ported or > +//! wrapped for usage by Rust code in the kernel. > + > +mod arc; > + > +pub use arc::Arc; > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > new file mode 100644 > index 000000000000..22290eb5ab9b > --- /dev/null > +++ b/rust/kernel/sync/arc.rs > @@ -0,0 +1,157 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! A reference-counted pointer. > +//! > +//! This module implements a way for users to create reference-counted objects and pointers to > +//! them. Such a pointer automatically increments and decrements the count, and drops the > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > +//! threads. > +//! > +//! It is different from the standard library's [`Arc`] in a few ways: > +//! 1. It is backed by the kernel's `refcount_t` type. > +//! 2. It does not support weak references, which allows it to be half the size. > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > +//! > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > + > +use crate::{bindings, error::Result, types::Opaque}; > +use alloc::boxed::Box; > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > + > +/// A reference-counted pointer to an instance of `T`. > +/// > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > +/// > +/// # Invariants > +/// > +/// The reference count on an instance of [`Arc`] is always non-zero. > +/// The object pointed to by [`Arc`] is always pinned. > +/// > +/// # Examples > +/// > +/// ``` > +/// use kernel::sync::Arc; > +/// > +/// struct Example { > +/// a: u32, > +/// b: u32, > +/// } > +/// > +/// // Create a ref-counted instance of `Example`. > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > +/// > +/// // Get a new pointer to `obj` and increment the refcount. > +/// let cloned = obj.clone(); > +/// > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > +/// > +/// // Destroy `obj` and decrement its refcount. > +/// drop(obj); > +/// > +/// // Check that the values are still accessible through `cloned`. > +/// assert_eq!(cloned.a, 10); > +/// assert_eq!(cloned.b, 20); > +/// > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > +/// ``` > +pub struct Arc<T: ?Sized> { > + ptr: NonNull<ArcInner<T>>, > + _p: PhantomData<ArcInner<T>>, > +} > + > +#[repr(C)] > +struct ArcInner<T: ?Sized> { > + refcount: Opaque<bindings::refcount_t>, > + data: T, > +} > + > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > +// example, when the reference count reaches zero and `T` is dropped. > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > + > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > + > +impl<T> Arc<T> { > + /// Constructs a new reference counted instance of `T`. > + pub fn try_new(contents: T) -> Result<Self> { > + // INVARIANT: The refcount is initialised to a non-zero value. > + let value = ArcInner { > + // SAFETY: There are no safety requirements for this FFI call. > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > + data: contents, > + }; > + > + let inner = Box::try_new(value)?; > + > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > + // `Arc` object. > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > + } > +} > + > +impl<T: ?Sized> Arc<T> { > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > + /// > + /// # Safety > + /// > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > + /// count, one of which will be owned by the new [`Arc`] instance. > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > + // INVARIANT: By the safety requirements, the invariants hold. > + Arc { > + ptr: inner, > + _p: PhantomData, > + } > + } > +} > + > +impl<T: ?Sized> Deref for Arc<T> { > + type Target = T; > + > + fn deref(&self) -> &Self::Target { > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to dereference it. > + unsafe { &self.ptr.as_ref().data } > + } > +} > + > +impl<T: ?Sized> Clone for Arc<T> { > + fn clone(&self) -> Self { > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > + // safe to increment the refcount. > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; > + > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > + unsafe { Self::from_inner(self.ptr) } > + } > +} > + > +impl<T: ?Sized> Drop for Arc<T> { > + fn drop(&mut self) { > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > + // freed/invalid memory as long as it is never dereferenced. > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > + > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > + // this instance is being dropped, so the broken invariant is not observable. > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > + if is_zero { > + // The count reached zero, we must free the memory. > + // > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > + } > + } > +} > -- > 2.34.1 >
On Tue, Jan 10, 2023 at 12:22:47PM -0800, Boqun Feng wrote: > First, I'd really appreciate it that Will, Peter or Mark can take a look > at the series and see if they are happy or not ;-) I only have 1 patch, and since I don't speak rust I have very limited feedback. Having to use out-of-line functions seems sub-optimal, but I suppose that's a limitation of the Rust-C bindings. Afaict this is like C++ shared_ptr<> and using refcount_t seems okay for that, not sure what else you're asking.
On Tue, Jan 10, 2023 at 10:20:50PM +0100, Peter Zijlstra wrote: > On Tue, Jan 10, 2023 at 12:22:47PM -0800, Boqun Feng wrote: > > > First, I'd really appreciate it that Will, Peter or Mark can take a look > > at the series and see if they are happy or not ;-) > > I only have 1 patch, and since I don't speak rust I have very limited > feedback. Having to use out-of-line functions seems sub-optimal, but > I suppose that's a limitation of the Rust-C bindings. > > Afaict this is like C++ shared_ptr<> and using refcount_t seems okay for > that, not sure what else you're asking. > Thanks! I failed to find that you were only Cc for the first patch.. I cannot speak for Wedson, but the rest of the patchset are all based on the first patch and purely in Rust, maybe he was avoiding to "spam" your inbox ;-) While we are at it, for a general case, say we provide Rust's interface of task/kthread managament, do you prefer to seeing the whole patchset (including how Rust side provides the APIs) or seeing only the patch that interacts with C? Again, trying to find the sweet spot for collaboration ;-) Regards, Boqun
On Tue, Jan 10, 2023 at 01:36:25PM -0800, Boqun Feng wrote: > On Tue, Jan 10, 2023 at 10:20:50PM +0100, Peter Zijlstra wrote: > > On Tue, Jan 10, 2023 at 12:22:47PM -0800, Boqun Feng wrote: > > > > > First, I'd really appreciate it that Will, Peter or Mark can take a look > > > at the series and see if they are happy or not ;-) > > > > I only have 1 patch, and since I don't speak rust I have very limited > > feedback. Having to use out-of-line functions seems sub-optimal, but > > I suppose that's a limitation of the Rust-C bindings. > > > > Afaict this is like C++ shared_ptr<> and using refcount_t seems okay for > > that, not sure what else you're asking. > > > > Thanks! I failed to find that you were only Cc for the first patch.. I > cannot speak for Wedson, but the rest of the patchset are all based on > the first patch and purely in Rust, maybe he was avoiding to "spam" your > inbox ;-) > > While we are at it, for a general case, say we provide Rust's interface > of task/kthread managament, do you prefer to seeing the whole patchset > (including how Rust side provides the APIs) or seeing only the patch > that interacts with C? > > Again, trying to find the sweet spot for collaboration ;-) Always all patches. The more effort I need to do to find sometihng the smaller the chance I will. Also, I get so much email, I've long since given up on reading it all.
On Tue, Jan 10, 2023 at 12:22:47PM -0800, Boqun Feng wrote: > Hi, > > On Wed, Dec 28, 2022 at 06:03:40AM +0000, Wedson Almeida Filho wrote: > > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > > allows Rust code to idiomatically allocate memory that is ref-counted. > > > > Cc: Will Deacon <will@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Cc: Boqun Feng <boqun.feng@gmail.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> For the whole series: Acked-by: Boqun Feng <boqun.feng@gmail.com> Regards, Boqun > > The whole series look good to me. I just want to bring up a few things > before I give an Acked-by as atomics subsystem reviewer. > > First, I'd really appreciate it that Will, Peter or Mark can take a look > at the series and see if they are happy or not ;-) > > And from the atomics subsystem POV, I think it's better that there are a > few self/unit tests along with the series, because the implementation of > `Arc` clearly depends on refcount_t APIs and has some requirement on > these APIs, which can be better described by tests. Although the > semantics of refcount_t APIs is unlikely to change, but the future is > always difficult to predict, plus there would always be new > architecutres implementing these APIs. > > Anyway, I don't think the request for tests blocks the series, just > want to have more tools for kernel C developers to collaborate with Rust > developers. And put my Rust hat on, Will, Peter and Mark, please tell me > whether we are doing OK or how we can improve to give you some level of > understanding for the code ;-) Thanks! > > Regards, > Boqun > > > --- > > rust/bindings/bindings_helper.h | 1 + > > rust/bindings/lib.rs | 1 + > > rust/helpers.c | 19 ++++ > > rust/kernel/lib.rs | 1 + > > rust/kernel/sync.rs | 10 ++ > > rust/kernel/sync/arc.rs | 157 ++++++++++++++++++++++++++++++++ > > 6 files changed, 189 insertions(+) > > create mode 100644 rust/kernel/sync.rs > > create mode 100644 rust/kernel/sync/arc.rs > > > > diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h > > index c48bc284214a..75d85bd6c592 100644 > > --- a/rust/bindings/bindings_helper.h > > +++ b/rust/bindings/bindings_helper.h > > @@ -7,6 +7,7 @@ > > */ > > > > #include <linux/slab.h> > > +#include <linux/refcount.h> > > > > /* `bindgen` gets confused at certain things. */ > > const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; > > diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs > > index 6c50ee62c56b..7b246454e009 100644 > > --- a/rust/bindings/lib.rs > > +++ b/rust/bindings/lib.rs > > @@ -41,6 +41,7 @@ mod bindings_raw { > > #[allow(dead_code)] > > mod bindings_helper { > > // Import the generated bindings for types. > > + use super::bindings_raw::*; > > include!(concat!( > > env!("OBJTREE"), > > "/rust/bindings/bindings_helpers_generated.rs" > > diff --git a/rust/helpers.c b/rust/helpers.c > > index b4f15eee2ffd..09a4d93f9d62 100644 > > --- a/rust/helpers.c > > +++ b/rust/helpers.c > > @@ -20,6 +20,7 @@ > > > > #include <linux/bug.h> > > #include <linux/build_bug.h> > > +#include <linux/refcount.h> > > > > __noreturn void rust_helper_BUG(void) > > { > > @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) > > } > > EXPORT_SYMBOL_GPL(rust_helper_BUG); > > > > +refcount_t rust_helper_REFCOUNT_INIT(int n) > > +{ > > + return (refcount_t)REFCOUNT_INIT(n); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); > > + > > +void rust_helper_refcount_inc(refcount_t *r) > > +{ > > + refcount_inc(r); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); > > + > > +bool rust_helper_refcount_dec_and_test(refcount_t *r) > > +{ > > + return refcount_dec_and_test(r); > > +} > > +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); > > + > > /* > > * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type > > * as the Rust `usize` type, so we can use it in contexts where Rust > > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs > > index 53040fa9e897..ace064a3702a 100644 > > --- a/rust/kernel/lib.rs > > +++ b/rust/kernel/lib.rs > > @@ -31,6 +31,7 @@ mod static_assert; > > #[doc(hidden)] > > pub mod std_vendor; > > pub mod str; > > +pub mod sync; > > pub mod types; > > > > #[doc(hidden)] > > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > > new file mode 100644 > > index 000000000000..39b379dd548f > > --- /dev/null > > +++ b/rust/kernel/sync.rs > > @@ -0,0 +1,10 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > + > > +//! Synchronisation primitives. > > +//! > > +//! This module contains the kernel APIs related to synchronisation that have been ported or > > +//! wrapped for usage by Rust code in the kernel. > > + > > +mod arc; > > + > > +pub use arc::Arc; > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > > new file mode 100644 > > index 000000000000..22290eb5ab9b > > --- /dev/null > > +++ b/rust/kernel/sync/arc.rs > > @@ -0,0 +1,157 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > + > > +//! A reference-counted pointer. > > +//! > > +//! This module implements a way for users to create reference-counted objects and pointers to > > +//! them. Such a pointer automatically increments and decrements the count, and drops the > > +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple > > +//! threads. > > +//! > > +//! It is different from the standard library's [`Arc`] in a few ways: > > +//! 1. It is backed by the kernel's `refcount_t` type. > > +//! 2. It does not support weak references, which allows it to be half the size. > > +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. > > +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. > > +//! > > +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html > > + > > +use crate::{bindings, error::Result, types::Opaque}; > > +use alloc::boxed::Box; > > +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; > > + > > +/// A reference-counted pointer to an instance of `T`. > > +/// > > +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented > > +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. > > +/// > > +/// # Invariants > > +/// > > +/// The reference count on an instance of [`Arc`] is always non-zero. > > +/// The object pointed to by [`Arc`] is always pinned. > > +/// > > +/// # Examples > > +/// > > +/// ``` > > +/// use kernel::sync::Arc; > > +/// > > +/// struct Example { > > +/// a: u32, > > +/// b: u32, > > +/// } > > +/// > > +/// // Create a ref-counted instance of `Example`. > > +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; > > +/// > > +/// // Get a new pointer to `obj` and increment the refcount. > > +/// let cloned = obj.clone(); > > +/// > > +/// // Assert that both `obj` and `cloned` point to the same underlying object. > > +/// assert!(core::ptr::eq(&*obj, &*cloned)); > > +/// > > +/// // Destroy `obj` and decrement its refcount. > > +/// drop(obj); > > +/// > > +/// // Check that the values are still accessible through `cloned`. > > +/// assert_eq!(cloned.a, 10); > > +/// assert_eq!(cloned.b, 20); > > +/// > > +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. > > +/// ``` > > +pub struct Arc<T: ?Sized> { > > + ptr: NonNull<ArcInner<T>>, > > + _p: PhantomData<ArcInner<T>>, > > +} > > + > > +#[repr(C)] > > +struct ArcInner<T: ?Sized> { > > + refcount: Opaque<bindings::refcount_t>, > > + data: T, > > +} > > + > > +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because > > +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs > > +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for > > +// example, when the reference count reaches zero and `T` is dropped. > > +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} > > + > > +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the > > +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` > > +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. > > +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} > > + > > +impl<T> Arc<T> { > > + /// Constructs a new reference counted instance of `T`. > > + pub fn try_new(contents: T) -> Result<Self> { > > + // INVARIANT: The refcount is initialised to a non-zero value. > > + let value = ArcInner { > > + // SAFETY: There are no safety requirements for this FFI call. > > + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), > > + data: contents, > > + }; > > + > > + let inner = Box::try_new(value)?; > > + > > + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new > > + // `Arc` object. > > + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) > > + } > > +} > > + > > +impl<T: ?Sized> Arc<T> { > > + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. > > + /// > > + /// # Safety > > + /// > > + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference > > + /// count, one of which will be owned by the new [`Arc`] instance. > > + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { > > + // INVARIANT: By the safety requirements, the invariants hold. > > + Arc { > > + ptr: inner, > > + _p: PhantomData, > > + } > > + } > > +} > > + > > +impl<T: ?Sized> Deref for Arc<T> { > > + type Target = T; > > + > > + fn deref(&self) -> &Self::Target { > > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > > + // safe to dereference it. > > + unsafe { &self.ptr.as_ref().data } > > + } > > +} > > + > > +impl<T: ?Sized> Clone for Arc<T> { > > + fn clone(&self) -> Self { > > + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. > > + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is > > + // safe to increment the refcount. > > + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; > > + > > + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. > > + unsafe { Self::from_inner(self.ptr) } > > + } > > +} > > + > > +impl<T: ?Sized> Drop for Arc<T> { > > + fn drop(&mut self) { > > + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot > > + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU > > + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to > > + // freed/invalid memory as long as it is never dereferenced. > > + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); > > + > > + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and > > + // this instance is being dropped, so the broken invariant is not observable. > > + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. > > + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; > > + if is_zero { > > + // The count reached zero, we must free the memory. > > + // > > + // SAFETY: The pointer was initialised from the result of `Box::leak`. > > + unsafe { Box::from_raw(self.ptr.as_ptr()) }; > > + } > > + } > > +} > > -- > > 2.34.1 > >
On Wed, Dec 28, 2022 at 7:04 AM Wedson Almeida Filho <wedsonaf@gmail.com> wrote: > > This is a basic implementation of `Arc` backed by C's `refcount_t`. It > allows Rust code to idiomatically allocate memory that is ref-counted. > > Cc: Will Deacon <will@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Boqun Feng <boqun.feng@gmail.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Wedson Almeida Filho <wedsonaf@gmail.com> Series applied to rust-next, thanks all! Cheers, Miguel
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index c48bc284214a..75d85bd6c592 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -7,6 +7,7 @@ */ #include <linux/slab.h> +#include <linux/refcount.h> /* `bindgen` gets confused at certain things. */ const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index 6c50ee62c56b..7b246454e009 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -41,6 +41,7 @@ mod bindings_raw { #[allow(dead_code)] mod bindings_helper { // Import the generated bindings for types. + use super::bindings_raw::*; include!(concat!( env!("OBJTREE"), "/rust/bindings/bindings_helpers_generated.rs" diff --git a/rust/helpers.c b/rust/helpers.c index b4f15eee2ffd..09a4d93f9d62 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -20,6 +20,7 @@ #include <linux/bug.h> #include <linux/build_bug.h> +#include <linux/refcount.h> __noreturn void rust_helper_BUG(void) { @@ -27,6 +28,24 @@ __noreturn void rust_helper_BUG(void) } EXPORT_SYMBOL_GPL(rust_helper_BUG); +refcount_t rust_helper_REFCOUNT_INIT(int n) +{ + return (refcount_t)REFCOUNT_INIT(n); +} +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); + +void rust_helper_refcount_inc(refcount_t *r) +{ + refcount_inc(r); +} +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); + +bool rust_helper_refcount_dec_and_test(refcount_t *r) +{ + return refcount_dec_and_test(r); +} +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); + /* * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type * as the Rust `usize` type, so we can use it in contexts where Rust diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 53040fa9e897..ace064a3702a 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -31,6 +31,7 @@ mod static_assert; #[doc(hidden)] pub mod std_vendor; pub mod str; +pub mod sync; pub mod types; #[doc(hidden)] diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs new file mode 100644 index 000000000000..39b379dd548f --- /dev/null +++ b/rust/kernel/sync.rs @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Synchronisation primitives. +//! +//! This module contains the kernel APIs related to synchronisation that have been ported or +//! wrapped for usage by Rust code in the kernel. + +mod arc; + +pub use arc::Arc; diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs new file mode 100644 index 000000000000..22290eb5ab9b --- /dev/null +++ b/rust/kernel/sync/arc.rs @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! A reference-counted pointer. +//! +//! This module implements a way for users to create reference-counted objects and pointers to +//! them. Such a pointer automatically increments and decrements the count, and drops the +//! underlying object when it reaches zero. It is also safe to use concurrently from multiple +//! threads. +//! +//! It is different from the standard library's [`Arc`] in a few ways: +//! 1. It is backed by the kernel's `refcount_t` type. +//! 2. It does not support weak references, which allows it to be half the size. +//! 3. It saturates the reference count instead of aborting when it goes over a threshold. +//! 4. It does not provide a `get_mut` method, so the ref counted object is pinned. +//! +//! [`Arc`]: https://doc.rust-lang.org/std/sync/struct.Arc.html + +use crate::{bindings, error::Result, types::Opaque}; +use alloc::boxed::Box; +use core::{marker::PhantomData, ops::Deref, ptr::NonNull}; + +/// A reference-counted pointer to an instance of `T`. +/// +/// The reference count is incremented when new instances of [`Arc`] are created, and decremented +/// when they are dropped. When the count reaches zero, the underlying `T` is also dropped. +/// +/// # Invariants +/// +/// The reference count on an instance of [`Arc`] is always non-zero. +/// The object pointed to by [`Arc`] is always pinned. +/// +/// # Examples +/// +/// ``` +/// use kernel::sync::Arc; +/// +/// struct Example { +/// a: u32, +/// b: u32, +/// } +/// +/// // Create a ref-counted instance of `Example`. +/// let obj = Arc::try_new(Example { a: 10, b: 20 })?; +/// +/// // Get a new pointer to `obj` and increment the refcount. +/// let cloned = obj.clone(); +/// +/// // Assert that both `obj` and `cloned` point to the same underlying object. +/// assert!(core::ptr::eq(&*obj, &*cloned)); +/// +/// // Destroy `obj` and decrement its refcount. +/// drop(obj); +/// +/// // Check that the values are still accessible through `cloned`. +/// assert_eq!(cloned.a, 10); +/// assert_eq!(cloned.b, 20); +/// +/// // The refcount drops to zero when `cloned` goes out of scope, and the memory is freed. +/// ``` +pub struct Arc<T: ?Sized> { + ptr: NonNull<ArcInner<T>>, + _p: PhantomData<ArcInner<T>>, +} + +#[repr(C)] +struct ArcInner<T: ?Sized> { + refcount: Opaque<bindings::refcount_t>, + data: T, +} + +// SAFETY: It is safe to send `Arc<T>` to another thread when the underlying `T` is `Sync` because +// it effectively means sharing `&T` (which is safe because `T` is `Sync`); additionally, it needs +// `T` to be `Send` because any thread that has an `Arc<T>` may ultimately access `T` directly, for +// example, when the reference count reaches zero and `T` is dropped. +unsafe impl<T: ?Sized + Sync + Send> Send for Arc<T> {} + +// SAFETY: It is safe to send `&Arc<T>` to another thread when the underlying `T` is `Sync` for the +// same reason as above. `T` needs to be `Send` as well because a thread can clone an `&Arc<T>` +// into an `Arc<T>`, which may lead to `T` being accessed by the same reasoning as above. +unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {} + +impl<T> Arc<T> { + /// Constructs a new reference counted instance of `T`. + pub fn try_new(contents: T) -> Result<Self> { + // INVARIANT: The refcount is initialised to a non-zero value. + let value = ArcInner { + // SAFETY: There are no safety requirements for this FFI call. + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), + data: contents, + }; + + let inner = Box::try_new(value)?; + + // SAFETY: We just created `inner` with a reference count of 1, which is owned by the new + // `Arc` object. + Ok(unsafe { Self::from_inner(Box::leak(inner).into()) }) + } +} + +impl<T: ?Sized> Arc<T> { + /// Constructs a new [`Arc`] from an existing [`ArcInner`]. + /// + /// # Safety + /// + /// The caller must ensure that `inner` points to a valid location and has a non-zero reference + /// count, one of which will be owned by the new [`Arc`] instance. + unsafe fn from_inner(inner: NonNull<ArcInner<T>>) -> Self { + // INVARIANT: By the safety requirements, the invariants hold. + Arc { + ptr: inner, + _p: PhantomData, + } + } +} + +impl<T: ?Sized> Deref for Arc<T> { + type Target = T; + + fn deref(&self) -> &Self::Target { + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is + // safe to dereference it. + unsafe { &self.ptr.as_ref().data } + } +} + +impl<T: ?Sized> Clone for Arc<T> { + fn clone(&self) -> Self { + // INVARIANT: C `refcount_inc` saturates the refcount, so it cannot overflow to zero. + // SAFETY: By the type invariant, there is necessarily a reference to the object, so it is + // safe to increment the refcount. + unsafe { bindings::refcount_inc(self.ptr.as_ref().refcount.get()) }; + + // SAFETY: We just incremented the refcount. This increment is now owned by the new `Arc`. + unsafe { Self::from_inner(self.ptr) } + } +} + +impl<T: ?Sized> Drop for Arc<T> { + fn drop(&mut self) { + // SAFETY: By the type invariant, there is necessarily a reference to the object. We cannot + // touch `refcount` after it's decremented to a non-zero value because another thread/CPU + // may concurrently decrement it to zero and free it. It is ok to have a raw pointer to + // freed/invalid memory as long as it is never dereferenced. + let refcount = unsafe { self.ptr.as_ref() }.refcount.get(); + + // INVARIANT: If the refcount reaches zero, there are no other instances of `Arc`, and + // this instance is being dropped, so the broken invariant is not observable. + // SAFETY: Also by the type invariant, we are allowed to decrement the refcount. + let is_zero = unsafe { bindings::refcount_dec_and_test(refcount) }; + if is_zero { + // The count reached zero, we must free the memory. + // + // SAFETY: The pointer was initialised from the result of `Box::leak`. + unsafe { Box::from_raw(self.ptr.as_ptr()) }; + } + } +}