Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp2177519rwl; Thu, 13 Apr 2023 02:46:30 -0700 (PDT) X-Google-Smtp-Source: AKy350aowPOXsL4Zr0xR9RjXSOqv9NtorL9w0EuA9VcuoNfsu9yL1R+yPBo/TwUr6Iy/E3oB79CL X-Received: by 2002:a05:6402:34c7:b0:502:50b0:a879 with SMTP id w7-20020a05640234c700b0050250b0a879mr5850463edc.5.1681379189689; Thu, 13 Apr 2023 02:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681379189; cv=none; d=google.com; s=arc-20160816; b=CfxJUl/vKjBNGBFKMxoF8Mc5NtDD6kaZeWUrbuNSLEvK20UdgfUBlyau/qb4XWo1Uw C6TXQoRCW5emcxzNo1se2TxtZghrks5yxNVngaYUW+CsBWzQrYK0A0PNDeEHUf5OfXe+ ihAFT6v6xRMHFvrjoAhlnBFl1j3zJAHcGZ2NV3rZkc40Y5ePj1HWBiJdWuS8aOpnwKK0 ihD9CFfHBPE9giQhJjri0+CGSCATWVOb1Ri5DbGqPdJe/QBWpqrt5wIL64tviaCXnZmm idGo7zIhJEBglBfUJhbes6Zsy622zQQ5Qe6hOaIB1GXECmgjJOfM02QH1htdutEU/S0Z 7kPg== 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 :feedback-id:references:in-reply-to:message-id:subject:cc:from:to :dkim-signature:date; bh=VS/vvMrfuqP4jLEUV8GWITdtCW3cWpNVfUsPCecWtQM=; b=YQuZ1998pvykA9QtcopIM/MyGrQAGhjzqSyrc7W/q/gAyyPrklwS0vGrraM7qvzAld BnQTbVq0IxA2j38dHvWz2Q8MP8W/eeq//lkbLEVYTgIX1KdDtQnJYgn709DRD1HNDb7b zFCMWYN9oNoVAqa3bTlXuNDy4f6ctor7w+L41alg245i6R2+kMysMKiEIjFi4aV6hCoc 8fFCXMXJZ3UUcvDUYWTiiPcqM1d4pdsWVDH6ivQ1rsQEZdCKf2LZ9kwlPxpnWL7pCBWZ HnOkF8JE1U2dZqzV+hi4zchhs7fxJq/qCGMGTUlqgktoiHq08aMag4apM2jDQJ2Z0hDE ytTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@proton.me header.s=qcpkh3tzojdgbkwz55ti355tey.protonmail header.b=HDI3X5ci; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v16-20020aa7d650000000b005029d15aa77si1385338edr.15.2023.04.13.02.46.04; Thu, 13 Apr 2023 02:46:29 -0700 (PDT) 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=@proton.me header.s=qcpkh3tzojdgbkwz55ti355tey.protonmail header.b=HDI3X5ci; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbjDMJpX (ORCPT + 99 others); Thu, 13 Apr 2023 05:45:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjDMJpW (ORCPT ); Thu, 13 Apr 2023 05:45:22 -0400 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06EFA9031 for ; Thu, 13 Apr 2023 02:45:16 -0700 (PDT) Date: Thu, 13 Apr 2023 09:45:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=qcpkh3tzojdgbkwz55ti355tey.protonmail; t=1681379114; x=1681638314; bh=VS/vvMrfuqP4jLEUV8GWITdtCW3cWpNVfUsPCecWtQM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=HDI3X5ciFHdjLP88ayQxa/p617ulOwo7gR+4/S14ieWyH02w0oktDTG5NJ1bSzjUQ 4SJBb0seANH3IXaiW3TB5WmcBX54UzVKRN1zv8PdIFhLNyLqWbvjNX9fwhJ6FGvYMw 0gTaDy6oouKLPkCAsl3o8+j4U5wg9W9OflPvSubU76XzlqgLIikZ8epk9iUwIVFvHJ WMPSP59gkMi1aVaskKJ1SZ1lv0YLG1jPTK30ps0eaPOwTgOmHbNGWbIgQKVNLVEQYa XmJpjh+EDxWeq67KbfSsGB33sMNW6ofhB07N6cr7uCTtUPfD96Qp1JZc9Cf2F3xvU2 BZN10IUOWj4EQ== To: Wedson Almeida Filho , rust-for-linux@vger.kernel.org From: Benno Lossin Cc: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?Q?Bj=C3=B6rn_Roy_Baron?= , linux-kernel@vger.kernel.org, Wedson Almeida Filho , Martin Rodriguez Reboredo Subject: Re: [PATCH v4 13/13] rust: sync: introduce `LockedBy` Message-ID: <4cbd25e7-0537-e1fd-6959-5802e2ce443e@proton.me> In-Reply-To: <20230411054543.21278-13-wedsonaf@gmail.com> References: <20230411054543.21278-1-wedsonaf@gmail.com> <20230411054543.21278-13-wedsonaf@gmail.com> Feedback-ID: 71780778:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org On 11.04.23 07:45, Wedson Almeida Filho wrote: > From: Wedson Almeida Filho > > This allows us to have data protected by a lock despite not being > wrapped by it. Access is granted by providing evidence that the lock is > held by the caller. > > Reviewed-by: Martin Rodriguez Reboredo > Signed-off-by: Wedson Almeida Filho Reviewed-by: Benno Lossin > --- > v1 -> v2: Added build_assert to rule out zero-sized types > v2 -> v3: Improve comments around panics and support for ZSTs > v3 -> v4: > - Added build_assert to LockBy::new > - Updated build_assert calls with messages > - Included crate::build_assert and mem::size_of since they're used > repeatedly. > > rust/kernel/sync.rs | 2 + > rust/kernel/sync/lock.rs | 2 +- > rust/kernel/sync/locked_by.rs | 156 ++++++++++++++++++++++++++++++++++ > 3 files changed, 159 insertions(+), 1 deletion(-) > create mode 100644 rust/kernel/sync/locked_by.rs > > diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs > index 431402180aa8..d219ee518eff 100644 > --- a/rust/kernel/sync.rs > +++ b/rust/kernel/sync.rs > @@ -10,10 +10,12 @@ use crate::types::Opaque; > mod arc; > mod condvar; > pub mod lock; > +mod locked_by; > > pub use arc::{Arc, ArcBorrow, UniqueArc}; > pub use condvar::CondVar; > pub use lock::{mutex::Mutex, spinlock::SpinLock}; > +pub use locked_by::LockedBy; > > /// Represents a lockdep class. It's a wrapper around C's `lock_class_k= ey`. > #[repr(transparent)] > diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs > index 816c5d3bba12..14940312141d 100644 > --- a/rust/kernel/sync/lock.rs > +++ b/rust/kernel/sync/lock.rs > @@ -111,7 +111,7 @@ pub struct Lock { > _pin: PhantomPinned, > > /// The data protected by the lock. > - data: UnsafeCell, > + pub(crate) data: UnsafeCell, > } > > // SAFETY: `Lock` can be transferred across thread boundaries iff the d= ata it protects can. > diff --git a/rust/kernel/sync/locked_by.rs b/rust/kernel/sync/locked_by.r= s > new file mode 100644 > index 000000000000..b17ee5cd98f3 > --- /dev/null > +++ b/rust/kernel/sync/locked_by.rs > @@ -0,0 +1,156 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +//! A wrapper for data protected by a lock that does not wrap it. > + > +use super::{lock::Backend, lock::Lock}; > +use crate::build_assert; > +use core::{cell::UnsafeCell, mem::size_of, ptr}; > + > +/// Allows access to some data to be serialised by a lock that does not = wrap it. > +/// > +/// In most cases, data protected by a lock is wrapped by the appropriat= e lock type, e.g., > +/// [`super::Mutex`] or [`super::SpinLock`]. [`LockedBy`] is meant for c= ases when this is not > +/// possible. For example, if a container has a lock and some data in th= e contained elements needs > +/// to be protected by the same lock. > +/// > +/// [`LockedBy`] wraps the data in lieu of another locking primitive, an= d only allows access to it > +/// when the caller shows evidence that the 'external' lock is locked. I= t panics if the evidence > +/// refers to the wrong instance of the lock. > +/// > +/// # Examples > +/// > +/// The following is an example for illustrative purposes: `InnerDirecto= ry::bytes_used` is an > +/// aggregate of all `InnerFile::bytes_used` and must be kept consistent= ; so we wrap `InnerFile` in > +/// a `LockedBy` so that it shares a lock with `InnerDirectory`. This al= lows us to enforce at > +/// compile-time that access to `InnerFile` is only granted when an `Inn= erDirectory` is also > +/// locked; we enforce at run time that the right `InnerDirectory` is lo= cked. > +/// > +/// ``` > +/// use kernel::sync::{LockedBy, Mutex}; > +/// > +/// struct InnerFile { > +/// bytes_used: u64, > +/// } > +/// > +/// struct File { > +/// _ino: u32, > +/// inner: LockedBy, > +/// } > +/// > +/// struct InnerDirectory { > +/// /// The sum of the bytes used by all files. > +/// bytes_used: u64, > +/// _files: Vec, > +/// } > +/// > +/// struct Directory { > +/// _ino: u32, > +/// inner: Mutex, > +/// } > +/// > +/// /// Prints `bytes_used` from both the directory and file. > +/// fn print_bytes_used(dir: &Directory, file: &File) { > +/// let guard =3D dir.inner.lock(); > +/// let inner_file =3D file.inner.access(&guard); > +/// pr_info!("{} {}", guard.bytes_used, inner_file.bytes_used); > +/// } > +/// > +/// /// Increments `bytes_used` for both the directory and file. > +/// fn inc_bytes_used(dir: &Directory, file: &File) { > +/// let mut guard =3D dir.inner.lock(); > +/// guard.bytes_used +=3D 10; > +/// > +/// let file_inner =3D file.inner.access_mut(&mut guard); > +/// file_inner.bytes_used +=3D 10; > +/// } > +/// > +/// /// Creates a new file. > +/// fn new_file(ino: u32, dir: &Directory) -> File { > +/// File { > +/// _ino: ino, > +/// inner: LockedBy::new(&dir.inner, InnerFile { bytes_used: 0 }= ), > +/// } > +/// } > +/// ``` > +pub struct LockedBy { > + owner: *const U, > + data: UnsafeCell, > +} > + > +// SAFETY: `LockedBy` can be transferred across thread boundaries iff th= e data it protects can. > +unsafe impl Send for LockedBy {} > + > +// SAFETY: `LockedBy` serialises the interior mutability it provides, so= it is `Sync` as long as the > +// data it protects is `Send`. > +unsafe impl Sync for LockedBy {} > + > +impl LockedBy { > + /// Constructs a new instance of [`LockedBy`]. > + /// > + /// It stores a raw pointer to the owner that is never dereferenced.= It is only used to ensure > + /// that the right owner is being used to access the protected data.= If the owner is freed, the > + /// data becomes inaccessible; if another instance of the owner is a= llocated *on the same > + /// memory location*, the data becomes accessible again: none of thi= s affects memory safety > + /// because in any case at most one thread (or CPU) can access the p= rotected data at a time. > + pub fn new(owner: &Lock, data: T) -> Self { > + build_assert!( > + size_of::>() > 0, > + "The lock type cannot be a ZST because it may be impossible = to distinguish instances" > + ); > + Self { > + owner: owner.data.get(), > + data: UnsafeCell::new(data), > + } > + } > +} > + > +impl LockedBy { > + /// Returns a reference to the protected data when the caller provid= es evidence (via a > + /// reference) that the owner is locked. > + /// > + /// `U` cannot be a zero-sized type (ZST) because there are ways to = get an `&U` that matches > + /// the data protected by the lock without actually holding it. > + /// > + /// # Panics > + /// > + /// Panics if `owner` is different from the data protected by the lo= ck used in > + /// [`new`](LockedBy::new). > + pub fn access<'a>(&'a self, owner: &'a U) -> &'a T { > + build_assert!( > + size_of::() > 0, > + "`U` cannot be a ZST because `owner` wouldn't be unique" > + ); > + if !ptr::eq(owner, self.owner) { > + panic!("mismatched owners"); > + } > + > + // SAFETY: `owner` is evidence that the owner is locked. > + unsafe { &*self.data.get() } > + } > + > + /// Returns a mutable reference to the protected data when the calle= r provides evidence (via a > + /// mutable owner) that the owner is locked mutably. > + /// > + /// `U` cannot be a zero-sized type (ZST) because there are ways to = get an `&mut U` that > + /// matches the data protected by the lock without actually holding = it. > + /// > + /// Showing a mutable reference to the owner is sufficient because w= e know no other references > + /// can exist to it. > + /// > + /// # Panics > + /// > + /// Panics if `owner` is different from the data protected by the lo= ck used in > + /// [`new`](LockedBy::new). > + pub fn access_mut<'a>(&'a self, owner: &'a mut U) -> &'a mut T { > + build_assert!( > + size_of::() > 0, > + "`U` cannot be a ZST because `owner` wouldn't be unique" > + ); > + if !ptr::eq(owner, self.owner) { > + panic!("mismatched owners"); > + } > + > + // SAFETY: `owner` is evidence that there is only one reference = to the owner. > + unsafe { &mut *self.data.get() } > + } > +} > -- > 2.34.1 >