From patchwork Tue Mar 25 20:07:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029466 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F2F6265CB9; Tue, 25 Mar 2025 20:07:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933273; cv=none; b=HCuEA5rCb0O7q7SSbmGaxMZpDLLBe0kUYPeQwdvJBkg6DoKtBojg0rdBa2HY5nthQvlG3EhjCGbmDIkkrkaCkoO8y9psOXT2FzasHAYgRnAbv9rgU+tmhlLJRXakZl1li9DAIBe1OfL8pD/SdhzT8uKVHBCYL03wApIFYAMNWzM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933273; c=relaxed/simple; bh=uPLPWLWTd7l7BqiDQb2Zl5Fp/2o2CJiW7477tqQuo5g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=obqFxNBK1LdPdGiRC8rwSMBcWs9z5jkPXOCXPuy0fP92QjatkK8FZAhNWBtXjsIJFJuQGIuDx1kSnN4Z9EK62InUlju/2S7EW2wQw5WznrFM9bvyozDt3zawJK9/lUpQoYrqXh07QQtIoh/w9bsZlbb5kCQ7sNu69+5cuNXPI0Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=llh+shr9; arc=none smtp.client-ip=209.85.219.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="llh+shr9" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6e8ec399427so47545136d6.2; Tue, 25 Mar 2025 13:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933270; x=1743538070; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vUyKcLlRsxCPf3w4Hv0sykJZjBz7c3E/OZe1MEqXL5I=; b=llh+shr9QkgUpmho4YsxLcjX/Tu914pYUxe+r+y0gOpMEQBISkEYbvV6Am/fkacivG qTCfEOHweHgEmca9Jtq402iQ4DZWAFLlnlNbjaW3Bq+XsKw/5yQbg5fI9TBd6qGA5O5H Rx92xtFG28FusJo1NDeWseCwEBFBrsefzkxrwlN6Pp4XKK2lifpk+QLcHj5ze4C3YZMs Ps4yn18F442GoZOo9EFJvGx2wafrOUC3PsTTQDkiNtoUrv4vf2XbwftdMXF9Bx88wG3D kSRHf2k13FTMsvYTviD2xC3SisKdNQFmwXQ95LaOe3MB6AUOpu3TJd8HHo4F9lH46CGe LhWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933270; x=1743538070; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vUyKcLlRsxCPf3w4Hv0sykJZjBz7c3E/OZe1MEqXL5I=; b=E8L/Acie6Vrfwf6So4yU21OEe8LdBOMO6qJVHF/Ed6CdGH3meNM0icOvdjomXaaSTx N4ErJdKJRajkIJaIfJVXAApXd55vWCEvgorXtqF3EmMw0A/y9YbsuUtpcQkP8fdSFH6Y Wv4tty1QG7wzb1//S3tGIOR09v+hCkGGoH84edC+PTTQ6kybtK2sqFxjExZ6AZ7leeyf 9LM12YyyjMxBJ1SiZJcHIiWm1Gtwr4jm9uafypkdqtnpzwvCtPBs/01XYKvTx8PE4IB2 +OEDSrM1vDoWVp+uMLUEBfAETDtMNDhQzumCbH+c/kTNIfJ3AQTsWh7OMid/nmPh57+A V/YA== X-Forwarded-Encrypted: i=1; AJvYcCUBsghjhcao84M8e09LwBLSw+wsK8gQT/8fJxt/UwQtmFhSMf0rRGAYKHo6NIQsu53Mv9oN+WebbfY+@vger.kernel.org, AJvYcCVC4/ZJZ3N/a+nWATizccNYNLgGGsnCORTKCQRAwTFJp68YLSDRtvCmP+W4wNQwjTuNkpWd1UB7@vger.kernel.org, AJvYcCVXAT5Fh0UsVYZdQ6SOjgk6BYyi8rcBkxz0KwLXpM6UeP3+gnnxZvUgzduzEh9MqIydEO07vJLYmK6j3RGu4Gc=@vger.kernel.org, AJvYcCVuji+lAONPF3oBuEVHjEby9c1xfm6Ml4CaIkIbG9Y8iuS5sVH1n35PC1omlbHWzKQiOpg2+vPwhDzB61K/Brdr@vger.kernel.org, AJvYcCWCzb7ZJijTbNc0uXeoswmrYlgfy0n5E0uemrI/ablov/xhCllNeFgZRLNVhHIKch7M85//aiy4X8lJtoTJ@vger.kernel.org, AJvYcCWnIjF0tYgwH4WF65yOERi895Q26iK6AizFK29/xOOJEMGCjuOtY5g8Falf5hJxJ1wsX77LdNuLbCco@vger.kernel.org, AJvYcCXaO1rw9pxJ58mlW1pJU4yX5XITG5KND4Av2REXcDz+u2rqqIGDvcvVD5jVIUgnqMuT8Yd+xT5rBVGHlV0=@vger.kernel.org X-Gm-Message-State: AOJu0YwjFti8u1X3ygiNQMM/6QsF/M+J7KkCtqqec/IrNxvFqBgCNIQm 34NjoTfEU1tFy252dq8hNoz0FY/dJlCNXTQHfMe1ZH2fFWTuBl4N X-Gm-Gg: ASbGncs32mvEPi84FcucsUm0hz2sSK5bqXe7YyKtXbZZp5owkHh29DeHhrOmgMM/B0M UmIU7VCVMD9S7cIFOkydx5KMz3/PGG6UBA7fGf6C5SQCSTjeURCLtmFP0stlqhDDwLu+/PmRJr+ uPyjdlOWjk15a2c6WyF/XYPDagzf0oY0WoHhtvULon8IQQ4h/+eby01dX3cTqbrgnQHKN65mMhy harjTISA9DCDIxvx0edvDYM+ajE/Xwr7PcztrpKNP1qbuVArubNw9TKej0mUlD96BCfpfYigupe q5PZ0kBv7ELqgLZ1/0iWi5HWG9MYez0BCsgTrgNmawqSgbSllFrc5phfzMTRi4XnbHXW35+HFbv F38amQ9ew5wEHcv/+vu+2AuQV+WpZ2f9sys1ghAVcOcA5/uUzatXPPQ== X-Google-Smtp-Source: AGHT+IF0FEVjkmBVxSw4zx3ID9z15/27aOJZzeAhYx7Krhmei89O1rW0ABUkTs86J2nx907JKAmhLQ== X-Received: by 2002:a05:6214:4007:b0:6e8:9866:7398 with SMTP id 6a1803df08f44-6eb3f2e5534mr243298056d6.22.1742933269992; Tue, 25 Mar 2025 13:07:49 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:07:49 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:41 -0400 Subject: [PATCH v7 1/7] rust: retain pointer mut-ness in `container_of!` Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-1-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Avoid casting the input pointer to `*const _`, allowing the output pointer to be `*mut` if the input is `*mut`. This allows a number of `*const` to `*mut` conversions to be removed at the cost of slightly worse ergonomics when the macro is used with a reference rather than a pointer; the only example of this was in the macro's own doctest. Reviewed-by: Benno Lossin Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein --- rust/kernel/lib.rs | 5 ++--- rust/kernel/pci.rs | 2 +- rust/kernel/platform.rs | 2 +- rust/kernel/rbtree.rs | 23 ++++++++++------------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index ba0f3b0297b2..cffa0d837f06 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -190,7 +190,7 @@ fn panic(info: &core::panic::PanicInfo<'_>) -> ! { /// } /// /// let test = Test { a: 10, b: 20 }; -/// let b_ptr = &test.b; +/// let b_ptr: *const _ = &test.b; /// // SAFETY: The pointer points at the `b` field of a `Test`, so the resulting pointer will be /// // in-bounds of the same allocation as `b_ptr`. /// let test_alias = unsafe { container_of!(b_ptr, Test, b) }; @@ -199,9 +199,8 @@ fn panic(info: &core::panic::PanicInfo<'_>) -> ! { #[macro_export] macro_rules! container_of { ($ptr:expr, $type:ty, $($f:tt)*) => {{ - let ptr = $ptr as *const _ as *const u8; let offset: usize = ::core::mem::offset_of!($type, $($f)*); - ptr.sub(offset) as *const $type + $ptr.byte_sub(offset).cast::<$type>() }} } diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index f7b2743828ae..271a7690a9a0 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -364,7 +364,7 @@ pub unsafe fn from_dev(dev: ARef) -> Self { fn as_raw(&self) -> *mut bindings::pci_dev { // SAFETY: By the type invariant `self.0.as_raw` is a pointer to the `struct device` // embedded in `struct pci_dev`. - unsafe { container_of!(self.0.as_raw(), bindings::pci_dev, dev) as _ } + unsafe { container_of!(self.0.as_raw(), bindings::pci_dev, dev) } } /// Returns the PCI vendor ID. diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 1297f5292ba9..84a4ecc642a1 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -189,7 +189,7 @@ unsafe fn from_dev(dev: ARef) -> Self { fn as_raw(&self) -> *mut bindings::platform_device { // SAFETY: By the type invariant `self.0.as_raw` is a pointer to the `struct device` // embedded in `struct platform_device`. - unsafe { container_of!(self.0.as_raw(), bindings::platform_device, dev) }.cast_mut() + unsafe { container_of!(self.0.as_raw(), bindings::platform_device, dev) } } } diff --git a/rust/kernel/rbtree.rs b/rust/kernel/rbtree.rs index 5246b2c8a4ff..8d978c896747 100644 --- a/rust/kernel/rbtree.rs +++ b/rust/kernel/rbtree.rs @@ -424,7 +424,7 @@ pub fn cursor_lower_bound(&mut self, key: &K) -> Option> while !node.is_null() { // SAFETY: By the type invariant of `Self`, all non-null `rb_node` pointers stored in `self` // point to the links field of `Node` objects. - let this = unsafe { container_of!(node, Node, links) }.cast_mut(); + let this = unsafe { container_of!(node, Node, links) }; // SAFETY: `this` is a non-null node so it is valid by the type invariants. let this_key = unsafe { &(*this).key }; // SAFETY: `node` is a non-null node so it is valid by the type invariants. @@ -496,7 +496,7 @@ fn drop(&mut self) { // but it is not observable. The loop invariant is still maintained. // SAFETY: `this` is valid per the loop invariant. - unsafe { drop(KBox::from_raw(this.cast_mut())) }; + unsafe { drop(KBox::from_raw(this)) }; } } } @@ -761,7 +761,7 @@ pub fn remove_current(self) -> (Option, RBTreeNode) { let next = self.get_neighbor_raw(Direction::Next); // SAFETY: By the type invariant of `Self`, all non-null `rb_node` pointers stored in `self` // point to the links field of `Node` objects. - let this = unsafe { container_of!(self.current.as_ptr(), Node, links) }.cast_mut(); + let this = unsafe { container_of!(self.current.as_ptr(), Node, links) }; // SAFETY: `this` is valid by the type invariants as described above. let node = unsafe { KBox::from_raw(this) }; let node = RBTreeNode { node }; @@ -806,7 +806,7 @@ fn remove_neighbor(&mut self, direction: Direction) -> Option> unsafe { bindings::rb_erase(neighbor, addr_of_mut!(self.tree.root)) }; // SAFETY: By the type invariant of `Self`, all non-null `rb_node` pointers stored in `self` // point to the links field of `Node` objects. - let this = unsafe { container_of!(neighbor, Node, links) }.cast_mut(); + let this = unsafe { container_of!(neighbor, Node, links) }; // SAFETY: `this` is valid by the type invariants as described above. let node = unsafe { KBox::from_raw(this) }; return Some(RBTreeNode { node }); @@ -912,7 +912,7 @@ unsafe fn to_key_value_mut<'b>(node: NonNull) -> (&'b K, &'b unsafe fn to_key_value_raw<'b>(node: NonNull) -> (&'b K, *mut V) { // SAFETY: By the type invariant of `Self`, all non-null `rb_node` pointers stored in `self` // point to the links field of `Node` objects. - let this = unsafe { container_of!(node.as_ptr(), Node, links) }.cast_mut(); + let this = unsafe { container_of!(node.as_ptr(), Node, links) }; // SAFETY: The passed `node` is the current node or a non-null neighbor, // thus `this` is valid by the type invariants. let k = unsafe { &(*this).key }; @@ -1021,7 +1021,7 @@ fn next(&mut self) -> Option { // SAFETY: By the type invariant of `IterRaw`, `self.next` is a valid node in an `RBTree`, // and by the type invariant of `RBTree`, all nodes point to the links field of `Node` objects. - let cur = unsafe { container_of!(self.next, Node, links) }.cast_mut(); + let cur = unsafe { container_of!(self.next, Node, links) }; // SAFETY: `self.next` is a valid tree node by the type invariants. self.next = unsafe { bindings::rb_next(self.next) }; @@ -1216,7 +1216,7 @@ pub fn get_mut(&mut self) -> &mut V { // SAFETY: // - `self.node_links` is a valid pointer to a node in the tree. // - We have exclusive access to the underlying tree, and can thus give out a mutable reference. - unsafe { &mut (*(container_of!(self.node_links, Node, links).cast_mut())).value } + unsafe { &mut (*(container_of!(self.node_links, Node, links))).value } } /// Converts the entry into a mutable reference to its value. @@ -1226,7 +1226,7 @@ pub fn into_mut(self) -> &'a mut V { // SAFETY: // - `self.node_links` is a valid pointer to a node in the tree. // - This consumes the `&'a mut RBTree`, therefore it can give out a mutable reference that lives for `'a`. - unsafe { &mut (*(container_of!(self.node_links, Node, links).cast_mut())).value } + unsafe { &mut (*(container_of!(self.node_links, Node, links))).value } } /// Remove this entry from the [`RBTree`]. @@ -1239,9 +1239,7 @@ pub fn remove_node(self) -> RBTreeNode { RBTreeNode { // SAFETY: The node was a node in the tree, but we removed it, so we can convert it // back into a box. - node: unsafe { - KBox::from_raw(container_of!(self.node_links, Node, links).cast_mut()) - }, + node: unsafe { KBox::from_raw(container_of!(self.node_links, Node, links)) }, } } @@ -1272,8 +1270,7 @@ fn replace(self, node: RBTreeNode) -> RBTreeNode { // SAFETY: // - `self.node_ptr` produces a valid pointer to a node in the tree. // - Now that we removed this entry from the tree, we can convert the node to a box. - let old_node = - unsafe { KBox::from_raw(container_of!(self.node_links, Node, links).cast_mut()) }; + let old_node = unsafe { KBox::from_raw(container_of!(self.node_links, Node, links)) }; RBTreeNode { node: old_node } } From patchwork Tue Mar 25 20:07:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029467 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 735C7266EF7; Tue, 25 Mar 2025 20:07:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933276; cv=none; b=gG/vijZaEhHvk6j7gYb7UQ7IT2n0sz2vbB8kRoMFveKDwyh9VdsKXRu2AMH5tyhTLVALDmZoGC5LTq9YvceMA803HLq3iC9dfvc17nKefjY8JFg0ZEYy4NJ57Cy4RYPqi/GE1/xcjkirVLo+UzKvZMpCFlP1Z8GQ2F+B20HLl40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933276; c=relaxed/simple; bh=JmU3ayI8mVBjSyvJ5CW2w8QO98KlUbTWt4/AN/0ln4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RRg7bIQDkQghg3cE+y8ulKXqv8iNoOaZGzSxI1QGleiAJlc+aFQYyV3pDUHS9GY1/IWO4KJKAS/O9fp+9IWKl1pgVqlEmCAP7xiv2BHhObjYYVJCnYCm4NKpb4iCp4ruVVaLB6kfTh1/MU0IExw+gQQbF9WInv+M+JMblQgf5Pg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bffYxB/J; arc=none smtp.client-ip=209.85.219.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bffYxB/J" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6e41e18137bso40069716d6.1; Tue, 25 Mar 2025 13:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933272; x=1743538072; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wuL+Loj/dYbEC74l5R9DWLQyrOZL5ewYHQL30LaQZpY=; b=bffYxB/JIj7RVBcdtsn2jZ6GtVu7cLu9MsTKK7me8GthJZzH4boBuo1GOCchaCfBIk //wmtAqcnE0+V5f2prCoM/TeCbHEDwko2lFNiL6p3u6KbQkzfCuNS0WqvlFC2bGck42A BJNHH8GAdJ0r4H6HADJeSTxU27jpXAa29859X0wRt2CNMu1NBh0DexEAaDYD+OvMJ2O0 9/dgKcXSDfN4F5DBpEIsSAvc3uF/3fGmJwaU2fLA7w7qgFvrIdzMxSPUi9zPnhwguXUy WtK9e9rUbIr6NQkR7Z/kKL8Bm26cSHXiIlswfw/a1AX1wFp4K46xBoF93oOc/mtBG0Wl H3WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933272; x=1743538072; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wuL+Loj/dYbEC74l5R9DWLQyrOZL5ewYHQL30LaQZpY=; b=Qa8KBmqBPAL2p9FR6g9Clk2RRYfQZB7k0wWhh1z2+oWaY/Gf8vBTeYS6m2kRPCd+RB qqectOKXvg2TFeT5iYD+PuDrYlp+hU0U687IdjlBBCN/Zb0K5fRjDmsFFNU0AiZbxPuI AbYvWs4Oz40l4vT0VoPb6t6czsmEohe8zIbzfZHCvlGEmxuzaFLB2qo4CiWGC36qB57z Vn9tDqNtALKimy2DipwikjBZW7NgZnv4WohtKjw536cPTh9wuqxRdWVvNZvXgSqqKiR9 /yLzccjx6rrFKni002Od7v80aKnh3LLGHS/xd/mTLzO+yH4MoGAZXzZSbAJ3m7X6yHZm t2yw== X-Forwarded-Encrypted: i=1; AJvYcCU01focGJGSBsIdJH/9lJ6TviBEWYc9QSADmkThPtl+PRbNyV9tqi53fbWJlGij2s7uq5cxaZkM0j8ZLU4Tmcg=@vger.kernel.org, AJvYcCUC2Ba7Wv/B3USSzrN7dz7gSEJJn/Rnv8i+B7q/Fc++yzIx3r51CGcrs1o1gZUNLEYM70iW+dAzzF7Q@vger.kernel.org, AJvYcCVtR5TDFwf29DAfOlP6sebKn5XIbgdDsCP+q5SSKt8QFyz21J9hcDGM4dJi8G4VCuWObaifYx+3D4pcE/zV@vger.kernel.org, AJvYcCVtWMwY0EyTdspfQtI3PPM1rtCnNb5/3YVyZew75S/R7s4mLElVLSGRrajrKLPmhPg3gDfVqBs/@vger.kernel.org, AJvYcCXKFxlKNlJzlkFsrM8Cpcw2zSVkfT6BTp8l5V+/t3e/Iyf9PNER1tPSf0xe5hbG1aok9hjw1jaGPxx3q4M=@vger.kernel.org, AJvYcCXKKKZ6vobs4BFqTXjr5GfVlSz1HP6v41dAHOykF8xCy63FU023F2dmDrSsmubyJa/Z4ojxQ/lvMz8Ah0U+OJ9y@vger.kernel.org, AJvYcCXRhgmnIq5tS95h4A8DfLUcJJdup0suGlXBt3fW69vN4Pp4lo2EirtYiRkR6TsR426vIolZBwNtp8FJ@vger.kernel.org X-Gm-Message-State: AOJu0YygHsiOmvcLAOzgrA4Uu9TD/6Q02yzVX2Uv4+Z792Hpa6Jc8Mce d+0hf34zCxhgcgYeu5uXJZ6TvrwxCfhJXhtSTwPafhGwHdcUtWhp X-Gm-Gg: ASbGncseTTTrw9999iYgIB9wSP+n6CAyx7d7A79Tq+t8nxRoN5+BfvUhEatOYbrIVVV jcAvI31bH5I1GdSouhxU0N/KVwVICgZGVa4d7/iHDCQRmABFicNWOO2VSXWR61GzEG2wBEya35k GtuOZZS9ltVgrVaANYA9NUFdYiuw4cBmwugSW//x8NTV6es3t49GGvmWcVaqwJweJ14l60DOxQQ pTn7PIS3awrxNvPx2qR59va4yUiGh7Oui2Gm/IOAJDGlBySpOFIBlELnHYzG0CPxdC6hUyGjwXL C99prIHXNqgAloe+79N62iPtmgQd7qnDxAWoTcnO1E1QtoBHxzMl+vph/jIQofwSTzQVPjuHWkG 79UteIai5GilpBDNol5vw2PsfA24pB+cNIbvLxZdQjr+079Ch0pxgLw== X-Google-Smtp-Source: AGHT+IHgl8hoN5Ars4+L9t5mlBxetiV5wcr+uaCTvcu3PGBoA7fPOcHn9FMtYnFtQFLPIMk9ltGPFg== X-Received: by 2002:a05:6214:da4:b0:6e6:5bd5:f3a8 with SMTP id 6a1803df08f44-6eb3f35b63fmr180392466d6.29.1742933271764; Tue, 25 Mar 2025 13:07:51 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:07:51 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:42 -0400 Subject: [PATCH v7 2/7] rust: enable `clippy::ptr_as_ptr` lint Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-2-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.51.0, Clippy introduced the `ptr_as_ptr` lint [1]: > Though `as` casts between raw pointers are not terrible, > `pointer::cast` is safer because it cannot accidentally change the > pointer's mutability, nor cast the pointer to other types like `usize`. There are a few classes of changes required: - Modules generated by bindgen are marked `#[allow(clippy::ptr_as_ptr)]`. - Inferred casts (` as _`) are replaced with `.cast()`. - Ascribed casts (` as *... T`) are replaced with `.cast::()`. - Multistep casts from references (` as *const _ as *const T`) are replaced with `let x: *const _ = &x;` and `.cast()` or `.cast::()` according to the previous rules. The intermediate `let` binding is required because `(x as *const _).cast::()` results in inference failure. - Native literal C strings are replaced with `c_str!().as_char_ptr()`. - `*mut *mut T as _` is replaced with `let *mut *const T = (*mut *mut T)`.cast();` since pointer to pointer can be confusing. Apply these changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_as_ptr [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/alloc/allocator_test.rs | 2 +- rust/kernel/alloc/kvec.rs | 4 ++-- rust/kernel/device.rs | 5 +++-- rust/kernel/devres.rs | 2 +- rust/kernel/dma.rs | 4 ++-- rust/kernel/error.rs | 2 +- rust/kernel/firmware.rs | 3 ++- rust/kernel/fs/file.rs | 2 +- rust/kernel/kunit.rs | 15 +++++++-------- rust/kernel/list/impl_list_item_mod.rs | 2 +- rust/kernel/pci.rs | 2 +- rust/kernel/platform.rs | 4 +++- rust/kernel/print.rs | 11 +++++------ rust/kernel/seq_file.rs | 3 ++- rust/kernel/str.rs | 2 +- rust/kernel/sync/poll.rs | 2 +- rust/kernel/workqueue.rs | 10 +++++----- rust/uapi/lib.rs | 1 + 20 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 70bdbf2218fc..ec8efc8e23ba 100644 --- a/Makefile +++ b/Makefile @@ -483,6 +483,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::needless_continue \ -Aclippy::needless_lifetimes \ -Wclippy::no_mangle_with_rust_abi \ + -Wclippy::ptr_as_ptr \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \ diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index 014af0d1fc70..0486a32ed314 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -25,6 +25,7 @@ )] #[allow(dead_code)] +#[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] mod bindings_raw { // Manual definition for blocklisted types. diff --git a/rust/kernel/alloc/allocator_test.rs b/rust/kernel/alloc/allocator_test.rs index e3240d16040b..30ce85326a50 100644 --- a/rust/kernel/alloc/allocator_test.rs +++ b/rust/kernel/alloc/allocator_test.rs @@ -64,7 +64,7 @@ unsafe fn realloc( // SAFETY: Returns either NULL or a pointer to a memory allocation that satisfies or // exceeds the given size and alignment requirements. - let dst = unsafe { libc_aligned_alloc(layout.align(), layout.size()) } as *mut u8; + let dst = unsafe { libc_aligned_alloc(layout.align(), layout.size()) }.cast::(); let dst = NonNull::new(dst).ok_or(AllocError)?; if flags.contains(__GFP_ZERO) { diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs index ae9d072741ce..c12844764671 100644 --- a/rust/kernel/alloc/kvec.rs +++ b/rust/kernel/alloc/kvec.rs @@ -262,7 +262,7 @@ pub fn spare_capacity_mut(&mut self) -> &mut [MaybeUninit] { // - `self.len` is smaller than `self.capacity` and hence, the resulting pointer is // guaranteed to be part of the same allocated object. // - `self.len` can not overflow `isize`. - let ptr = unsafe { self.as_mut_ptr().add(self.len) } as *mut MaybeUninit; + let ptr = unsafe { self.as_mut_ptr().add(self.len) }.cast::>(); // SAFETY: The memory between `self.len` and `self.capacity` is guaranteed to be allocated // and valid, but uninitialized. @@ -554,7 +554,7 @@ fn drop(&mut self) { // - `ptr` points to memory with at least a size of `size_of::() * len`, // - all elements within `b` are initialized values of `T`, // - `len` does not exceed `isize::MAX`. - unsafe { Vec::from_raw_parts(ptr as _, len, len) } + unsafe { Vec::from_raw_parts(ptr.cast(), len, len) } } } diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index db2d9658ba47..9e500498835d 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -168,16 +168,17 @@ pub fn pr_dbg(&self, args: fmt::Arguments<'_>) { /// `KERN_*`constants, for example, `KERN_CRIT`, `KERN_ALERT`, etc. #[cfg_attr(not(CONFIG_PRINTK), allow(unused_variables))] unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) { + let msg: *const _ = &msg; // SAFETY: `klevel` is null-terminated and one of the kernel constants. `self.as_raw` // is valid because `self` is valid. The "%pA" format string expects a pointer to // `fmt::Arguments`, which is what we're passing as the last argument. #[cfg(CONFIG_PRINTK)] unsafe { bindings::_dev_printk( - klevel as *const _ as *const crate::ffi::c_char, + klevel.as_ptr().cast::(), self.as_raw(), c_str!("%pA").as_char_ptr(), - &msg as *const _ as *const crate::ffi::c_void, + msg.cast::(), ) }; } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 942376f6f3af..3a9d998ec371 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -157,7 +157,7 @@ fn remove_action(this: &Arc) { #[allow(clippy::missing_safety_doc)] unsafe extern "C" fn devres_callback(ptr: *mut kernel::ffi::c_void) { - let ptr = ptr as *mut DevresInner; + let ptr = ptr.cast::>(); // Devres owned this memory; now that we received the callback, drop the `Arc` and hence the // reference. // SAFETY: Safe, since we leaked an `Arc` reference to devm_add_action() in diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index 8cdc76043ee7..f395d1a6fe48 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret as *mut T, + cpu_addr: ret.cast(), dma_attrs, }) } @@ -293,7 +293,7 @@ fn drop(&mut self) { bindings::dma_free_attrs( self.dev.as_raw(), size, - self.cpu_addr as _, + self.cpu_addr.cast(), self.dma_handle, self.dma_attrs.as_raw(), ) diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 30014d507ed3..b0e3d1bc0449 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { /// Returns the error encoded as a pointer. pub fn to_ptr(self) -> *mut T { // SAFETY: `self.0` is a valid error due to its invariant. - unsafe { bindings::ERR_PTR(self.0.get() as _) as *mut _ } + unsafe { bindings::ERR_PTR(self.0.get() as _).cast() } } /// Returns a string representing the error, if one exists. diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index c5162fdc95ff..74df815d2f4e 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -58,10 +58,11 @@ impl Firmware { fn request_internal(name: &CStr, dev: &Device, func: FwFunc) -> Result { let mut fw: *mut bindings::firmware = core::ptr::null_mut(); let pfw: *mut *mut bindings::firmware = &mut fw; + let pfw: *mut *const bindings::firmware = pfw.cast(); // SAFETY: `pfw` is a valid pointer to a NULL initialized `bindings::firmware` pointer. // `name` and `dev` are valid as by their type invariants. - let ret = unsafe { func.0(pfw as _, name.as_char_ptr(), dev.as_raw()) }; + let ret = unsafe { func.0(pfw, name.as_char_ptr(), dev.as_raw()) }; if ret != 0 { return Err(Error::from_errno(ret)); } diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs index ed57e0137cdb..9e2639aee61a 100644 --- a/rust/kernel/fs/file.rs +++ b/rust/kernel/fs/file.rs @@ -364,7 +364,7 @@ fn deref(&self) -> &LocalFile { // // By the type invariants, there are no `fdget_pos` calls that did not take the // `f_pos_lock` mutex. - unsafe { LocalFile::from_raw_file(self as *const File as *const bindings::file) } + unsafe { LocalFile::from_raw_file((self as *const Self).cast()) } } } diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 1604fb6a5b1b..83d15cfcda84 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -8,19 +8,20 @@ use core::{ffi::c_void, fmt}; +#[cfg(CONFIG_PRINTK)] +use crate::c_str; + /// Prints a KUnit error-level message. /// /// Public but hidden since it should only be used from KUnit generated code. #[doc(hidden)] pub fn err(args: fmt::Arguments<'_>) { + let args: *const _ = &args; // SAFETY: The format string is null-terminated and the `%pA` specifier matches the argument we // are passing. #[cfg(CONFIG_PRINTK)] unsafe { - bindings::_printk( - c"\x013%pA".as_ptr() as _, - &args as *const _ as *const c_void, - ); + bindings::_printk(c_str!("\x013%pA").as_char_ptr(), args.cast::()); } } @@ -29,14 +30,12 @@ pub fn err(args: fmt::Arguments<'_>) { /// Public but hidden since it should only be used from KUnit generated code. #[doc(hidden)] pub fn info(args: fmt::Arguments<'_>) { + let args: *const _ = &args; // SAFETY: The format string is null-terminated and the `%pA` specifier matches the argument we // are passing. #[cfg(CONFIG_PRINTK)] unsafe { - bindings::_printk( - c"\x016%pA".as_ptr() as _, - &args as *const _ as *const c_void, - ); + bindings::_printk(c_str!("\x016%pA").as_char_ptr(), args.cast::()); } } diff --git a/rust/kernel/list/impl_list_item_mod.rs b/rust/kernel/list/impl_list_item_mod.rs index a0438537cee1..1f9498c1458f 100644 --- a/rust/kernel/list/impl_list_item_mod.rs +++ b/rust/kernel/list/impl_list_item_mod.rs @@ -34,7 +34,7 @@ pub unsafe trait HasListLinks { unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut ListLinks { // SAFETY: The caller promises that the pointer is valid. The implementer promises that the // `OFFSET` constant is correct. - unsafe { (ptr as *mut u8).add(Self::OFFSET) as *mut ListLinks } + unsafe { ptr.cast::().add(Self::OFFSET).cast() } } } diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 271a7690a9a0..003c9aaafb24 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -75,7 +75,7 @@ extern "C" fn probe_callback( // Let the `struct pci_dev` own a reference of the driver's private data. // SAFETY: By the type invariant `pdev.as_raw` returns a valid pointer to a // `struct pci_dev`. - unsafe { bindings::pci_set_drvdata(pdev.as_raw(), data.into_foreign() as _) }; + unsafe { bindings::pci_set_drvdata(pdev.as_raw(), data.into_foreign().cast()) }; } Err(err) => return Error::to_errno(err), } diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 84a4ecc642a1..26b2502970ef 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -66,7 +66,9 @@ extern "C" fn probe_callback(pdev: *mut bindings::platform_device) -> kernel::ff // Let the `struct platform_device` own a reference of the driver's private data. // SAFETY: By the type invariant `pdev.as_raw` returns a valid pointer to a // `struct platform_device`. - unsafe { bindings::platform_set_drvdata(pdev.as_raw(), data.into_foreign() as _) }; + unsafe { + bindings::platform_set_drvdata(pdev.as_raw(), data.into_foreign().cast()) + }; } Err(err) => return Error::to_errno(err), } diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs index cf4714242e14..8ae57d2cd36c 100644 --- a/rust/kernel/print.rs +++ b/rust/kernel/print.rs @@ -25,7 +25,7 @@ // SAFETY: The C contract guarantees that `buf` is valid if it's less than `end`. let mut w = unsafe { RawFormatter::from_ptrs(buf.cast(), end.cast()) }; // SAFETY: TODO. - let _ = w.write_fmt(unsafe { *(ptr as *const fmt::Arguments<'_>) }); + let _ = w.write_fmt(unsafe { *ptr.cast::>() }); w.pos().cast() } @@ -102,6 +102,7 @@ pub unsafe fn call_printk( module_name: &[u8], args: fmt::Arguments<'_>, ) { + let args: *const _ = &args; // `_printk` does not seem to fail in any path. #[cfg(CONFIG_PRINTK)] // SAFETY: TODO. @@ -109,7 +110,7 @@ pub unsafe fn call_printk( bindings::_printk( format_string.as_ptr(), module_name.as_ptr(), - &args as *const _ as *const c_void, + args.cast::(), ); } } @@ -122,15 +123,13 @@ pub unsafe fn call_printk( #[doc(hidden)] #[cfg_attr(not(CONFIG_PRINTK), allow(unused_variables))] pub fn call_printk_cont(args: fmt::Arguments<'_>) { + let args: *const _ = &args; // `_printk` does not seem to fail in any path. // // SAFETY: The format string is fixed. #[cfg(CONFIG_PRINTK)] unsafe { - bindings::_printk( - format_strings::CONT.as_ptr(), - &args as *const _ as *const c_void, - ); + bindings::_printk(format_strings::CONT.as_ptr(), args.cast::()); } } diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 4c03881a9eba..d7a530d3eb07 100644 --- a/rust/kernel/seq_file.rs +++ b/rust/kernel/seq_file.rs @@ -31,12 +31,13 @@ pub unsafe fn from_raw<'a>(ptr: *mut bindings::seq_file) -> &'a SeqFile { /// Used by the [`seq_print`] macro. pub fn call_printf(&self, args: core::fmt::Arguments<'_>) { + let args: *const _ = &args; // SAFETY: Passing a void pointer to `Arguments` is valid for `%pA`. unsafe { bindings::seq_printf( self.inner.get(), c_str!("%pA").as_char_ptr(), - &args as *const _ as *const crate::ffi::c_void, + args.cast::(), ); } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 878111cb77bc..02863c40c21b 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -237,7 +237,7 @@ pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Self { // to a `NUL`-terminated C string. let len = unsafe { bindings::strlen(ptr) } + 1; // SAFETY: Lifetime guaranteed by the safety precondition. - let bytes = unsafe { core::slice::from_raw_parts(ptr as _, len) }; + let bytes = unsafe { core::slice::from_raw_parts(ptr.cast(), len) }; // SAFETY: As `len` is returned by `strlen`, `bytes` does not contain interior `NUL`. // As we have added 1 to `len`, the last byte is known to be `NUL`. unsafe { Self::from_bytes_with_nul_unchecked(bytes) } diff --git a/rust/kernel/sync/poll.rs b/rust/kernel/sync/poll.rs index e105477a3cb1..d04d90486b09 100644 --- a/rust/kernel/sync/poll.rs +++ b/rust/kernel/sync/poll.rs @@ -73,7 +73,7 @@ pub fn register_wait(&mut self, file: &File, cv: &PollCondVar) { // be destroyed, the destructor must run. That destructor first removes all waiters, // and then waits for an rcu grace period. Therefore, `cv.wait_queue_head` is valid for // long enough. - unsafe { qproc(file.as_ptr() as _, cv.wait_queue_head.get(), self.0.get()) }; + unsafe { qproc(file.as_ptr().cast(), cv.wait_queue_head.get(), self.0.get()) }; } } } diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index 0cd100d2aefb..8ff54105be3f 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -170,7 +170,7 @@ impl Queue { pub unsafe fn from_raw<'a>(ptr: *const bindings::workqueue_struct) -> &'a Queue { // SAFETY: The `Queue` type is `#[repr(transparent)]`, so the pointer cast is valid. The // caller promises that the pointer is not dangling. - unsafe { &*(ptr as *const Queue) } + unsafe { &*ptr.cast::() } } /// Enqueues a work item. @@ -457,7 +457,7 @@ fn get_work_offset(&self) -> usize { #[inline] unsafe fn raw_get_work(ptr: *mut Self) -> *mut Work { // SAFETY: The caller promises that the pointer is valid. - unsafe { (ptr as *mut u8).add(Self::OFFSET) as *mut Work } + unsafe { ptr.cast::().add(Self::OFFSET).cast::>() } } /// Returns a pointer to the struct containing the [`Work`] field. @@ -472,7 +472,7 @@ unsafe fn work_container_of(ptr: *mut Work) -> *mut Self { // SAFETY: The caller promises that the pointer points at a field of the right type in the // right kind of struct. - unsafe { (ptr as *mut u8).sub(Self::OFFSET) as *mut Self } + unsafe { ptr.cast::().sub(Self::OFFSET).cast::() } } } @@ -538,7 +538,7 @@ unsafe impl WorkItemPointer for Arc { unsafe extern "C" fn run(ptr: *mut bindings::work_struct) { // The `__enqueue` method always uses a `work_struct` stored in a `Work`. - let ptr = ptr as *mut Work; + let ptr = ptr.cast::>(); // SAFETY: This computes the pointer that `__enqueue` got from `Arc::into_raw`. let ptr = unsafe { T::work_container_of(ptr) }; // SAFETY: This pointer comes from `Arc::into_raw` and we've been given back ownership. @@ -591,7 +591,7 @@ unsafe impl WorkItemPointer for Pin> { unsafe extern "C" fn run(ptr: *mut bindings::work_struct) { // The `__enqueue` method always uses a `work_struct` stored in a `Work`. - let ptr = ptr as *mut Work; + let ptr = ptr.cast::>(); // SAFETY: This computes the pointer that `__enqueue` got from `Arc::into_raw`. let ptr = unsafe { T::work_container_of(ptr) }; // SAFETY: This pointer comes from `Arc::into_raw` and we've been given back ownership. diff --git a/rust/uapi/lib.rs b/rust/uapi/lib.rs index 13495910271f..f03b7aead35a 100644 --- a/rust/uapi/lib.rs +++ b/rust/uapi/lib.rs @@ -14,6 +14,7 @@ #![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs, From patchwork Tue Mar 25 20:07:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029468 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 513B72686BB; Tue, 25 Mar 2025 20:07:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933277; cv=none; b=Rbx0dkJk7LTps+rIYU3epJ9CIa3zErAAPGKMMntFQ2EZg3d4BWunv427gIF3/77O7tsbenYj0ihTCfeTGjmjxwfX3mbKVXyrQsaW8TDEEFe0AJiUF3Lx9cD+VNUUNvJ4vVaeQhawiINc4+QA0FiboLb7e/ncSXAmykmSNi54fCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933277; c=relaxed/simple; bh=d+tmvh0gyOl0JVuKZBG1UMfxq3zqeMKGdPEzn/WP544=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fOIA9t0J6dHFUDlbnjf2sM9n4prAfumqGYPjbcmVVsRbnrhawsn3tvpHB712CrZ5sWf8rHfvbkCCKp5UFz5dCJ+n0IUFVAS6NNUuouyl9GLn2lfGVLLTh6urbCBcRu0qGbLvheCu92/VMlYgjXX+aSFvvjpWB2+4DzR7SYYg+6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TUzcGgiy; arc=none smtp.client-ip=209.85.219.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TUzcGgiy" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6e1b11859a7so21363206d6.1; Tue, 25 Mar 2025 13:07:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933274; x=1743538074; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=jXDBuKpzZkDEwqWUPr5JbpVdesx1OReuFvw422VpuEU=; b=TUzcGgiyjFSCd+zLrSVuE+NRiddhrk9Tu73iVFw9k9N6J/n4L+oIydawvcqNdkSfRL UpDl7JyREjx6iYm2QZnEOJKa9RHhiTxg6CsUvLBW8nm3pVoyNBJ/C/2lFzF5fSO4NnDo rPvyKcUucEyGHEfomLX282FSb5/zDuyX7U2yOKC+JD4X3LBHdz/3TGyT0m8ihBPetBZS DXs4lhjpcR1XaV8KsGl7kaKUMdK1JAh2kcCJGQIQkQg4lu0zLmMzi2ZdMfGWEQB3MhN+ V0Oq/0hiQgc4DmRXlfc1/dFXxiCiACJ1usXk62cbrSxvjJO1o3mEBeH/Q6WHJqNXA6Yr KFQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933274; x=1743538074; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jXDBuKpzZkDEwqWUPr5JbpVdesx1OReuFvw422VpuEU=; b=PLORHczrYwkG1TiNKy2ZOZtByftFTZx4oXQqjN47YkAoCxbExzKmkKfqUir8bmRmq2 suvIfToU2D6cJAesbfddCF2Xi9q5Ja0jhurYqHjNFEwCyowkYk+qyDEGdyY7gP6EP4om hWfLOuWyXw8Y7/QnBUVPCZsLJvJqCJqAVM5cTpl2TpW1vOjQqXk7PL765RaJYx2Pgx56 5L1s7jsanbN8lF4vAltUDHlUUqB0gWVj7ttf9yRsDqu7lRZMnGsF7kb1hNGAdx8qyZ9O fkfg7srBr0V+Nt09v1W/exdFg0j6jC7N4JQXApz2619POMCDO0uoayCrzc4NYLOYXNid WEOA== X-Forwarded-Encrypted: i=1; AJvYcCV/Y2XdCxrg38pEUISzvlTTy+tzL8ZkEbNN8BKH8ZaBevQVkM+V9ixi/iR6hax7iTESPbDROVpMILzv@vger.kernel.org, AJvYcCV5TEXT/3akw3r1ovSZSvWvQ1vGJi8oOZ5KX6gNk/OK0r72menm5d5fuoL8sa/LR/lpTGTEovcx@vger.kernel.org, AJvYcCVjoA51o37XA2LbSbZBRe59HBQRc8ohq4+RBoz1LuZ91kfx18eXuKbaxzTa9Yan+tH5LoZei9RotwFM874=@vger.kernel.org, AJvYcCWFXTxk7rYaMFycxC/JfhhhWUjr4LX5/Kx2Vwqd2Jpij0R0DEVGghccJZ+smTqVSPUbbQmZ2o5TStLwlv7rPSZu@vger.kernel.org, AJvYcCWZqCOdK41U2ixnMFXX24auOCzjS2POokyPr/0C+OU12NUD+XuWSR4GTTNPinEBIAu8qZS9k0+SLvg9@vger.kernel.org, AJvYcCWhNRbb03fjW21LMVG91H26MwL1NnHGvP+p/IYkoul+6RaRB9WWpKHBNZ6kZQRJYX3o6tezwxeqwLFtsjxt@vger.kernel.org, AJvYcCXgtedjp7sEsY7k54KHJnYZp77jLyxef/9zg4k7RE3nPU9GnTqfGkRCp1zVJ6pfE+4sMCmW+9yy51AHmR6WGaw=@vger.kernel.org X-Gm-Message-State: AOJu0YzxqJkT6P4/mnA/0cEPE2KArliIDO0O7sFuMNecKWe279nVqXoh PbOnvc5VhucFn1Tu45E5lQlNsvoJ6Dw0YIFAPVNw71BcmSuATfGR X-Gm-Gg: ASbGncv348Aki8Yciz3Un5YmQ5w03Se6kSQvRHGQqw12kV3UafSC0tMnKfgGsAPMBue a3d4bCD+ktC14mbJEnrr0XcV1kJ1WhnuCe0kcUz98QqYaWOfVVr3O/0nhJCdNFsRpyKoJJqiOCm X3KuR9kw0bqBXxvb2gmDz4KYtytBN8idXJnidBu6gf8QXlaNlJd0DXm/oFsBWaGb9Ujj0Ee5xgl 4oJvCFd8oZgkoh76ugHU36el6eNycz4B0ydfIdBjczkWtGAIY7b2FLsMrS3TOOAp8xKOwt5+uIH w5Nq3zR8wCz4LvDEv3VMcBQLG1xqJGTzUPjLseDnJ1efRTmimioXzuLNCBSafq7SiRlhTSziAsa KhPfihXe1Q5c/ar1c91xhI+3xPC6qyh0qkZjAQHVx1/w3XnziyOdRU2G7f/jhjea1 X-Google-Smtp-Source: AGHT+IEODFsgFHGeBQ9zW8PY+ll3LVkcvJOvrWbn6xtmL0Kku/jCxdUnT9mLuAqmvSy6k4YXj/4CGg== X-Received: by 2002:a05:6214:252f:b0:6e8:f9e6:c4e2 with SMTP id 6a1803df08f44-6eb3f33d619mr287029296d6.32.1742933273933; Tue, 25 Mar 2025 13:07:53 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:07:52 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:43 -0400 Subject: [PATCH v7 3/7] rust: enable `clippy::ptr_cast_constness` lint Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-3-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.72.0, Clippy introduced the `ptr_cast_constness` lint [1]: > Though `as` casts between raw pointers are not terrible, > `pointer::cast_mut` and `pointer::cast_const` are safer because they > cannot accidentally cast the pointer to another type. There are only 2 affected sites: - `*mut T as *const U as *mut U` becomes `(*mut T).cast()` - `&self as *const Self as *mut Self` becomes a reference-to-pointer coercion + `(*const Self).cast()`. Apply these changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_cast_constness [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/kernel/block/mq/request.rs | 5 +++-- rust/kernel/dma.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ec8efc8e23ba..c62bae2b107b 100644 --- a/Makefile +++ b/Makefile @@ -484,6 +484,7 @@ export rust_common_flags := --edition=2021 \ -Aclippy::needless_lifetimes \ -Wclippy::no_mangle_with_rust_abi \ -Wclippy::ptr_as_ptr \ + -Wclippy::ptr_cast_constness \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \ diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/request.rs index 4a5b7ec914ef..c9f8046af65c 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -69,7 +69,7 @@ pub(crate) unsafe fn aref_from_raw(ptr: *mut bindings::request) -> ARef { // INVARIANT: By the safety requirements of this function, invariants are upheld. // SAFETY: By the safety requirement of this function, we own a // reference count that we can pass to `ARef`. - unsafe { ARef::from_raw(NonNull::new_unchecked(ptr as *const Self as *mut Self)) } + unsafe { ARef::from_raw(NonNull::new_unchecked(ptr.cast())) } } /// Notify the block layer that a request is going to be processed now. @@ -151,11 +151,12 @@ pub(crate) unsafe fn wrapper_ptr(this: *mut Self) -> NonNull /// Return a reference to the [`RequestDataWrapper`] stored in the private /// area of the request structure. pub(crate) fn wrapper_ref(&self) -> &RequestDataWrapper { + let this: *const _ = self; // SAFETY: By type invariant, `self.0` is a valid allocation. Further, // the private data associated with this request is initialized and // valid. The existence of `&self` guarantees that the private data is // valid as a shared reference. - unsafe { Self::wrapper_ptr(self as *const Self as *mut Self).as_ref() } + unsafe { Self::wrapper_ptr(this.cast_mut()).as_ref() } } } diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index f395d1a6fe48..43ecf3c2e860 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret.cast(), + cpu_addr: ret.cast::(), dma_attrs, }) } From patchwork Tue Mar 25 20:07:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029469 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB888268C70; Tue, 25 Mar 2025 20:07:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933278; cv=none; b=IoDbHjsyY+afPDJvwwgkkubqe4jNkxT66gDPrg8J2ZibbisJmowzTVC1/2X2hXu6ddFv4iwyvujONSDZi9vwKGnJ+Sy+fIG7S+L2/w7TRj+HT+zo6mGSXlcpy7lN76VYJX5iARdh2Kgv6fd7x9bNCDYO4cKzBwSDREjEbOFpEtA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933278; c=relaxed/simple; bh=ARhxNI1wWiplxkPdk6FMVE4T9Y4lrgoeC4uNkwKSjKU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qRqywYSi5DEe71rgNUHV6TneKZMssiV3TjHDMVzYpSc/lEDf7D32jjwm5gdu9+2Q25oa8RZIlVKnBEXqJxv6EtpS0v3VMOC1fMiAM4GpHZ3lzVDAPjWNtM5IzgTIZeUmgV/Ej9gB+oDYyjTkUihBy5UOFJ81GGwUnxA6BhQGT5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Nqz51FUO; arc=none smtp.client-ip=209.85.219.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Nqz51FUO" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-6e89a2501a0so57057906d6.1; Tue, 25 Mar 2025 13:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933276; x=1743538076; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=V8afu+918+Q54xyruc7w9BxMECWF2zkytyg4bSZWLnw=; b=Nqz51FUOroXH0Nux+3ah/lqVKdgIddkzLj1ioT054tBjwEaAYyvnDRPOsPphsDwcpR tmwg5+hMeFjoTs+2HWnlHdZXX75qzz84Z8O+MTEiWjaeAjr6G+/EwZKOFJjNN580oKLo 0poX3vqlAkvdxKD8T5KNfLBV8C7DSPOoLA6G4Swzd3rz8rUgEE0K4JuMtvwsVad/SVC0 cGnmXEeiLuIYG4wdNgIUmEiddaJ8mOBPolE8pI8NNdBQGsX0aMuX6gOnojlsUqhtlctb +av+wwSDSYA1C/v16LhhK56XWuj7LFnnFvqyx+snG0a1I3PJ9kge8HaZq2zDjSPv5XcP /lwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933276; x=1743538076; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V8afu+918+Q54xyruc7w9BxMECWF2zkytyg4bSZWLnw=; b=UW0R0xePP7nI/k+gL/U7e8VDLJUESnjREPq//bLDxsnwXy4ZFyBzRJ5MRRWi7hxL/4 n9UM2C1H0EIHWXaBskNdzowR7xznRW9WLzdQlL7bQSrm62QKgNl/qcSDVR9wc8axTSRg +sO4DX9ac1+y4VLFD21v/VPtJOkGDbQaLm+K3Y6Ihrsxv26SkQ5q3ElRj9G5mVhkNi4X jA3Kaf8eJltBY3m8SeCeu+Q2WSSdOHTNdr28enuEVIBcIgsWdK94XTb2Z1d3HhmhaDuE r7MmCfgdj/5+0JynrpP4Ymg+HUuO5JHkYTzDzgiEyZPDAO9UCfek1Wgb3DfAN/LmeHGP WFNw== X-Forwarded-Encrypted: i=1; AJvYcCU9uauPegzxxAgxlysIelSb+L+AK5OyYMPf+cj7lArXLduSB8yaiRIXxT65AgRFWqucS0DQ3CSNzrSgMJW8@vger.kernel.org, AJvYcCULruIjVTk4U5n1PionM8R3GlGQsNd5UnlVgTW/382rhQwsYZu7qUi1oeW4rmcIn83jiKC/yn4lcp1KA/o=@vger.kernel.org, AJvYcCUl+uZz3/qCl91f3cjIZUoNxV1wyctlVN6xiZ0No2DHqd4sMhIqxkz068wl18QCWg6hu5NkJgwmkcAbhbY1tziF@vger.kernel.org, AJvYcCUq8hPBsZN9uPdueEI3OevYNv9/kjhAZgi+UcEJtrR0DdT9bNUm0eLTV4I0DngWvcVTKfLvcCHnMaCk@vger.kernel.org, AJvYcCVGnFM4fIYhDMHiQapiBk33cL4qD8dX5YVaif8WPpP7yjsqG2MgIuyxMvuqG+JLt5g46hRGAxDi@vger.kernel.org, AJvYcCWCUmnDPhjEIG6iT0V7Y6oJ6JcDS9giNLy3axKQK9R/gh9npmvPxTi9XeZKgE3DcjZWf0eMZ03PosPtVXCg3QY=@vger.kernel.org, AJvYcCXJOXAa4VGWRNYm44S4Pyt6LixKJz6cKQabIsgOG+77yXAnP7ljUV61grgwE1LFInUpjAwIJ6Aula86@vger.kernel.org X-Gm-Message-State: AOJu0YzY0z1yNUZ2huSpDhkuKR49ERdj/VP78Axfn6AhZoV/JHymKBuK YNZJidezj1K9O+M78YHj4/vPX1/vawtX2IMC9ZKO4SxuaSCUOqHl X-Gm-Gg: ASbGncvgTbMipqSWT7TH1GnvRfGq6moon4hLKh6VweTkNKcxtMgvchraI28NSKWmuSL 7+vEgrQdYwBLePul6eS4lMCvYnPaftjlWRqY7xGl+RoVuN3eZaQFoDU7wCDqqWBDfJls5xd2gI6 5/9Bvv17fRa+Qm1CZNQkUJD6WGdUY4QhsSd4aD1kMiU/U7hcMZWLTAnF09WiRdcT8rxPN952ILC I03VO6V+6ejHw+sL1WADp1qmQ9WgbpJfeY29pyncMl5KQE7Vni7bpkl6zFx2jl/sB/zVUdcybPZ CDJsMWRiTHOqS7b3Bc/JdBvuk9x37/JXCK7KxH/E4lpd02/PeepaWMg6wtVzW8n3ITnfTuu0nyv xcAda5TuW6vW3fq45qsxGFh8y0n40P6lliuWny4/NMPMp0PnRibXzukw5aCjUNR8k X-Google-Smtp-Source: AGHT+IH5ctNWjC54Y7j3zCNpairalLYRZF34BaBc3KtOMVr913E6IQjPSqy4tjWyjdEoDRDpScx/lQ== X-Received: by 2002:a05:6214:1d04:b0:6e6:6c7c:984a with SMTP id 6a1803df08f44-6eb3f33c8b6mr233174246d6.29.1742933275610; Tue, 25 Mar 2025 13:07:55 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:07:55 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:44 -0400 Subject: [PATCH v7 4/7] rust: enable `clippy::as_ptr_cast_mut` lint Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-4-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.66.0, Clippy introduced the `as_ptr_cast_mut` lint [1]: > Since `as_ptr` takes a `&self`, the pointer won’t have write > permissions unless interior mutability is used, making it unlikely > that having it as a mutable pointer is correct. There is only one affected callsite, and the change amounts to replacing `as _` with `.cast_mut().cast()`. This doesn't change the semantics, but is more descriptive of what's going on. Apply this change and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#as_ptr_cast_mut [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/kernel/devres.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c62bae2b107b..bb15b86182a3 100644 --- a/Makefile +++ b/Makefile @@ -477,6 +477,7 @@ export rust_common_flags := --edition=2021 \ -Wrust_2018_idioms \ -Wunreachable_pub \ -Wclippy::all \ + -Wclippy::as_ptr_cast_mut \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \ diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 3a9d998ec371..598001157293 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -143,7 +143,7 @@ fn remove_action(this: &Arc) { bindings::devm_remove_action_nowarn( this.dev.as_raw(), Some(this.callback), - this.as_ptr() as _, + this.as_ptr().cast_mut().cast(), ) }; From patchwork Tue Mar 25 20:07:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029470 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A79F1268FFA; Tue, 25 Mar 2025 20:07:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933281; cv=none; b=D4xO+2iak0IyO3sbc5QaI+uTjoqevVwpu5HyS3fDS7voPRyL9zJIZYsWCBa8ItiJ3QE0JK3+BJMX4CnLon1msrMFpkXDtOATBdD/lBVjD4027COKQkeX2C/owGWIp9b7lZRWa+FN0n1EWBbsoNbSnqi6K8eMHnLkFD30j53DdmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933281; c=relaxed/simple; bh=coPB0YWiFAsmMpUoqm0aOxwsqE4IF5IAmaNDjWVROmA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pjRP9lIYO+YNWzaxcySbQvfoWGOjOogVecSaTAyREXnlNDz+ushqp7k76N6jojbNmQXuXS5nG6RbmPfV9tSpMRXnLFVwsFFWr0bVbaX7MYHGwOi+nI0ySDiuTBRBpSL92CC3jzclOw40UwFxdsTVdfU4IUOnO5GQ+gEzSzdeoZs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WVaI3nzQ; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WVaI3nzQ" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6e8ec399427so47546176d6.2; Tue, 25 Mar 2025 13:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933277; x=1743538077; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=F5uIEKx3rY1SAZshU7eTI3oeeRLlCQ0XHxliBguWMoA=; b=WVaI3nzQTqpfTJCL92cptFJQsSbwhi55TDdnS+pO8BfFguEd1tUb4WK2VsQe5VuzRI +UPygdnOLhoVO9UBbzj34HL2nzHQKSKtpAr+Y8/4uU5SXS0q/Ye8Va2yi/mpuqTou3Kh KqymZk/Y3rdQw10pzcvu7kOZC4d+12/4kb8gz24iRwQ0qB/+228u0VG/hSdWSxaJIuZp Ok3W+nJLdJlMxqtNZik5UAWsdLNUbVN4k8TG5TeMk8yxZfaYvQVwaYhI4jqcedlMPxhP p37J1TqwLPUCkKdGmbUoEd31PTR2MEtZzL/GYNuVxelKdL+2ecIPSDplFpTW5DD0V+ou ibcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933277; x=1743538077; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F5uIEKx3rY1SAZshU7eTI3oeeRLlCQ0XHxliBguWMoA=; b=k67P86E6Rb1/H3nK5zKP5UiG3TI5A937iSAps7ixi6HgiV9LKbi8XvjflvzlIFDofU 9e8iQRBsZPctpHLR5fK6SetZbOZ76/Vcai7MPx7pMoZw+ZmdIntCQ6WArjh/mc0c1URZ 1C9ZPjISw5QcUkU7pqBEfGxDj/F7svjBjIUOcQsYct2vvl793sfFYsyzOwBXMOK/l+Ky iKcwi5+6Oa9LGzvNLc2qVtQNTrD9MprgczbshNB9x33Ll3eHwN2QE1yw7o7uSFu8O/I/ V3F8bKFDUio7I9zlscRgY5YEI+6IdSXLQib/jpNMGQoBLFUDTQQAz0Os00cpPGnZp0OR EMYA== X-Forwarded-Encrypted: i=1; AJvYcCUeCfgvH1vYh/4nS8YBkn6TNiOId5aAR0PU3L7VoOE3s4lyDd3b87FVltjD6gh7ZhSFwd1S/KCkBO9P@vger.kernel.org, AJvYcCV6u3vgHdzc0F2QljFF+sulLn+JwynHUtYvv12BXKGkmmCBl3Az8k0uySGjCnkh2et8v8MpPjsmlWHp@vger.kernel.org, AJvYcCVPETtJnye5dwT5DhNMrsIgeh0eSfQJfilqQzpgPMxgQIH5XJjeuJDQDYQUSqsQ4nVg3IbqiBhgUJ5Ob6Ap@vger.kernel.org, AJvYcCVzv+ztSGSkEBRs4zengdMQiFfkEUWu08PAj5gllzXKpDo+flHqJSy9wdkeaU7Tm9J/3KMbOEAO@vger.kernel.org, AJvYcCWw7U28mF/USkb9gU7OVpemiRT09UBjP5NZiJ8RBOu878lJYIvihGAnIrj8KzZRenPfzvk/O4HtbQZsD+1CJyQ=@vger.kernel.org, AJvYcCXLqU/c6dtFOhbM28G6gKu1X0rqLV5KCLl3hGSanF865OBM82HavWh14jLx0wsrdmYj7LwyAinTP+EAuuc=@vger.kernel.org, AJvYcCXiumzQ+TiyFtQdwJ+T+hjsbAopwB8E0C461CKgoMKT9nFthkNA6sfUft7N7RRbZzmp07kE+B3GgxCXcZopCYM6@vger.kernel.org X-Gm-Message-State: AOJu0Yx/BtXIaIGvwzwhXeIjuJi3rKrU/pMPLQDelIbbXCxTkduFqlRg UGUMIIaPp78xj6NNAK3F6uuP3HV3oHJCxPd3+0nwXdeqeZutCoxlhgsZdY8Rsss= X-Gm-Gg: ASbGnctNUM3DvUTetLtNfnaykGzHfUzMV+CbMOY4rLrUx6K4QUwnDrDfvT06hR5uVTj EXbHWOfOAmswv1MSvWOXcvpqciIBkUrqrnJWh6nmpBlw4FI80kvGbAgzfB8NcbcxzeBdJahnFxi rnq0tQo0h37oURKtDBJpJIa/nvnPOxhbVNJ1xCCI1iwKcImaE6fjEsuniQ+hf8p2oLgB64bOGhm FjFySNVw0ftY3+mFnInZKsgc3moP3VBnHH7SscI1FQG4b0W3Nj4LPEhdAlQgba2Ykqwy0NGYkuI 0CEzpzzKtTwSI7yo0qopyzVdwMBa083S9vbfQRJUuuou7bhxwL5WA4vGSTLPfCOPxoErVfVZGr+ SNulQpwpl1HAIC82tT/7ga1wBZ4qttfOXqZtWwyyv6v7V9ZM6sa9/sw== X-Google-Smtp-Source: AGHT+IHVk/ZIyPMFpk1go5Fgiyttcwouqh0xXQNG6Z5872sKosvNEbYZTt92WTg+ezz0vhDOajIg2Q== X-Received: by 2002:ad4:5aa5:0:b0:6ea:d604:9e59 with SMTP id 6a1803df08f44-6eb3f294df4mr323175396d6.9.1742933277214; Tue, 25 Mar 2025 13:07:57 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:07:56 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:45 -0400 Subject: [PATCH v7 5/7] rust: enable `clippy::as_underscore` lint Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-5-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.63.0, Clippy introduced the `as_underscore` lint [1]: > The conversion might include lossy conversion or a dangerous cast that > might go undetected due to the type being inferred. > > The lint is allowed by default as using `_` is less wordy than always > specifying the type. Always specifying the type is especially helpful in function call contexts where the inferred type may change at a distance. Specifying the type also allows Clippy to spot more cases of `useless_conversion`. The primary downside is the need to specify the type in trivial getters. There are 4 such functions: 3 have become slightly less ergonomic, 1 was revealed to be a `useless_conversion`. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#as_underscore [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/kernel/block/mq/operations.rs | 2 +- rust/kernel/block/mq/request.rs | 2 +- rust/kernel/device_id.rs | 2 +- rust/kernel/devres.rs | 15 ++++++++------- rust/kernel/dma.rs | 2 +- rust/kernel/error.rs | 2 +- rust/kernel/io.rs | 18 +++++++++--------- rust/kernel/miscdevice.rs | 2 +- rust/kernel/of.rs | 6 +++--- rust/kernel/pci.rs | 9 ++++++--- rust/kernel/str.rs | 8 ++++---- rust/kernel/workqueue.rs | 2 +- 13 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index bb15b86182a3..2af40bfed9ce 100644 --- a/Makefile +++ b/Makefile @@ -478,6 +478,7 @@ export rust_common_flags := --edition=2021 \ -Wunreachable_pub \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ + -Wclippy::as_underscore \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \ diff --git a/rust/kernel/block/mq/operations.rs b/rust/kernel/block/mq/operations.rs index 864ff379dc91..d18ef55490da 100644 --- a/rust/kernel/block/mq/operations.rs +++ b/rust/kernel/block/mq/operations.rs @@ -101,7 +101,7 @@ impl OperationsVTable { if let Err(e) = ret { e.to_blk_status() } else { - bindings::BLK_STS_OK as _ + bindings::BLK_STS_OK as u8 } } diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/request.rs index c9f8046af65c..807a72de6455 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -125,7 +125,7 @@ pub fn end_ok(this: ARef) -> Result<(), ARef> { // success of the call to `try_set_end` guarantees that there are no // `ARef`s pointing to this request. Therefore it is safe to hand it // back to the block layer. - unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK_STS_OK as _) }; + unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK_STS_OK as u8) }; Ok(()) } diff --git a/rust/kernel/device_id.rs b/rust/kernel/device_id.rs index e5859217a579..4063f09d76d9 100644 --- a/rust/kernel/device_id.rs +++ b/rust/kernel/device_id.rs @@ -82,7 +82,7 @@ impl IdArray { unsafe { raw_ids[i] .as_mut_ptr() - .byte_offset(T::DRIVER_DATA_OFFSET as _) + .byte_add(T::DRIVER_DATA_OFFSET) .cast::() .write(i); } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 598001157293..34571f992f0d 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -45,7 +45,7 @@ struct DevresInner { /// # Example /// /// ```no_run -/// # use kernel::{bindings, c_str, device::Device, devres::Devres, io::{Io, IoRaw}}; +/// # use kernel::{bindings, c_str, device::Device, devres::Devres, ffi::c_void, io::{Io, IoRaw}}; /// # use core::ops::Deref; /// /// // See also [`pci::Bar`] for a real example. @@ -59,19 +59,19 @@ struct DevresInner { /// unsafe fn new(paddr: usize) -> Result{ /// // SAFETY: By the safety requirements of this function [`paddr`, `paddr` + `SIZE`) is /// // valid for `ioremap`. -/// let addr = unsafe { bindings::ioremap(paddr as _, SIZE as _) }; +/// let addr = unsafe { bindings::ioremap(paddr as bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl Drop for IoMem { /// fn drop(&mut self) { /// // SAFETY: `self.0.addr()` is guaranteed to be properly mapped by `Self::new`. -/// unsafe { bindings::iounmap(self.0.addr() as _); }; +/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); }; /// } /// } /// @@ -115,8 +115,9 @@ fn new(dev: &Device, data: T, flags: Flags) -> Result>> { // SAFETY: `devm_add_action` guarantees to call `Self::devres_callback` once `dev` is // detached. - let ret = - unsafe { bindings::devm_add_action(dev.as_raw(), Some(inner.callback), data as _) }; + let ret = unsafe { + bindings::devm_add_action(dev.as_raw(), Some(inner.callback), data.cast_mut().cast()) + }; if ret != 0 { // SAFETY: We just created another reference to `inner` in order to pass it to @@ -130,7 +131,7 @@ fn new(dev: &Device, data: T, flags: Flags) -> Result>> { } fn as_ptr(&self) -> *const Self { - self as _ + self } fn remove_action(this: &Arc) { diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index 43ecf3c2e860..851a6339aa90 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -38,7 +38,7 @@ impl Attrs { /// Get the raw representation of this attribute. pub(crate) fn as_raw(self) -> crate::ffi::c_ulong { - self.0 as _ + self.0 as crate::ffi::c_ulong } /// Check whether `flags` is contained in `self`. diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index b0e3d1bc0449..cff84d427627 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { /// Returns the error encoded as a pointer. pub fn to_ptr(self) -> *mut T { // SAFETY: `self.0` is a valid error due to its invariant. - unsafe { bindings::ERR_PTR(self.0.get() as _).cast() } + unsafe { bindings::ERR_PTR(self.0.get() as isize).cast() } } /// Returns a string representing the error, if one exists. diff --git a/rust/kernel/io.rs b/rust/kernel/io.rs index d4a73e52e3ee..9d2aadf40edf 100644 --- a/rust/kernel/io.rs +++ b/rust/kernel/io.rs @@ -5,7 +5,7 @@ //! C header: [`include/asm-generic/io.h`](srctree/include/asm-generic/io.h) use crate::error::{code::EINVAL, Result}; -use crate::{bindings, build_assert}; +use crate::{bindings, build_assert, ffi::c_void}; /// Raw representation of an MMIO region. /// @@ -56,7 +56,7 @@ pub fn maxsize(&self) -> usize { /// # Examples /// /// ```no_run -/// # use kernel::{bindings, io::{Io, IoRaw}}; +/// # use kernel::{bindings, ffi::c_void, io::{Io, IoRaw}}; /// # use core::ops::Deref; /// /// // See also [`pci::Bar`] for a real example. @@ -70,19 +70,19 @@ pub fn maxsize(&self) -> usize { /// unsafe fn new(paddr: usize) -> Result{ /// // SAFETY: By the safety requirements of this function [`paddr`, `paddr` + `SIZE`) is /// // valid for `ioremap`. -/// let addr = unsafe { bindings::ioremap(paddr as _, SIZE as _) }; +/// let addr = unsafe { bindings::ioremap(paddr as bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl Drop for IoMem { /// fn drop(&mut self) { /// // SAFETY: `self.0.addr()` is guaranteed to be properly mapped by `Self::new`. -/// unsafe { bindings::iounmap(self.0.addr() as _); }; +/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); }; /// } /// } /// @@ -119,7 +119,7 @@ pub fn $name(&self, offset: usize) -> $type_name { let addr = self.io_addr_assert::<$type_name>(offset); // SAFETY: By the type invariant `addr` is a valid address for MMIO operations. - unsafe { bindings::$name(addr as _) } + unsafe { bindings::$name(addr as *const c_void) } } /// Read IO data from a given offset. @@ -131,7 +131,7 @@ pub fn $try_name(&self, offset: usize) -> Result<$type_name> { let addr = self.io_addr::<$type_name>(offset)?; // SAFETY: By the type invariant `addr` is a valid address for MMIO operations. - Ok(unsafe { bindings::$name(addr as _) }) + Ok(unsafe { bindings::$name(addr as *const c_void) }) } }; } @@ -148,7 +148,7 @@ pub fn $name(&self, value: $type_name, offset: usize) { let addr = self.io_addr_assert::<$type_name>(offset); // SAFETY: By the type invariant `addr` is a valid address for MMIO operations. - unsafe { bindings::$name(value, addr as _, ) } + unsafe { bindings::$name(value, addr as *mut c_void) } } /// Write IO data from a given offset. @@ -160,7 +160,7 @@ pub fn $try_name(&self, value: $type_name, offset: usize) -> Result { let addr = self.io_addr::<$type_name>(offset)?; // SAFETY: By the type invariant `addr` is a valid address for MMIO operations. - unsafe { bindings::$name(value, addr as _) } + unsafe { bindings::$name(value, addr as *mut c_void) } Ok(()) } }; diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index e14433b2ab9d..2c66e926bffb 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -33,7 +33,7 @@ impl MiscDeviceOptions { pub const fn into_raw(self) -> bindings::miscdevice { // SAFETY: All zeros is valid for this C type. let mut result: bindings::miscdevice = unsafe { MaybeUninit::zeroed().assume_init() }; - result.minor = bindings::MISC_DYNAMIC_MINOR as _; + result.minor = bindings::MISC_DYNAMIC_MINOR as i32; result.name = self.name.as_char_ptr(); result.fops = create_vtable::(); result diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs index 04f2d8ef29cb..40d1bd13682c 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -22,7 +22,7 @@ unsafe impl RawDeviceId for DeviceId { const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::of_device_id, data); fn index(&self) -> usize { - self.0.data as _ + self.0.data as usize } } @@ -34,10 +34,10 @@ pub const fn new(compatible: &'static CStr) -> Self { // SAFETY: FFI type is valid to be zero-initialized. let mut of: bindings::of_device_id = unsafe { core::mem::zeroed() }; - // TODO: Use `clone_from_slice` once the corresponding types do match. + // TODO: Use `copy_from_slice` once stabilized for `const`. let mut i = 0; while i < src.len() { - of.compatible[i] = src[i] as _; + of.compatible[i] = src[i]; i += 1; } diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 003c9aaafb24..a26f154ae1b9 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -166,7 +166,7 @@ unsafe impl RawDeviceId for DeviceId { const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::pci_device_id, driver_data); fn index(&self) -> usize { - self.0.driver_data as _ + self.0.driver_data } } @@ -201,7 +201,10 @@ macro_rules! pci_device_table { /// MODULE_PCI_TABLE, /// ::IdInfo, /// [ -/// (pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, bindings::PCI_ANY_ID as _), ()) +/// ( +/// pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, bindings::PCI_ANY_ID as u32), +/// (), +/// ) /// ] /// ); /// @@ -317,7 +320,7 @@ unsafe fn do_release(pdev: &Device, ioptr: usize, num: i32) { // `ioptr` is valid by the safety requirements. // `num` is valid by the safety requirements. unsafe { - bindings::pci_iounmap(pdev.as_raw(), ioptr as _); + bindings::pci_iounmap(pdev.as_raw(), ioptr as *mut kernel::ffi::c_void); bindings::pci_release_region(pdev.as_raw(), num); } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 02863c40c21b..40034f77fc2f 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -738,9 +738,9 @@ fn new() -> Self { pub(crate) unsafe fn from_ptrs(pos: *mut u8, end: *mut u8) -> Self { // INVARIANT: The safety requirements guarantee the type invariants. Self { - beg: pos as _, - pos: pos as _, - end: end as _, + beg: pos as usize, + pos: pos as usize, + end: end as usize, } } @@ -765,7 +765,7 @@ pub(crate) unsafe fn from_buffer(buf: *mut u8, len: usize) -> Self { /// /// N.B. It may point to invalid memory. pub(crate) fn pos(&self) -> *mut u8 { - self.pos as _ + self.pos as *mut u8 } /// Returns the number of bytes written to the formatter. diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index 8ff54105be3f..d03f3440cb5a 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -198,7 +198,7 @@ pub fn enqueue(&self, w: W) -> W::EnqueueOutput unsafe { w.__enqueue(move |work_ptr| { bindings::queue_work_on( - bindings::wq_misc_consts_WORK_CPU_UNBOUND as _, + bindings::wq_misc_consts_WORK_CPU_UNBOUND as i32, queue_ptr, work_ptr, ) From patchwork Tue Mar 25 20:07:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029471 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B3BE269820; Tue, 25 Mar 2025 20:08:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933282; cv=none; b=NZWDND0w6mi8Wl920L8aRjljBWXKo3hF5w5YWaxy/K6SnTc6cOF6xL4O1ei1M5eeXPs05Y155W/YOPvplXVlVdntchmrGkbgs5+MVKtfU23mlV2V8ZnZoyydKaatdYEJlIz9+1hYp5fwcEINw9ucBOiKWFYM2cQGpTH9nPn1MXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933282; c=relaxed/simple; bh=KReJ9MAPMdhDjg2ApH8uAmGztOf1HiLSeSXEKsULmiY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aWXsDhApy0hRTtyjMyZuacFlJgDCoslHrm/P5hxrNOR4dQZa57Of0csddlK0y4GIC7F3tmcsVSr01Pc2VHMWj+Hf8aO4mXgfpwUfZQ/0wdxZRyFeAwb1n8p5PF1VPPac+U6Qknh/KR5BYt9RNjqkFIxea3keKNvhGBuKYqlS2tw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TeoGKVwo; arc=none smtp.client-ip=209.85.219.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TeoGKVwo" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6e8fca43972so62518176d6.1; Tue, 25 Mar 2025 13:08:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933279; x=1743538079; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WhHHPw9VsIQ8nPVAfMnycs/8Jg6QWfo4aL2Y5h0BST0=; b=TeoGKVwoL+QNpKhlGhPK9M+GZTYXy8czqCmBGh9NqnGioOkI/42HBA32HmT7alWGUt JrXqhIjvFSqRRSLqhLCireT7uiMp6oOZ+oCgK3PzgqyyGeSounlUwHdN42dQ6V0rCOzd Ei7+VhKNAt/3qHU0QcDGT2gGiKJf6LZ5VSlydK6K3adqzTtVB6v3I0mOHdzNvplpGv4M J3zQWQRJivt+14BIA98doZZV5P7CImEH0Oii0iHvNMUYiatNInn0ZDAa+MpivYh1LGE2 +/jOT1JDzRyZjYiijzZhss9lDKIagk5Kb46D1E+Q4OS8YX6T9Vc1WDSrQQBiwZMvFpll qJAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933279; x=1743538079; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WhHHPw9VsIQ8nPVAfMnycs/8Jg6QWfo4aL2Y5h0BST0=; b=aIi++u9Unsx9opAHVHePyA6zzORQunZxbfZETw3bnoQRiY2+bhwVLDz5ESFm2I3BZJ X9glN1y8vpjGcJLYHH0dnIffUuTWjoAq+pcpRRbl/oWoVwTcHKn0M/huh/jd9ZIZ+Gd8 d6NIEUyhElth+wf6/ygpr7aefa2AHPLOK6g2702ISeXkr2f/JgOXoLVcVL8n8o8CS/V3 mZO0uqAiZhssUoqktjqFHbW/NAF4U4iZqVHAMP4DSgmEIg/sCjbodT8htqgo24sCctcE VvSHA+8O0LHt/5s75iHF0DFGRVOcT2odyEsrrd/qropuNduWZ4d0XN9E/Of5z1zkVMDh txDA== X-Forwarded-Encrypted: i=1; AJvYcCU1YFmY0PqvsiUfDzGMfT3SXv78jJzUew54RVHXaLg+EpaC+iuIkLK1uotgfzwLDgSpmzWjomTww8F+XJmr@vger.kernel.org, AJvYcCULm77s5YUmDDnZDi6JGMURUUY4MgoC6Wznx/IQByDcO3BlqJ9C9z+r9AXp8nZRgIMq5MOmWg68qpn/vkCxUWW6@vger.kernel.org, AJvYcCUdXk8yCy8aiFKhgjSjteFqoKzgibrxhztDRWB9NBFCjRut77I5v21Bg7q6WFcXsCjDtZ3j9TXNskCSEc/e9i4=@vger.kernel.org, AJvYcCUzXEA3opCnYdxizA+c7QaRVeuYDO8Dm+bm5AGZdNWgOfF2VZn6SiaF5Z6wpSRumxMmtfcgAuZqxmNP@vger.kernel.org, AJvYcCVvXtREyVVfsgcehTqLdqv/JhUO3cxieEos1ngQ2KK8sraYps0LDfb9SX73E46uoS4CzCVVHr7R@vger.kernel.org, AJvYcCWh7+JScgJCkv4jkzV8UU29DHdLlIFjfrId+71eavM2+qNyD02K7RzHCpM49ZLF6db1skeQjCGOaBWhxq0=@vger.kernel.org, AJvYcCWucom6xOQnB+Boz+iCWH/+q1+hfNiysBZiJlbrPGZRxJpzROQ2aQSB8iApN6dorlY5i6A9wjjPJkkt@vger.kernel.org X-Gm-Message-State: AOJu0Yz2xzlxf1I8azv/86uedoyjLaXxNKvaLh1GFzekXbSTneHCKoJy HLvr7f4EXGdjkhBciUlHAujLNdgb4+N+WefhJSz6jPHUtw6X1+Ph X-Gm-Gg: ASbGncvca4U9Q9psrGuqpz8/rBaDOguiRZgyMslqZi7kmZquBVAjyVqslQUsnp8aZcg 4pNTD+JpNseIgY1rRGQrYZJptFGppyR3XwiB+Efn6tGSMRvw6cH9OjKAcNXThjtCpOjmaPcW09u ONkg6d9YoOLOet35YahUyLMHCFrNWiOBkuFUsULoWBLQEsJPgqrjkUu9cVR009MCGopYnNQmft1 rrwLuWRg7SDmwNvN7JYvfR8cYtWfocy3lW69l7CtPWF/NcbFGjQgTIj5sC/mnhpKt+kNsklk43D B/p7EEI8N1L+qw8O0c+ZBYcd1sMh8Gex4t36MtIMW9DX4wC21NPrLehz4OI/lf3BsqD8Vp0/fBJ tQTOaRAY0qKxlaHamF3kGiOrd9tA5bEgDfLZwOk7PUtmVjhsInUPdVQ== X-Google-Smtp-Source: AGHT+IGoTw6FuUYAgruyLB+0D5U26hD/STaRmc6f8lnI3rPnEGb1tHRnHvBUkYzvVURFj5tZDHV9gg== X-Received: by 2002:a05:6214:194b:b0:6e8:f133:3795 with SMTP id 6a1803df08f44-6eb3f34b5b6mr317424406d6.32.1742933278872; Tue, 25 Mar 2025 13:07:58 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:07:58 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:46 -0400 Subject: [PATCH v7 6/7] rust: enable `clippy::cast_lossless` lint Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-6-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Before Rust 1.29.0, Clippy introduced the `cast_lossless` lint [1]: > Rust’s `as` keyword will perform many kinds of conversions, including > silently lossy conversions. Conversion functions such as `i32::from` > will only perform lossless conversions. Using the conversion functions > prevents conversions from becoming silently lossy if the input types > ever change, and makes it clear for people reading the code that the > conversion is lossless. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#cast_lossless [1] Suggested-by: Benno Lossin Link: https://lore.kernel.org/all/D8ORTXSUTKGL.1KOJAGBM8F8TN@proton.me/ Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + drivers/gpu/drm/drm_panic_qr.rs | 10 +++++----- rust/bindings/lib.rs | 1 + rust/kernel/net/phy.rs | 4 ++-- rust/uapi/lib.rs | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2af40bfed9ce..2e9eca8b7671 100644 --- a/Makefile +++ b/Makefile @@ -479,6 +479,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ -Wclippy::as_underscore \ + -Wclippy::cast_lossless \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \ diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs index ecd87e8ffe05..01337ce896df 100644 --- a/drivers/gpu/drm/drm_panic_qr.rs +++ b/drivers/gpu/drm/drm_panic_qr.rs @@ -305,15 +305,15 @@ fn get_next_13b(data: &[u8], offset: usize) -> Option<(u16, usize)> { // `b` is 20 at max (`bit_off` <= 7 and `size` <= 13). let b = (bit_off + size) as u16; - let first_byte = (data[byte_off] << bit_off >> bit_off) as u16; + let first_byte = u16::from(data[byte_off] << bit_off >> bit_off); let number = match b { 0..=8 => first_byte >> (8 - b), - 9..=16 => (first_byte << (b - 8)) + (data[byte_off + 1] >> (16 - b)) as u16, + 9..=16 => (first_byte << (b - 8)) + u16::from(data[byte_off + 1] >> (16 - b)), _ => { (first_byte << (b - 8)) - + ((data[byte_off + 1] as u16) << (b - 16)) - + (data[byte_off + 2] >> (24 - b)) as u16 + + u16::from(data[byte_off + 1] << (b - 16)) + + u16::from(data[byte_off + 2] >> (24 - b)) } }; Some((number, size)) @@ -414,7 +414,7 @@ fn next(&mut self) -> Option { match self.segment { Segment::Binary(data) => { if self.offset < data.len() { - let byte = data[self.offset] as u16; + let byte = data[self.offset].into(); self.offset += 1; Some((byte, 8)) } else { diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index 0486a32ed314..b105a0d899cc 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -25,6 +25,7 @@ )] #[allow(dead_code)] +#[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] mod bindings_raw { diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index a59469c785e3..abc58b4d1bf4 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -142,7 +142,7 @@ pub fn is_autoneg_enabled(&self) -> bool { // SAFETY: The struct invariant ensures that we may access // this field without additional synchronization. let bit_field = unsafe { &(*self.0.get())._bitfield_1 }; - bit_field.get(13, 1) == bindings::AUTONEG_ENABLE as u64 + bit_field.get(13, 1) == bindings::AUTONEG_ENABLE.into() } /// Gets the current auto-negotiation state. @@ -426,7 +426,7 @@ impl Adapter { // where we hold `phy_device->lock`, so the accessors on // `Device` are okay to call. let dev = unsafe { Device::from_raw(phydev) }; - T::match_phy_device(dev) as i32 + T::match_phy_device(dev).into() } /// # Safety diff --git a/rust/uapi/lib.rs b/rust/uapi/lib.rs index f03b7aead35a..d5dab4dfabec 100644 --- a/rust/uapi/lib.rs +++ b/rust/uapi/lib.rs @@ -14,6 +14,7 @@ #![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::cast_lossless, clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, From patchwork Tue Mar 25 20:07:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14029472 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1ACC2698BF; Tue, 25 Mar 2025 20:08:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933284; cv=none; b=hWJT5vcjq9edpf0JNxXPgDeShgpSQCZaXNxO9EBTh70Lm5vQEvkLohDic1M2DNKzJ456CgkfZ7mtFb/y6KzHflkd+QeU+cUomWyY58DKa3+l//b7zHiXpehadh1duMm6qjeOI0wRqvjY/aBX9p0I7ydk7sAT9DnbMLHpdOYm23s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742933284; c=relaxed/simple; bh=yBKqzzQdtoM713Hx6YAh/9BRAMg/fNmYA6aigYaIn0Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C7uOj4dCcz5pIly7Gl0jJIAY8S1MuIpjYjDkAayIaD7ilDUSnyn8bGmcY17qaU8RYAHS25tENA3uGQ6ITld02+pb4bCItD9LPZL8I9LFqUimbOCwpDXCbw/2F+IHeyqKUvuk8oDsOaDF+NFiPMpWDFj68HAf+grFYhaci0uwFbw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dSJRB5C1; arc=none smtp.client-ip=209.85.219.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dSJRB5C1" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6e8f06e13a4so2107016d6.0; Tue, 25 Mar 2025 13:08:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742933281; x=1743538081; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=J7qMAKZkfn3qZ7sMOOmPjuPsXs8aZ5zQxKqzh4XVWmo=; b=dSJRB5C1CJrbQn3hnycGwhGMpNLlqaB/c2riiOc5A6RZ/2o+tNpnWssJURPxpjkjTX 6KFl7v8ua/NF+pUpl3LDMegXZkztwqpePSb0z/WnG+CEjK5kRIOxZhcD2hfSVs3Fgp3R chQICJB51wmRSPjAWUL3r7D95cHOJuqpO/ClkETWAtrQlrIGKHkCviHkvBHxMlPs1SUt xO8qCtlnanB2QRX6G4yGT4S26kzyI2+ILusI+eRSBU+XBURaMNjY7OdvCUXd3ALI3qA7 +KICzWZxlBAGdzPsDRKb0NAygMMYL0LmnFfNt2SIsVuypLVl96EttSL8brRIaf1vc0sK /k4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742933281; x=1743538081; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J7qMAKZkfn3qZ7sMOOmPjuPsXs8aZ5zQxKqzh4XVWmo=; b=EG/gm//zcMemgkbW7gHmOcj8v3fjzPEVST98yX3gtVvL+Vmw3BRxP87fyAo7P9+XA6 y/Hoj1uteNoDR8vohz5RNZ9QAwvEBSV2lNN5XPwQ6oJeDkzNHZCvkOJZxXBIMyNxgHlh Z3RpECiKoQNE06EYW2rabpB9j7Dw5sE+hrQ175rruGgZT4F81wQMs6YiCgwHkIxIMY2m DzIDR7rK1lRo/9UD+Xcn5bgxwjuC58u9ohyFs5eWm7CwLyLYe2iC6PNqA1SpyV8s/kci u1FJ37puPb6wV/ujB0VahhSiJu49nWRuBXBWK71Um+POSLoma6bkfe5V/S14ioTKcSh7 gKzw== X-Forwarded-Encrypted: i=1; AJvYcCU5Zd5AGsDS/tgbkc2jE05O81iEZdx1R8aNORl+ZGdLqwPSh3THE7/ESFg9DJY06s7huXX3JLJzm4xOBtof@vger.kernel.org, AJvYcCVqPhMcUcHbPJWPjUCzIuRI9mDFrLyWdob4Sf4WcV9DnybvsSCdbRRGlVtq7huNSMwO2PZvjB2GQVBGDvUKTSk=@vger.kernel.org, AJvYcCVqkRDvEXIlIyphaw2lyDA5Se+s/hO6QCcw41jTR5qw5eBnh/uOReW87pNHMHYralhJXUFhkv50UOq5/JRRHq6H@vger.kernel.org, AJvYcCW9F/978SXMgonDZWwHXOyQl5mcxGzDpU1mOBz1zpdPaWtjPllYynVzVJ7mgHrgrBoW9ayCssmeT7Am@vger.kernel.org, AJvYcCWHINeJ5VMqnco69REo9bW/bZfFwbW2YsmoJRhY3Bz2gg2fD0fob5UdhfDaBQHtRPDJOzUaT6itZ4B7n0g=@vger.kernel.org, AJvYcCWtp6NwJ1zLmBXmNu5UaJevYtfZiYWROUooVPoUVtR5IwcK8Ow4lsdh2FB+d++Ct2jOahvP8grxp7nc@vger.kernel.org, AJvYcCX2P/yC4L/2u71AnKfOkj2TWByDdMULLtjfMat29C4Udovl6IZfgVARwh3IEs6/URdl9qtuNx/y@vger.kernel.org X-Gm-Message-State: AOJu0YwiYRSiCTk9H8ZwoKuGhtv6Z6+L1B2MYGLvD1lZL/6l/eQ/zXc4 gZm2alapGVe3VYvZPv0wc6pbwTExJwfgEWyC1Ll5XwoGGIJata46TlVRJWcvVsU= X-Gm-Gg: ASbGnctJzUwFbQOnon1hMe6pzlDNNc7yYCNGFPMM5rP+QUV7dnRPvfXTWsdYhe65UpA sXAXA9czP+0GWoMQPSeL4dlTInv2uwc/0lLYQUBwU0SJflGfTweFI7rNnxp4RC9qJsCenH8zRL0 uifMm4X16/be/25sPpEWhzzVGLo3uJeJj0tzshRB/T7eynu4I9Rvd37Q/7+/8fEv/GEfwWUwaT/ BfR/RctT+8b6M3ViAQkJm+4/MaenIcMQEBeivLv7JlbxNmk/jZXZCiJjlU9zqi8FUCtmaT1ahMh g+52Ht1EehnYN93tOc9vGCh4CGdS18wmS9E0ydOzyBhc2Aqey27KZG619V1RlmQagGggIeldAkT Cc9Cdl/LCjIB9sbUJZf1zK5QfPnnTkf/qohgfk+9c6lfEhSTDZu3HjA== X-Google-Smtp-Source: AGHT+IFcj7P2M43acjXCLPntAogjbFV68WayLoYS23bXlpmJcLC/E6TkncrczRInojNWt3+ooJGElA== X-Received: by 2002:a05:6214:2528:b0:6e8:ec18:a1be with SMTP id 6a1803df08f44-6ed16c3e8cemr17403746d6.7.1742933280534; Tue, 25 Mar 2025 13:08:00 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:38f6]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3ef31810sm59790316d6.64.2025.03.25.13.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 13:08:00 -0700 (PDT) From: Tamir Duberstein Date: Tue, 25 Mar 2025 16:07:47 -0400 Subject: [PATCH v7 7/7] rust: enable `clippy::ref_as_ptr` lint Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250325-ptr-as-ptr-v7-7-87ab452147b9@gmail.com> References: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> In-Reply-To: <20250325-ptr-as-ptr-v7-0-87ab452147b9@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.78.0, Clippy introduced the `ref_as_ptr` lint [1]: > Using `as` casts may result in silently changing mutability or type. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ref_as_ptr [1] Suggested-by: Benno Lossin Link: https://lore.kernel.org/all/D8PGG7NTWB6U.3SS3A5LN4XWMN@proton.me/ Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/device_id.rs | 3 ++- rust/kernel/fs/file.rs | 3 ++- rust/kernel/str.rs | 4 ++-- rust/kernel/uaccess.rs | 5 +++-- rust/uapi/lib.rs | 1 + 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2e9eca8b7671..081b5fa2aa81 100644 --- a/Makefile +++ b/Makefile @@ -488,6 +488,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::no_mangle_with_rust_abi \ -Wclippy::ptr_as_ptr \ -Wclippy::ptr_cast_constness \ + -Wclippy::ref_as_ptr \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \ diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index b105a0d899cc..2b69016070c6 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -27,6 +27,7 @@ #[allow(dead_code)] #[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] +#[allow(clippy::ref_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] mod bindings_raw { // Manual definition for blocklisted types. diff --git a/rust/kernel/device_id.rs b/rust/kernel/device_id.rs index 4063f09d76d9..37cc03d1df4c 100644 --- a/rust/kernel/device_id.rs +++ b/rust/kernel/device_id.rs @@ -136,7 +136,8 @@ impl IdTable for IdArray { fn as_ptr(&self) -> *const T::RawType { // This cannot be `self.ids.as_ptr()`, as the return pointer must have correct provenance // to access the sentinel. - (self as *const Self).cast() + let this: *const Self = self; + this.cast() } fn id(&self, index: usize) -> &T::RawType { diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs index 9e2639aee61a..366e23dc0803 100644 --- a/rust/kernel/fs/file.rs +++ b/rust/kernel/fs/file.rs @@ -359,12 +359,13 @@ impl core::ops::Deref for File { type Target = LocalFile; #[inline] fn deref(&self) -> &LocalFile { + let this: *const Self = self; // SAFETY: The caller provides a `&File`, and since it is a reference, it must point at a // valid file for the desired duration. // // By the type invariants, there are no `fdget_pos` calls that did not take the // `f_pos_lock` mutex. - unsafe { LocalFile::from_raw_file((self as *const Self).cast()) } + unsafe { LocalFile::from_raw_file(this.cast()) } } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 40034f77fc2f..6233af50bab7 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -29,7 +29,7 @@ pub const fn is_empty(&self) -> bool { #[inline] pub const fn from_bytes(bytes: &[u8]) -> &Self { // SAFETY: `BStr` is transparent to `[u8]`. - unsafe { &*(bytes as *const [u8] as *const BStr) } + unsafe { &*(core::mem::transmute::<*const [u8], *const Self>(bytes)) } } /// Strip a prefix from `self`. Delegates to [`slice::strip_prefix`]. @@ -290,7 +290,7 @@ pub const fn from_bytes_with_nul(bytes: &[u8]) -> Result<&Self, CStrConvertError #[inline] pub unsafe fn from_bytes_with_nul_unchecked_mut(bytes: &mut [u8]) -> &mut CStr { // SAFETY: Properties of `bytes` guaranteed by the safety precondition. - unsafe { &mut *(bytes as *mut [u8] as *mut CStr) } + unsafe { &mut *(core::mem::transmute::<*mut [u8], *mut Self>(bytes)) } } /// Returns a C pointer to the string. diff --git a/rust/kernel/uaccess.rs b/rust/kernel/uaccess.rs index 80a9782b1c6e..c042b1fe499e 100644 --- a/rust/kernel/uaccess.rs +++ b/rust/kernel/uaccess.rs @@ -242,7 +242,7 @@ pub fn read_raw(&mut self, out: &mut [MaybeUninit]) -> Result { pub fn read_slice(&mut self, out: &mut [u8]) -> Result { // SAFETY: The types are compatible and `read_raw` doesn't write uninitialized bytes to // `out`. - let out = unsafe { &mut *(out as *mut [u8] as *mut [MaybeUninit]) }; + let out = unsafe { &mut *(core::mem::transmute::<*mut [u8], *mut [MaybeUninit]>(out)) }; self.read_raw(out) } @@ -348,6 +348,7 @@ pub fn write(&mut self, value: &T) -> Result { if len > self.length { return Err(EFAULT); } + let value: *const T = value; // SAFETY: The reference points to a value of type `T`, so it is valid for reading // `size_of::()` bytes. // @@ -357,7 +358,7 @@ pub fn write(&mut self, value: &T) -> Result { let res = unsafe { bindings::_copy_to_user( self.ptr as *mut c_void, - (value as *const T).cast::(), + value.cast::(), len, ) }; diff --git a/rust/uapi/lib.rs b/rust/uapi/lib.rs index d5dab4dfabec..6230ba48201d 100644 --- a/rust/uapi/lib.rs +++ b/rust/uapi/lib.rs @@ -16,6 +16,7 @@ clippy::all, clippy::cast_lossless, clippy::ptr_as_ptr, + clippy::ref_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs,