From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10FF4C43458 for ; Sun, 28 Jun 2026 09:52:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD5976B0005; Sun, 28 Jun 2026 05:52:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A5E836B0088; Sun, 28 Jun 2026 05:52:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8FF406B008A; Sun, 28 Jun 2026 05:52:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 57EC96B0005 for ; Sun, 28 Jun 2026 05:52:27 -0400 (EDT) Received: from smtpin15.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B5E13A031D for ; Sun, 28 Jun 2026 09:52:26 +0000 (UTC) X-FDA: 84928856292.15.2FB9CE5 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf04.hostedemail.com (Postfix) with ESMTP id 1226E40007 for ; Sun, 28 Jun 2026 09:52:24 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of szehawong@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=szehawong@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=trevrosa.dev (policy=none) ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1782640345; b=B/dAIwiwO0ZGbYy52qlaGYVb7xM06MRzoyRRz+cCpl0C/WXDt2RCNvnDhiB5fTZ2sfYSz2 mVkJKduufSnjL/icn+S6/3pu82IJsjvfJ1EzdfA8CUOPGOid5EO1XMUDYEYlAWk4Nc8sFq Y0YJhvoLPvu/e42NdamhI21EWNy2xXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1782640345; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=lDgOeoLgb3Wg1d9q9LSag5G1FEbopPLBrrQaAkjZfVw=; b=0JSRT5yVg3esfkbrSNiS6/gQKEWQphhzdNePgPf2IuXm1hxkmpmIQmrGSHgdQ6lN51yvY5 Cagvf8NZBtoWyGK1NMVbspmLZVYDrvpwZC+58QLf6na9aCJ2qmPZWtGAB6n6BhS2DLGCsM dqsSyh/LaCoRqcW0MJ8dyylgjko2yBc= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of szehawong@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=szehawong@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=trevrosa.dev (policy=none) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2c9e89fded0so1908005ad.2 for ; Sun, 28 Jun 2026 02:52:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782640344; x=1783245144; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lDgOeoLgb3Wg1d9q9LSag5G1FEbopPLBrrQaAkjZfVw=; b=Hk7fae5jILN9h3+bDhFXY9zxELv7hluC9XLzYjRZMCDcaEYbKEIOw4x3lGMxpzWic/ B03Zzg4tjY8rd7kplU5YxidZAGZ19HIIdlTN49MSs8cucXzpfYxxvLNTx58BXe4Jsjyu J25DPnqSovtbgx7h/vyexxMJy5MWKOWfvcnrz6Uh5ChU6tSZYItJiT63vCIp5CtFWwm4 3xheVLkv8wSdIn5bEN6QyRP5LFxfELEUZfWR9wvwqdcxOkoiO/cr9HSmmt+z9oMvY76d NVmWIXv99EH2M2Id9XM02VGNmZej8bOnL2lDwQFH48QmuFUCkzP2bHJCvsk3CXVzoc/1 rlUQ== X-Forwarded-Encrypted: i=1; AHgh+RrAkA2qlz0I+OQmkGNjJn0A4Tw+JPCh1hrFYy98PMGh8keajqP6DaJiCr9pYl3T+qg4pxVZU1PjOg==@kvack.org X-Gm-Message-State: AOJu0YyZWWICBhHxIcf+4knBzFypwEKWmgSlD1wU1GDIcQbl+AXxwNw/ SYwdQni0ROeyYvPJYxELpRVt3Qt+iV2bT1NG8w+Su6l4uXR2rNIwphIJ X-Gm-Gg: AfdE7ckx4/ySzDiEAF/aIHUIhmqqtjXZgyjoKELVDYZmAmQRzTmRV4E4cQ8sqzoZOnQ CO2P0JrF8DCndTwCQTxbt2SahEdbwiOpE4WG6tfHHP1rluv6eRwvVe0/Lo3Ho1IPg3Y7Nxsne5T xzHj3n01rfFbyEh3+qonWnlabpAgfgtubkd4WLUshCnaog+O72tQNjY65F/gldFq+6ZGEoEBjPJ eMylO7dNc1RqHlGlzEhakAXQIFYh4CcEOAWY1z2QHe5mziRSyw/xOuM8dyktGmygUOI7tYhwLn5 51EMZ4Z7LqE44UPhFBwLMpuhTGb4yFtSRrSREu0xgRjUbOqlmhgm245fNoHciVpZd3oXpcUuOX5 K4lXbgvWsd0yNozUANPfsv7ZQAwWlpsiRyet/9TTtDSPBu0uXZz7lG7gmhU1BuP4+Q+2lk63kMJ M4T1DklmSvpxG5NStyjocuY5VMzxOZVP3tX51kJd8zME4PlJmGmQ== X-Received: by 2002:a17:903:19eb:b0:2c2:62ee:5a0d with SMTP id d9443c01a7336-2c7fc74ed9bmr130708665ad.14.1782640343700; Sun, 28 Jun 2026 02:52:23 -0700 (PDT) Received: from trevor.localdomain (n119236170163.netvigator.com. [119.236.170.163]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7f63b2339sm72101365ad.38.2026.06.28.02.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2026 02:52:23 -0700 (PDT) From: Trevor Chan To: gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org, ojeda@kernel.org, a.hindborg@kernel.org, paul@paul-moore.com, aliceryhl@google.com, airlied@gmail.com, simona@ffwll.ch, viro@zeniv.linux.org.uk, brauner@kernel.org, igor.korotin@linux.dev, vireshk@kernel.org, nm@ti.com, sboyd@kernel.org, m.wilczynski@samsung.com, boqun@kernel.org, gary@garyguo.net, axboe@kernel.dk, daniel.almeida@collabora.com, shankari.ak0208@gmail.com, lyude@redhat.com, j@jananu.net, lossin@kernel.org, acourbot@nvidia.com, markus.probst@posteo.de, driver-core@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-security-module@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-pm@vger.kernel.org, linux-pci@vger.kernel.org, linux-pwm@vger.kernel.org Cc: david.m.ertman@intel.com, iweiny@kernel.org, leon@kernel.org, bjorn3_gh@protonmail.com, tmgross@umich.edu, tamird@kernel.org, work@onurozkan.dev, sergeh@kernel.org, matthew.brost@intel.com, thomas.hellstrom@linux.intel.com, jack@suse.cz, ljs@kernel.org, liam@infradead.org, bhelgaas@google.com, kwilczynski@kernel.org, ptikhomirov@virtuozzo.com Subject: [PATCH v6] rust: aref: make `AlwaysRefCounted::inc_ref` an associated function Date: Sun, 28 Jun 2026 17:51:32 +0800 Message-ID: <20260628095132.47753-1-trev@trevrosa.dev> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1226E40007 X-Stat-Signature: jti8neo7i87zosfhedf4geku7tmt4wds X-Rspam-User: X-Rspamd-Server: rspam03 X-HE-Tag: 1782640344-21844 X-HE-Meta: U2FsdGVkX1/wf8zhBD0SSHlZ8Vj1piJ7dIPb3/mnMRq6N+Zst69aQjJu9RMeUxskTznPGoJpcHZZwaNNf59c037JTlhd9RnY2ir/SiUjoxndREyWrcPsY7Mx94IbDj7cepyVDH8yL1vQaqJh014YhZTXvHTqHjB5Z2A1hyRftN6fPHAfb3X9n0TsoTLyVi4Bgth+vVbVTm9yexMNXPdQbw4s1B9cxTkUTV5YK3LlgdZF7WjUBYlQJGV/8SAnh919A3B+P2D50z6nd+AYoxpBku5JmYoh/ZjZJzwsTRZuO5jqbZDKuDQYQEH9h3LYs44+dZlFbkECTchy6Np/x0m4JjGFgwtTuJR1t7qj9MBGWVsQ+ZlOaNGqiaffYzJZDPe+baxSlyleYvAbGSPERKd/zSU4CICGPIQBZtn4yRc3MS1ziCS1sP4JwYinabUPCc52szAJlfhVmZgVMgi6FFsuJJ/+73vmTCLpc/2I76re5SiCD+1VqtwodAu6dnZpFI+rWMLoBG0sz9H8vhu2hLZA5+S+Csl0DR/yMTLzffj5TbMzBhpTR/SV5D3DnWdI4KRb6By/QKq5AaTcjkZNlmpeKgBCyOsiCe//mSRaHc0XXsHbAciKa8cNlEBhobiKJBkO0tXG5R/SmptUafOtAspQj+wMipm8ug/v293WWnN4Q4TawJN7oFlezd4iBDixR8I+8L8B8OhCeQOKzSXpIoIIbZUDOUQC8Af109Zvir7uM3k/NTDMkTkOJfQ/qievPi7VbWI+uedE6xZjneoUBw7AlHOm45lL8YOflQRA0ctcAacRLSE1Cemo6XN1GCvo/gRLMf7m+9xwMrhNpy6bVigGj0F+BDF3ecX0paGBfEmgUXJKfe2Ops8wWxPze/7ZXu2tYdaQ/gmzVNjMchnCjs2rFVWp93UTSWewa7l2imfGXl9KkkRU+uSJgaxMRSlNNiQLXKtN5rNkA18KYUs/pev VUxTV2i/ QcB6xAE8SVFVCfoL+TcqDMr0RzIkQXIgffcqHsiqq7k776yGhIOybTZB4r+lUX7Ov1F4QRdzSVvO6ZkhKR64/D64IJAn5enn7FgHsmisCYdMhcDiZZhc2tFClkozUFGgp9Zl/C+RSoaKfTQuivTIfP1OYzrxwHaSlQlAGGfC6dLoYS40n9i57z5ldoFkyI6u9EcLSt9STIFGIV3hPsjgbQdu66D2PgGKV4V5gIJjT9VSTxeS1ilhZyBmhAbYnkJX9YHTN+yVK/6tObubkW0xP6ep1VROMXHzGnqjCvfN9v1Ldk3DZR9N2bvsPsAeqLKPMkr3a5ow1vSaMmZMvrtvfn8RM8yOBB+G/mnaPdK/TjMIAUCRMmR7TzjnKaS0yBnw2elLUOyJ/NFgWtncaqu44sXkIenZMpRgsUcwH8CJgvUBCzjdFjjVajRs/yFc/IXZZ3gqdHsaIPTQbVPvPHse5hsvPoKKDc5d54HEEu1c6VS5Epk3uRmCgnbeS7wvq2m2Zyh/H1+6Mfv3TReK01tUnp/yQXipibOI+/POkP7g6eo/ftNR7Tm0Lsk6TlVGWxAzALzSRwgp40mClvyugLa+FAmt9dA== Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: `AlwaysRefCounted::inc_ref` is a function that shouldn't be called lightly. To prevent accidentally calling it, change `inc_ref` to be an associated function. Modify all `AlwaysRefCounted` implementors to work with this change. Suggested-by: Benno Lossin Link: https://github.com/Rust-for-Linux/linux/issues/1177 Reviewed-by: Alice Ryhl Signed-off-by: Trevor Chan --- Changes in v2: - Don't word wrap the patch Changes in v3: - Make argument name of `Empty::inc_ref` consistent with `Empty::dec_ref` Changes in v4: - Rebase to new rust-next, change new implementors - Reword explanation for change in `AlwaysRefCounted::inc_ref` doc comment Changes in v5: - Change commit message to be imperative Changes in v6: - Change all the implementors --- rust/kernel/auxiliary.rs | 4 ++-- rust/kernel/block/mq/request.rs | 4 ++-- rust/kernel/cred.rs | 4 ++-- rust/kernel/device.rs | 4 ++-- rust/kernel/device/property.rs | 4 ++-- rust/kernel/drm/device.rs | 4 ++-- rust/kernel/drm/gem/mod.rs | 4 ++-- rust/kernel/drm/gpuvm/mod.rs | 4 ++-- rust/kernel/drm/gpuvm/vm_bo.rs | 4 ++-- rust/kernel/fs/file.rs | 8 ++++---- rust/kernel/i2c.rs | 8 ++++---- rust/kernel/mm.rs | 8 ++++---- rust/kernel/mm/mmput_async.rs | 4 ++-- rust/kernel/opp.rs | 4 ++-- rust/kernel/pci.rs | 4 ++-- rust/kernel/pid_namespace.rs | 4 ++-- rust/kernel/platform.rs | 4 ++-- rust/kernel/pwm.rs | 2 +- rust/kernel/sync/aref.rs | 11 +++++++---- rust/kernel/task.rs | 4 ++-- rust/kernel/usb.rs | 8 ++++---- 21 files changed, 54 insertions(+), 51 deletions(-) diff --git a/rust/kernel/auxiliary.rs b/rust/kernel/auxiliary.rs index c42928d5a239..75a61b51cf79 100644 --- a/rust/kernel/auxiliary.rs +++ b/rust/kernel/auxiliary.rs @@ -345,9 +345,9 @@ unsafe impl device::AsBusDevice for Device // SAFETY: Instances of `Device` are always reference-counted. unsafe impl crate::sync::aref::AlwaysRefCounted for Device { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is non-zero. - unsafe { bindings::get_device(self.as_ref().as_raw()) }; + unsafe { bindings::get_device(obj.as_ref().as_raw()) }; } unsafe fn dec_ref(obj: NonNull) { diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/request.rs index ce3e30c81cb5..f41d01ea4595 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -234,8 +234,8 @@ unsafe impl Sync for Request {} // keeps the object alive in memory at least until a matching reference count // decrement is executed. unsafe impl AlwaysRefCounted for Request { - fn inc_ref(&self) { - self.wrapper_ref().refcount().inc(); + fn inc_ref(obj: &Self) { + obj.wrapper_ref().refcount().inc(); } unsafe fn dec_ref(obj: core::ptr::NonNull) { diff --git a/rust/kernel/cred.rs b/rust/kernel/cred.rs index ffa156b9df37..d53cbc792fa3 100644 --- a/rust/kernel/cred.rs +++ b/rust/kernel/cred.rs @@ -78,9 +78,9 @@ pub fn euid(&self) -> Kuid { // SAFETY: The type invariants guarantee that `Credential` is always ref-counted. unsafe impl AlwaysRefCounted for Credential { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference means that the refcount is nonzero. - unsafe { bindings::get_cred(self.0.get()) }; + unsafe { bindings::get_cred(obj.0.get()) }; } #[inline] diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 645afc49a27d..ec44dcc405d5 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -449,9 +449,9 @@ pub fn name(&self) -> &CStr { // SAFETY: Instances of `Device` are always reference-counted. unsafe impl crate::sync::aref::AlwaysRefCounted for Device { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is non-zero. - unsafe { bindings::get_device(self.as_raw()) }; + unsafe { bindings::get_device(obj.as_raw()) }; } unsafe fn dec_ref(obj: ptr::NonNull) { diff --git a/rust/kernel/device/property.rs b/rust/kernel/device/property.rs index 5aead835fbbc..c39ccc1458b9 100644 --- a/rust/kernel/device/property.rs +++ b/rust/kernel/device/property.rs @@ -361,10 +361,10 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { // SAFETY: Instances of `FwNode` are always reference-counted. unsafe impl crate::sync::aref::AlwaysRefCounted for FwNode { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the // refcount is non-zero. - unsafe { bindings::fwnode_handle_get(self.as_raw()) }; + unsafe { bindings::fwnode_handle_get(obj.as_raw()) }; } unsafe fn dec_ref(obj: ptr::NonNull) { diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs index 477cf771fb10..0c70ec010bd9 100644 --- a/rust/kernel/drm/device.rs +++ b/rust/kernel/drm/device.rs @@ -363,9 +363,9 @@ fn deref(&self) -> &Self::Target { // SAFETY: DRM device objects are always reference counted and the get/put functions // satisfy the requirements. unsafe impl AlwaysRefCounted for Device { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is non-zero. - unsafe { bindings::drm_dev_get(self.as_raw()) }; + unsafe { bindings::drm_dev_get(obj.as_raw()) }; } unsafe fn dec_ref(obj: NonNull) { diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs index c8b66d816871..ee9e412066ab 100644 --- a/rust/kernel/drm/gem/mod.rs +++ b/rust/kernel/drm/gem/mod.rs @@ -52,10 +52,10 @@ unsafe impl $( <$( $tparam_id ),+> )? $crate::sync::aref::AlwaysRefCounted for $ Self: IntoGEMObject, $( $( $bind_param : $bind_trait ),+ )? { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is // non-zero. - unsafe { bindings::drm_gem_object_get(self.as_raw()) }; + unsafe { bindings::drm_gem_object_get(obj.as_raw()) }; } unsafe fn dec_ref(obj: core::ptr::NonNull) { diff --git a/rust/kernel/drm/gpuvm/mod.rs b/rust/kernel/drm/gpuvm/mod.rs index ae58f6f667c1..1777f9cbd2ca 100644 --- a/rust/kernel/drm/gpuvm/mod.rs +++ b/rust/kernel/drm/gpuvm/mod.rs @@ -80,9 +80,9 @@ unsafe impl Sync for GpuVm {} // SAFETY: By type invariants, the allocation is managed by the refcount in `self.vm`. unsafe impl AlwaysRefCounted for GpuVm { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: By type invariants, the allocation is managed by the refcount in `self.vm`. - unsafe { bindings::drm_gpuvm_get(self.vm.get()) }; + unsafe { bindings::drm_gpuvm_get(obj.vm.get()) }; } unsafe fn dec_ref(obj: NonNull) { diff --git a/rust/kernel/drm/gpuvm/vm_bo.rs b/rust/kernel/drm/gpuvm/vm_bo.rs index c064ac63897b..250e9339b30e 100644 --- a/rust/kernel/drm/gpuvm/vm_bo.rs +++ b/rust/kernel/drm/gpuvm/vm_bo.rs @@ -21,9 +21,9 @@ pub struct GpuVmBo { // SAFETY: By type invariants, the allocation is managed by the refcount in `self.inner`. unsafe impl AlwaysRefCounted for GpuVmBo { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: By type invariants, the allocation is managed by the refcount in `self.inner`. - unsafe { bindings::drm_gpuvm_bo_get(self.inner.get()) }; + unsafe { bindings::drm_gpuvm_bo_get(obj.inner.get()) }; } unsafe fn dec_ref(obj: NonNull) { diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs index 23ee689bd240..8e5967afcd11 100644 --- a/rust/kernel/fs/file.rs +++ b/rust/kernel/fs/file.rs @@ -199,9 +199,9 @@ unsafe impl Sync for File {} // makes `ARef` own a normal refcount. unsafe impl AlwaysRefCounted for File { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference means that the refcount is nonzero. - unsafe { bindings::get_file(self.as_ptr()) }; + unsafe { bindings::get_file(obj.as_ptr()) }; } #[inline] @@ -235,9 +235,9 @@ pub struct LocalFile { // makes `ARef` own a normal refcount. unsafe impl AlwaysRefCounted for LocalFile { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference means that the refcount is nonzero. - unsafe { bindings::get_file(self.as_ptr()) }; + unsafe { bindings::get_file(obj.as_ptr()) }; } #[inline] diff --git a/rust/kernel/i2c.rs b/rust/kernel/i2c.rs index 624b971ca8b0..1a9882a64c4b 100644 --- a/rust/kernel/i2c.rs +++ b/rust/kernel/i2c.rs @@ -425,9 +425,9 @@ pub fn get(index: i32) -> Result> { // SAFETY: Instances of `I2cAdapter` are always reference-counted. unsafe impl AlwaysRefCounted for I2cAdapter { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is non-zero. - unsafe { bindings::i2c_get_adapter(self.index()) }; + unsafe { bindings::i2c_get_adapter(obj.index()) }; } unsafe fn dec_ref(obj: NonNull) { @@ -501,9 +501,9 @@ unsafe impl device::AsBusDevice for I2cClient) { diff --git a/rust/kernel/mm.rs b/rust/kernel/mm.rs index 4764d7b68f2a..c955cbd884b8 100644 --- a/rust/kernel/mm.rs +++ b/rust/kernel/mm.rs @@ -57,9 +57,9 @@ unsafe impl Sync for Mm {} // SAFETY: By the type invariants, this type is always refcounted. unsafe impl AlwaysRefCounted for Mm { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The pointer is valid since self is a reference. - unsafe { bindings::mmgrab(self.as_raw()) }; + unsafe { bindings::mmgrab(obj.as_raw()) }; } #[inline] @@ -93,9 +93,9 @@ unsafe impl Sync for MmWithUser {} // SAFETY: By the type invariants, this type is always refcounted. unsafe impl AlwaysRefCounted for MmWithUser { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The pointer is valid since self is a reference. - unsafe { bindings::mmget(self.as_raw()) }; + unsafe { bindings::mmget(obj.as_raw()) }; } #[inline] diff --git a/rust/kernel/mm/mmput_async.rs b/rust/kernel/mm/mmput_async.rs index b8d2f051225c..7df40777654c 100644 --- a/rust/kernel/mm/mmput_async.rs +++ b/rust/kernel/mm/mmput_async.rs @@ -36,9 +36,9 @@ unsafe impl Sync for MmWithUserAsync {} // SAFETY: By the type invariants, this type is always refcounted. unsafe impl AlwaysRefCounted for MmWithUserAsync { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The pointer is valid since self is a reference. - unsafe { bindings::mmget(self.as_raw()) }; + unsafe { bindings::mmget(obj.as_raw()) }; } #[inline] diff --git a/rust/kernel/opp.rs b/rust/kernel/opp.rs index 62e44676125d..84802f22b652 100644 --- a/rust/kernel/opp.rs +++ b/rust/kernel/opp.rs @@ -1043,9 +1043,9 @@ unsafe impl Sync for OPP {} /// SAFETY: The type invariants guarantee that [`OPP`] is always refcounted. unsafe impl AlwaysRefCounted for OPP { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference means that the refcount is nonzero. - unsafe { bindings::dev_pm_opp_get(self.0.get()) }; + unsafe { bindings::dev_pm_opp_get(obj.0.get()) }; } #[inline] diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 5071cae6543f..0f16cf0da3d7 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -482,9 +482,9 @@ impl<'a> crate::dma::Device<'a> for Device> {} // SAFETY: Instances of `Device` are always reference-counted. unsafe impl crate::sync::aref::AlwaysRefCounted for Device { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is non-zero. - unsafe { bindings::pci_dev_get(self.as_raw()) }; + unsafe { bindings::pci_dev_get(obj.as_raw()) }; } unsafe fn dec_ref(obj: NonNull) { diff --git a/rust/kernel/pid_namespace.rs b/rust/kernel/pid_namespace.rs index 979a9718f153..381c9f980b1f 100644 --- a/rust/kernel/pid_namespace.rs +++ b/rust/kernel/pid_namespace.rs @@ -43,9 +43,9 @@ pub unsafe fn from_ptr<'a>(ptr: *const bindings::pid_namespace) -> &'a Self { // SAFETY: Instances of `PidNamespace` are always reference-counted. unsafe impl AlwaysRefCounted for PidNamespace { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference means that the refcount is nonzero. - unsafe { bindings::get_pid_ns(self.as_ptr()) }; + unsafe { bindings::get_pid_ns(obj.as_ptr()) }; } #[inline] diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 9b362e0495d3..85068ae5a405 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -519,9 +519,9 @@ impl<'a> crate::dma::Device<'a> for Device> {} // SAFETY: Instances of `Device` are always reference-counted. unsafe impl crate::sync::aref::AlwaysRefCounted for Device { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference guarantees that the refcount is non-zero. - unsafe { bindings::get_device(self.as_ref().as_raw()) }; + unsafe { bindings::get_device(obj.as_ref().as_raw()) }; } unsafe fn dec_ref(obj: NonNull) { diff --git a/rust/kernel/pwm.rs b/rust/kernel/pwm.rs index 6c9d667009ef..c95b442a972e 100644 --- a/rust/kernel/pwm.rs +++ b/rust/kernel/pwm.rs @@ -631,7 +631,7 @@ pub fn new<'a>( // SAFETY: Implements refcounting for `Chip` using the embedded `struct device`. unsafe impl AlwaysRefCounted for Chip { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: `self.0.get()` points to a valid `pwm_chip` because `self` exists. // The embedded `dev` is valid. `get_device` increments its refcount. unsafe { bindings::get_device(&raw mut (*self.0.get()).dev) }; diff --git a/rust/kernel/sync/aref.rs b/rust/kernel/sync/aref.rs index b721b2e00b98..42e11458b77c 100644 --- a/rust/kernel/sync/aref.rs +++ b/rust/kernel/sync/aref.rs @@ -44,7 +44,10 @@ /// alive.) pub unsafe trait AlwaysRefCounted { /// Increments the reference count on the object. - fn inc_ref(&self); + /// + /// This function should not be called accidentally; a type might declare their own `inc_ref` + /// function and it shouldn't be confused with this one. + fn inc_ref(obj: &Self); /// Decrements the reference count on the object. /// @@ -126,7 +129,7 @@ pub unsafe fn from_raw(ptr: NonNull) -> Self { /// /// # // SAFETY: TODO. /// unsafe impl AlwaysRefCounted for Empty { - /// fn inc_ref(&self) {} + /// fn inc_ref(obj: &Self) {} /// unsafe fn dec_ref(_obj: NonNull) {} /// } /// @@ -145,7 +148,7 @@ pub fn into_raw(me: Self) -> NonNull { impl Clone for ARef { fn clone(&self) -> Self { - self.inc_ref(); + T::inc_ref(self); // SAFETY: We just incremented the refcount above. unsafe { Self::from_raw(self.ptr) } } @@ -162,7 +165,7 @@ fn deref(&self) -> &Self::Target { impl From<&T> for ARef { fn from(b: &T) -> Self { - b.inc_ref(); + T::inc_ref(b); // SAFETY: We just incremented the refcount above. unsafe { Self::from_raw(NonNull::from(b)) } } diff --git a/rust/kernel/task.rs b/rust/kernel/task.rs index 38273f4eedb5..a7711e1558c2 100644 --- a/rust/kernel/task.rs +++ b/rust/kernel/task.rs @@ -349,9 +349,9 @@ pub fn group_leader(&self) -> &Task { // SAFETY: The type invariants guarantee that `Task` is always refcounted. unsafe impl crate::sync::aref::AlwaysRefCounted for Task { #[inline] - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The existence of a shared reference means that the refcount is nonzero. - unsafe { bindings::get_task_struct(self.as_ptr()) }; + unsafe { bindings::get_task_struct(obj.as_ptr()) }; } #[inline] diff --git a/rust/kernel/usb.rs b/rust/kernel/usb.rs index 7aff0c82d0af..c039059c1891 100644 --- a/rust/kernel/usb.rs +++ b/rust/kernel/usb.rs @@ -393,11 +393,11 @@ fn as_ref(&self) -> &Device { // SAFETY: Instances of `Interface` are always reference-counted. unsafe impl AlwaysRefCounted for Interface { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The invariants of `Interface` guarantee that `self.as_raw()` // returns a valid `struct usb_interface` pointer, for which we will // acquire a new refcount. - unsafe { bindings::usb_get_intf(self.as_raw()) }; + unsafe { bindings::usb_get_intf(obj.as_raw()) }; } unsafe fn dec_ref(obj: NonNull) { @@ -444,11 +444,11 @@ fn as_raw(&self) -> *mut bindings::usb_device { // SAFETY: Instances of `Device` are always reference-counted. unsafe impl AlwaysRefCounted for Device { - fn inc_ref(&self) { + fn inc_ref(obj: &Self) { // SAFETY: The invariants of `Device` guarantee that `self.as_raw()` // returns a valid `struct usb_device` pointer, for which we will // acquire a new refcount. - unsafe { bindings::usb_get_dev(self.as_raw()) }; + unsafe { bindings::usb_get_dev(obj.as_raw()) }; } unsafe fn dec_ref(obj: NonNull) { -- 2.47.3