From patchwork Thu Sep 21 21:34:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wedson Almeida Filho X-Patchwork-Id: 143262 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5413138vqi; Fri, 22 Sep 2023 01:44:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLjNqW+TSHjzwEnHwl4518acYSnjloIIt85656S+u/AFfJFR/VDPsrqpYBBVHzJX7i6l91 X-Received: by 2002:a05:6830:168e:b0:6b8:dc53:9efd with SMTP id k14-20020a056830168e00b006b8dc539efdmr7016234otr.3.1695372282256; Fri, 22 Sep 2023 01:44:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695372282; cv=none; d=google.com; s=arc-20160816; b=rASFifIDdmcGzyLOenYw2JCEaGJuteAkwMSrwHvprTdlUclP5bc20vcMwRe6sctkO4 2WZCn/SyDvDcr9v8VCCbHLXppD9WMXNTluzF3hR0qW455W72u9hDKLYvw7J9k8DTQNZ7 KbyoVVxU8OfB9MEIgUl0+lIGQb7YEq0dXG97IH6Q2p0u2/kjU1isK4XLYGZDKmZKvhCK WpjINlAT+XudpGjYh0WK8688tDOWPxcej563r9ZP+KzjvG88+wnWxAnG8SjMD40fwRoR 8fRYZjI9/vkxBMyXLFLIg0bnPeoFBQqd0qiboHaF1Y5jgIkKn6u0RQzWbPV9ePo5pcXG NAZA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WM0ZLVHvV+NZ5kwdSJi8dtI3pr22k4r3qhjNO/EWTSA=; fh=BpeH/FUAN0wxLMH3ClwVqRp0rua8Kbn4MIwmp4atozc=; b=oCNLrNBbvzOpe9uMNG5nwqoRb+F7XZHD1Dri3uxMgEbD3b8HHlem4twVqJEyXwZ8Dx /2CrdI6xDDmS7G5vSnqTZxfMli6+dShiIQnPG/8FK75bcLpydiXIoxtDLc5Tpn4KMfB7 7g3E3FqLeaQOkjTrWXtCayBFWcF5Y/+oPImGr9vIUHBz0u5NNiDp4P1IDH5PKuHRUnfa S/0e+37RO2bO4BdPstWKAZiEo1QzIiQg3GgLtvsxC2dqDuDIdGyKisnVwTWTBxidgqyS J5XX1a9yycDlnC/dPRbxr6nSydoapJ/UY4OHWoJoadZ+0cu304Ax+S6JVDhRWScErblm q6vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CveTnsj9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id ck12-20020a056a00328c00b00690ff5e479fsi3306781pfb.332.2023.09.22.01.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 01:44:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CveTnsj9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3C5DD81BB09F; Thu, 21 Sep 2023 14:48:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232395AbjIUVsM (ORCPT + 29 others); Thu, 21 Sep 2023 17:48:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232350AbjIUVrx (ORCPT ); Thu, 21 Sep 2023 17:47:53 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CFD94A30D; Thu, 21 Sep 2023 14:35:03 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1c1ff5b741cso13285985ad.2; Thu, 21 Sep 2023 14:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695332102; x=1695936902; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WM0ZLVHvV+NZ5kwdSJi8dtI3pr22k4r3qhjNO/EWTSA=; b=CveTnsj9DgdX0IvVAd/Bb1+fejPx7IXqzj9t9OUJzsz7apkIEn1A4BUB2ww+apo0MP oHLk71z8LRrWMdN1BJ2X1LK4qhabeKSaDvePsZoESFnrUCV3uHWiNMNkHD+3nxXH+c9J HasxVhF3glnfYhNtUVkEhzXtLHGmnycrIX1iiZZG7LfveA9WjsuXCNSMuHGMBD5ghopk /jA7Dh+fWcBriymSsarTPZsDcKNAFPrSttmX1beIbSyjQzhDrj/Yn5UEeivbanMNYPJB L2holVT6P1kPak8uWYpn4c4bw9mKQU3jjXoycvrQVTGAPibb5Aa/i+gCJwrWr8sV3Jmy MhxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695332102; x=1695936902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WM0ZLVHvV+NZ5kwdSJi8dtI3pr22k4r3qhjNO/EWTSA=; b=DhC+F5MXg2Sp2boO3Ily1mRCm9gZFX8xbNOQ3eS9GbfC7kVGAxIsCdwJEizcVuz144 iAGBZolhUeKLKYmfUYk7IAQzUAsDacu1s6572Qtyx8/BHPHqzyCMLK69D37hHCHnhwsJ oU12YmZ30oCMUULRU3zA97J7+po2lF190EMwXX5CgNFieKx52bsMAeEfSawb37joTfSH Vze1EEDFM56xUy+TPIQiK6kuw/KJXIPwjXFqd8ltimCVNmhkjQ0rM2Eijor+LZJMGjLJ M+kfJZotyrlujnBXSzTJPmEYBfZtQItmD74+f0sYhp/HYOUR5jiO2R5/Pxdh+9HU5MCW nr6w== X-Gm-Message-State: AOJu0YzRccUwu3EpZSLqhnKZlGgklXaeC4ix4zjQvjB/pZQciiyb/X9M avtYXEigCjMRpfh/ooLFlvKPbebpGZI= X-Received: by 2002:a17:903:24e:b0:1bc:6799:3f6c with SMTP id j14-20020a170903024e00b001bc67993f6cmr7768970plh.35.1695332102483; Thu, 21 Sep 2023 14:35:02 -0700 (PDT) Received: from wedsonaf-dev.home.lan ([189.124.190.154]) by smtp.googlemail.com with ESMTPSA id jc6-20020a17090325c600b001c567dcf22dsm2007981plb.281.2023.09.21.14.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 14:35:02 -0700 (PDT) From: Wedson Almeida Filho To: rust-for-linux@vger.kernel.org Cc: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?B?= =?utf-8?q?j=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , linux-kernel@vger.kernel.org, Wedson Almeida Filho Subject: [PATCH 1/2] rust: arc: rename `ArcInner` to `WithRef` Date: Thu, 21 Sep 2023 18:34:39 -0300 Message-Id: <20230921213440.202017-2-wedsonaf@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921213440.202017-1-wedsonaf@gmail.com> References: <20230921213440.202017-1-wedsonaf@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, 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 lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 21 Sep 2023 14:48:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777726686355601076 X-GMAIL-MSGID: 1777726686355601076 From: Wedson Almeida Filho This is in preparation for removing `ArcBorrow` and making `WithRef` public. This is a pure name change with no functional changes intended. Suggested-by: Björn Roy Baron Signed-off-by: Wedson Almeida Filho Reviewed-by: Finn Behrens Reviewed-by: Benno Lossin Reviewed-by: Alice Ryhl Reviewed-by: Martin Rodriguez Reboredo Reviewed-by: Gary Guo --- rust/kernel/sync/arc.rs | 20 ++++++++++---------- rust/kernel/sync/arc/std_vendor.rs | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs index 3d496391a9bd..86bff1e0002c 100644 --- a/rust/kernel/sync/arc.rs +++ b/rust/kernel/sync/arc.rs @@ -126,13 +126,13 @@ /// # Ok::<(), Error>(()) /// ``` pub struct Arc { - ptr: NonNull>, - _p: PhantomData>, + ptr: NonNull>, + _p: PhantomData>, } #[pin_data] #[repr(C)] -struct ArcInner { +struct WithRef { refcount: Opaque, data: T, } @@ -164,7 +164,7 @@ impl Arc { /// Constructs a new reference counted instance of `T`. pub fn try_new(contents: T) -> Result { // INVARIANT: The refcount is initialised to a non-zero value. - let value = ArcInner { + let value = WithRef { // SAFETY: There are no safety requirements for this FFI call. refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), data: contents, @@ -201,13 +201,13 @@ pub fn init(init: impl Init) -> error::Result } impl Arc { - /// Constructs a new [`Arc`] from an existing [`ArcInner`]. + /// Constructs a new [`Arc`] from an existing [`WithRef`]. /// /// # 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>) -> Self { + unsafe fn from_inner(inner: NonNull>) -> Self { // INVARIANT: By the safety requirements, the invariants hold. Arc { ptr: inner, @@ -243,7 +243,7 @@ fn into_foreign(self) -> *const core::ffi::c_void { unsafe fn borrow<'a>(ptr: *const core::ffi::c_void) -> ArcBorrow<'a, T> { // SAFETY: By the safety requirement of this function, we know that `ptr` came from // a previous call to `Arc::into_foreign`. - let inner = NonNull::new(ptr as *mut ArcInner).unwrap(); + let inner = NonNull::new(ptr as *mut WithRef).unwrap(); // SAFETY: The safety requirements of `from_foreign` ensure that the object remains alive // for the lifetime of the returned value. @@ -376,7 +376,7 @@ fn from(item: Pin>) -> Self { /// # Ok::<(), Error>(()) /// ``` pub struct ArcBorrow<'a, T: ?Sized + 'a> { - inner: NonNull>, + inner: NonNull>, _p: PhantomData<&'a ()>, } @@ -406,7 +406,7 @@ impl ArcBorrow<'_, T> { /// Callers must ensure the following for the lifetime of the returned [`ArcBorrow`] instance: /// 1. That `inner` remains valid; /// 2. That no mutable references to `inner` are created. - unsafe fn new(inner: NonNull>) -> Self { + unsafe fn new(inner: NonNull>) -> Self { // INVARIANT: The safety requirements guarantee the invariants. Self { inner, @@ -526,7 +526,7 @@ pub fn try_new(value: T) -> Result { /// Tries to allocate a new [`UniqueArc`] instance whose contents are not initialised yet. pub fn try_new_uninit() -> Result>, AllocError> { // INVARIANT: The refcount is initialised to a non-zero value. - let inner = Box::try_init::(try_init!(ArcInner { + let inner = Box::try_init::(try_init!(WithRef { // SAFETY: There are no safety requirements for this FFI call. refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), data <- init::uninit::(), diff --git a/rust/kernel/sync/arc/std_vendor.rs b/rust/kernel/sync/arc/std_vendor.rs index a66a0c2831b3..4b30e5597ba5 100644 --- a/rust/kernel/sync/arc/std_vendor.rs +++ b/rust/kernel/sync/arc/std_vendor.rs @@ -5,7 +5,7 @@ //! "Apache-2.0 OR MIT" and adapted for kernel use. For copyright details, //! see . -use crate::sync::{arc::ArcInner, Arc}; +use crate::sync::{arc::WithRef, Arc}; use core::any::Any; impl Arc { @@ -17,7 +17,7 @@ pub fn downcast(self) -> core::result::Result, Self> if (*self).is::() { // SAFETY: We have just checked that the type is correct, so we can cast the pointer. unsafe { - let ptr = self.ptr.cast::>(); + let ptr = self.ptr.cast::>(); core::mem::forget(self); Ok(Arc::from_inner(ptr)) }