Skip to contentSkip to conversation

rust: reduce pointer casts, enable related lints

PATCH Superseded Tamir Duberstein 3 participants 38 messages Mar 9, 2025 – Mar 14, 2025

Subsystems (16)
VFS Block layer Kbuild Kselftest +12 more subsystems

v2 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

v2 cover rust: reduce pointer casts, enable related lints

This started with a patch that enabled clippy::ptr_as_ptr. Benno Lossin suggested I also look into clippy::ptr_cast_constness and I discovered clippy::as_ptr_cast_mut. This series now enables all 3 lints. It also enables clippy::as_underscore which ensures other pointer casts weren't missed. The first commit reduces the need for pointer casts and is shared with another series[1].

---
Changes in v2:
- Fixed typo in first commit message.
- Added additional patches, converted to series.
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Tamir Duberstein (5):
rust: retain pointer mut-ness in container_of!
rust: enable clippy::ptr_as_ptr lint
rust: enable clippy::ptr_cast_constness lint
rust: enable clippy::as_ptr_cast_mut lint
rust: enable clippy::as_underscore lint

 Makefile                               |  4 ++++
 rust/bindings/lib.rs                   |  1 +
 rust/kernel/alloc/allocator_test.rs    |  2 +-
 rust/kernel/alloc/kvec.rs              |  4 ++--
 rust/kernel/block/mq/operations.rs     |  2 +-
 rust/kernel/block/mq/request.rs        |  7 ++++---
 rust/kernel/device.rs                  |  5 +++--
 rust/kernel/device_id.rs               |  2 +-
 rust/kernel/devres.rs                  | 19 ++++++++++---------
 rust/kernel/error.rs                   |  2 +-
 rust/kernel/firmware.rs                |  2 +-
 rust/kernel/fs/file.rs                 |  2 +-
 rust/kernel/io.rs                      | 18 +++++++++---------
 rust/kernel/kunit.rs                   | 15 +++++++--------
 rust/kernel/lib.rs                     |  5 ++---
 rust/kernel/list/impl_list_item_mod.rs |  2 +-
 rust/kernel/miscdevice.rs              |  2 +-
 rust/kernel/of.rs                      |  6 +++---
 rust/kernel/pci.rs                     | 13 ++++++++-----
 rust/kernel/platform.rs                |  6 ++++--
 rust/kernel/print.rs                   | 11 +++++------
 rust/kernel/rbtree.rs                  | 23 ++++++++++-------------
 rust/kernel/seq_file.rs                |  3 ++-
 rust/kernel/str.rs                     | 10 +++++-----
 rust/kernel/sync/poll.rs               |  2 +-
 rust/kernel/workqueue.rs               | 12 ++++++------
 rust/uapi/lib.rs                       |  1 +
 27 files changed, 95 insertions(+), 86 deletions(-)

---
base-commit: ff64846bee0e7e3e7bc9363ebad3bab42dd27e24
change-id: 20250307-ptr-as-ptr-21b1867fc4d4

Best regards,

Signature · 1 line
Tamir Duberstein <[email protected]>
#1 lore raw

PATCH v2 1/5 rust: retain pointer mut-ness in `container_of!`

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.

---
 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(-)
rust/kernel/lib.rs +2 -3
index 7697c60b2d1a..9cd6b6864739 100644
@@ -187,7 +187,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) };
@@ -196,9 +196,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>()
     }}
 }
 
rust/kernel/pci.rs +1 -1
index 4c98b5b9aa1e..c37476576f02 100644
@@ -364,7 +364,7 @@ pub unsafe fn from_dev(dev: ARef<device::Device>) -> 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.
rust/kernel/platform.rs +1 -1
index 50e6b0421813..c51617569c01 100644
@@ -189,7 +189,7 @@ unsafe fn from_dev(dev: ARef<device::Device>) -> 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) }
     }
 }
 
rust/kernel/rbtree.rs +10 -13
index 0d1e75810664..1fdea2806cfa 100644
@@ -424,7 +424,7 @@ pub fn cursor_lower_bound(&mut self, key: &K) -> Option<Cursor<'_, K, V>>
         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<K, V>` objects.
-            let this = unsafe { container_of!(node, Node<K, V>, links) }.cast_mut();
+            let this = unsafe { container_of!(node, Node<K, V>, 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<Self>, RBTreeNode<K, V>) {
         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<K, V>` objects.
-        let this = unsafe { container_of!(self.current.as_ptr(), Node<K, V>, links) }.cast_mut();
+        let this = unsafe { container_of!(self.current.as_ptr(), Node<K, V>, 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<RBTreeNode<K, V>>
             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<K, V>` objects.
-            let this = unsafe { container_of!(neighbor, Node<K, V>, links) }.cast_mut();
+            let this = unsafe { container_of!(neighbor, Node<K, V>, 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<bindings::rb_node>) -> (&'b K, &'b
     unsafe fn to_key_value_raw<'b>(node: NonNull<bindings::rb_node>) -> (&'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<K, V>` objects.
-        let this = unsafe { container_of!(node.as_ptr(), Node<K, V>, links) }.cast_mut();
+        let this = unsafe { container_of!(node.as_ptr(), Node<K, V>, 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<Self::Item> {
 
         // 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<K, V>` objects.
-        let cur = unsafe { container_of!(self.next, Node<K, V>, links) }.cast_mut();
+        let cur = unsafe { container_of!(self.next, Node<K, V>, 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<K, V>, links).cast_mut())).value }
+        unsafe { &mut (*(container_of!(self.node_links, Node<K, V>, 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<K, V>`, therefore it can give out a mutable reference that lives for `'a`.
-        unsafe { &mut (*(container_of!(self.node_links, Node<K, V>, links).cast_mut())).value }
+        unsafe { &mut (*(container_of!(self.node_links, Node<K, V>, links))).value }
     }
 
     /// Remove this entry from the [`RBTree`].
@@ -1239,9 +1239,7 @@ pub fn remove_node(self) -> RBTreeNode<K, V> {
         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<K, V>, links).cast_mut())
-            },
+            node: unsafe { KBox::from_raw(container_of!(self.node_links, Node<K, V>, links)) },
         }
     }
 
@@ -1272,8 +1270,7 @@ fn replace(self, node: RBTreeNode<K, V>) -> RBTreeNode<K, V> {
         // 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<K, V>, links).cast_mut()) };
+        let old_node = unsafe { KBox::from_raw(container_of!(self.node_links, Node<K, V>, links)) };
 
         RBTreeNode { node: old_node }
     }
Signature · 1 line
2.48.1
Reviewed-by on v2 1/5
#2 lore raw

Re: [PATCH v2 1/5] rust: retain pointer mut-ness in `container_of!`

Quoted 7 lines · Tamir Duberstein

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.

One tiny nit below, but even without that:

Quoted 12 lines
---
 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(-)
rust/kernel/lib.rs +0 -0
index 7697c60b2d1a..9cd6b6864739 100644

rust/kernel/lib.rs fn panic(info: &core::panic::PanicInfo<'_>) -> ! { · line 190

Quoted 5 lines
rust/kernel/lib.rs +1 -1
@@ -187,7 +187,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;

You could also use &raw test.b to get a pointer instead of relying on the pointer coercion. That syntax is stable since 1.82.0, so older compilers would need to enable the raw_ref_op feature.

I created an orthogonal good-first-issue for changing uses of addr_of[_mut]! to &raw [mut], so maybe that can also be done there:

    https://github.com/Rust-for-Linux/linux/issues/1148

---
Cheers,
Benno

#3 lore raw

Re: [PATCH v2 1/5] rust: retain pointer mut-ness in `container_of!`

Quoted 36 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein

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.

One tiny nit below, but even without that:

Quoted 12 lines
---
 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(-)
rust/kernel/lib.rs +0 -0
index 7697c60b2d1a..9cd6b6864739 100644

rust/kernel/lib.rs fn panic(info: &core::panic::PanicInfo<'_>) -> ! { · line 190

Quoted 5 lines
rust/kernel/lib.rs +1 -1
@@ -187,7 +187,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;

You could also use &raw test.b to get a pointer instead of relying on the pointer coercion. That syntax is stable since 1.82.0, so older compilers would need to enable the raw_ref_op feature.

Quoted 4 lines

I created an orthogonal good-first-issue for changing uses of addr_of[_mut]! to &raw [mut], so maybe that can also be done there:

    https://github.com/Rust-for-Linux/linux/issues/1148

Thanks for doing that! Yeah, I think moving to that syntax would be good but as you say requires enabling the feature and/or bumping the rust version, so it can't be done here directly.

#4 lore raw

PATCH v2 2/5 rust: enable `clippy::ptr_as_ptr` lint

In reply to Tamir Duberstein

In Rust 1.51.0, Clippy introduced the ptr_as_ptr lint [1]:

Quoted 3 lines

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::<T>().
- Multistep casts from references ( as *const _ as *const T) are replaced with let x: *const _ = &x; and .cast() or .cast::<T>() according to the previous rules. The intermediate let binding is required because (x as *const _).cast::<T>() results in inference failure.
- Native literal C strings are replaced with c_str!().as_char_ptr().

Apply these changes and enable the lint -- no functional change intended.

---
 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/error.rs                   |  2 +-
 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 +
 18 files changed, 38 insertions(+), 33 deletions(-)
Makefile +1 -0
index 70bdbf2218fc..ec8efc8e23ba 100644
@@ -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 \
rust/bindings/lib.rs +1 -0
index 014af0d1fc70..0486a32ed314 100644
@@ -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.
rust/kernel/alloc/allocator_test.rs +1 -1
index c37d4c0c64e9..8017aa9d5213 100644
@@ -82,7 +82,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::<u8>();
         let dst = NonNull::new(dst).ok_or(AllocError)?;
 
         if flags.contains(__GFP_ZERO) {
rust/kernel/alloc/kvec.rs +2 -2
index ae9d072741ce..c12844764671 100644
@@ -262,7 +262,7 @@ pub fn spare_capacity_mut(&mut self) -> &mut [MaybeUninit<T>] {
         // - `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<T>;
+        let ptr = unsafe { self.as_mut_ptr().add(self.len) }.cast::<MaybeUninit<T>>();
 
         // 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::<T>() * 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) }
     }
 }
 
rust/kernel/device.rs +3 -2
index db2d9658ba47..9e500498835d 100644
@@ -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::<crate::ffi::c_char>(),
                 self.as_raw(),
                 c_str!("%pA").as_char_ptr(),
-                &msg as *const _ as *const crate::ffi::c_void,
+                msg.cast::<crate::ffi::c_void>(),
             )
         };
     }
rust/kernel/devres.rs +1 -1
index 942376f6f3af..3a9d998ec371 100644
@@ -157,7 +157,7 @@ fn remove_action(this: &Arc<Self>) {
 
     #[allow(clippy::missing_safety_doc)]
     unsafe extern "C" fn devres_callback(ptr: *mut kernel::ffi::c_void) {
-        let ptr = ptr as *mut DevresInner<T>;
+        let ptr = ptr.cast::<DevresInner<T>>();
         // 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
rust/kernel/error.rs +1 -1
index f6ecf09cb65f..8654d52b0bb9 100644
@@ -152,7 +152,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {
     /// Returns the error encoded as a pointer.
     pub fn to_ptr<T>(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.
rust/kernel/fs/file.rs +1 -1
index e03dbe14d62a..8936afc234a4 100644
@@ -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()) }
     }
 }
 
rust/kernel/kunit.rs +7 -8
index 824da0e9738a..7ed2063c1af0 100644
@@ -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::<c_void>());
     }
 }
 
@@ -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::<c_void>());
     }
 }
 
rust/kernel/list/impl_list_item_mod.rs +1 -1
index a0438537cee1..1f9498c1458f 100644
@@ -34,7 +34,7 @@ pub unsafe trait HasListLinks<const ID: u64 = 0> {
     unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut ListLinks<ID> {
         // 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<ID> }
+        unsafe { ptr.cast::<u8>().add(Self::OFFSET).cast() }
     }
 }
 
rust/kernel/pci.rs +1 -1
index c37476576f02..63218abb7a25 100644
@@ -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),
         }
rust/kernel/platform.rs +3 -1
index c51617569c01..d609119e8ce8 100644
@@ -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),
         }
rust/kernel/print.rs +5 -6
index b19ee490be58..0245c145ea32 100644
@@ -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::<fmt::Arguments<'_>>() });
     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::<c_void>(),
         );
     }
 }
@@ -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::<c_void>());
     }
 }
 
rust/kernel/seq_file.rs +2 -1
index 04947c672979..90545d28e6b7 100644
@@ -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::<crate::ffi::c_void>(),
             );
         }
     }
rust/kernel/str.rs +1 -1
index 28e2201604d6..6a1a982b946d 100644
@@ -191,7 +191,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) }
rust/kernel/sync/poll.rs +1 -1
index d5f17153b424..a151f54cde91 100644
@@ -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()) };
         }
     }
 }
rust/kernel/workqueue.rs +5 -5
index 0cd100d2aefb..8ff54105be3f 100644
@@ -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::<Queue>() }
     }
 
     /// 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<T, ID> {
         // SAFETY: The caller promises that the pointer is valid.
-        unsafe { (ptr as *mut u8).add(Self::OFFSET) as *mut Work<T, ID> }
+        unsafe { ptr.cast::<u8>().add(Self::OFFSET).cast::<Work<T, ID>>() }
     }
 
     /// Returns a pointer to the struct containing the [`Work<T, ID>`] field.
@@ -472,7 +472,7 @@ unsafe fn work_container_of(ptr: *mut Work<T, ID>) -> *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::<u8>().sub(Self::OFFSET).cast::<Self>() }
     }
 }
 
@@ -538,7 +538,7 @@ unsafe impl<T, const ID: u64> WorkItemPointer<ID> for Arc<T>
 {
     unsafe extern "C" fn run(ptr: *mut bindings::work_struct) {
         // The `__enqueue` method always uses a `work_struct` stored in a `Work<T, ID>`.
-        let ptr = ptr as *mut Work<T, ID>;
+        let ptr = ptr.cast::<Work<T, ID>>();
         // 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<T, const ID: u64> WorkItemPointer<ID> for Pin<KBox<T>>
 {
     unsafe extern "C" fn run(ptr: *mut bindings::work_struct) {
         // The `__enqueue` method always uses a `work_struct` stored in a `Work<T, ID>`.
-        let ptr = ptr as *mut Work<T, ID>;
+        let ptr = ptr.cast::<Work<T, ID>>();
         // 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.
rust/uapi/lib.rs +1 -0
index 13495910271f..fe9bf7b5a306 100644
@@ -15,6 +15,7 @@
 #![allow(
     clippy::all,
     clippy::undocumented_unsafe_blocks,
+    clippy::ptr_as_ptr,
     dead_code,
     missing_docs,
     non_camel_case_types,
Signature · 1 line
2.48.1
Reviewed-by on v2 2/5
#5 lore raw

Re: [PATCH v2 2/5] rust: enable `clippy::ptr_as_ptr` lint

Quoted 6 lines · Tamir Duberstein

In Rust 1.51.0, Clippy introduced the ptr_as_ptr lint [1]:

Quoted 3 lines

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.

Quoted 7 lines

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::<T>().
- Multistep casts from references ( as *const _ as *const T) are replaced with let x: *const _ = &x; and .cast() or .cast::<T>()

Similarly to the other patch, this could be let x = &raw x;. (but it's fine to leave it as-is for now, we can also make that a good-first-issue.)

Quoted 10 lines

according to the previous rules. The intermediate let binding is required because (x as *const _).cast::<T>() results in inference failure.
- Native literal C strings are replaced with c_str!().as_char_ptr().

Apply these changes and enable the lint -- no functional change intended.

---
Cheers,
Benno

Quoted 20 lines
---
 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/error.rs                   |  2 +-
 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 +
 18 files changed, 38 insertions(+), 33 deletions(-)
#6 lore raw

Re: [PATCH v2 2/5] rust: enable `clippy::ptr_as_ptr` lint

Quoted 16 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

In Rust 1.51.0, Clippy introduced the ptr_as_ptr lint [1]:

Quoted 3 lines

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.

Quoted 7 lines

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::<T>().
- Multistep casts from references ( as *const _ as *const T) are replaced with let x: *const _ = &x; and .cast() or .cast::<T>()

Quoted 3 lines

Similarly to the other patch, this could be let x = &raw x;. (but it's fine to leave it as-is for now, we can also make that a good-first-issue.)

Yeah, same as the other patch; we can't directly do that here without introducing some compiler infra or bumping MSRV.

Quoted 5 lines
Quoted 5 lines

according to the previous rules. The intermediate let binding is required because (x as *const _).cast::<T>() results in inference failure.
- Native literal C strings are replaced with c_str!().as_char_ptr().

Quoted 7 lines
Quoted 5 lines

Apply these changes and enable the lint -- no functional change intended.

Thanks!

#7 lore raw

Re: [PATCH v2 2/5] rust: enable `clippy::ptr_as_ptr` lint

Quoted 17 lines · Tamir Duberstein
Quoted 16 lines · Benno Lossin
Quoted 13 lines · Tamir Duberstein

In Rust 1.51.0, Clippy introduced the ptr_as_ptr lint [1]:

Quoted 3 lines

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::<T>().
- Multistep casts from references ( as *const _ as *const T) are replaced with let x: *const _ = &x; and .cast() or .cast::<T>()

Quoted 6 lines
Quoted 3 lines

Similarly to the other patch, this could be let x = &raw x;. (but it's fine to leave it as-is for now, we can also make that a good-first-issue.)

Yeah, same as the other patch; we can't directly do that here without introducing some compiler infra or bumping MSRV.

I think it's fine enabling the feature for this patch (or in a prior one) if you want to do the work. But someone already took up the issue I created, so maybe it's best to let them handle it.

---
Cheers,
Benno

#8 lore raw

PATCH v2 3/5 rust: enable `clippy::ptr_cast_constness` lint

In reply to Tamir Duberstein

In Rust 1.72.0, Clippy introduced the ptr_cast_constness lint [1]:

Quoted 3 lines

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.

---
 Makefile                        | 1 +
 rust/kernel/block/mq/request.rs | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
Makefile +1 -0
index ec8efc8e23ba..c62bae2b107b 100644
@@ -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 \
rust/kernel/block/mq/request.rs +3 -2
index 7943f43b9575..10c6d69be7f3 100644
@@ -69,7 +69,7 @@ pub(crate) unsafe fn aref_from_raw(ptr: *mut bindings::request) -> ARef<Self> {
         // 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<RequestDataWrapper>
     /// 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() }
     }
 }
 
Signature · 1 line
2.48.1
Reviewed-by on v2 3/5
#9 lore raw

Re: [PATCH v2 3/5] rust: enable `clippy::ptr_cast_constness` lint

Quoted 11 lines · Tamir Duberstein

In Rust 1.72.0, Clippy introduced the ptr_cast_constness lint [1]:

Quoted 3 lines

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().

Quoted 5 lines

Apply these changes and enable the lint -- no functional change intended.

---
Cheers,
Benno

Quoted 4 lines
---
 Makefile                        | 1 +
 rust/kernel/block/mq/request.rs | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
#10 lore raw

PATCH v2 4/5 rust: enable `clippy::as_ptr_cast_mut` lint

In reply to Tamir Duberstein

In Rust 1.66.0, Clippy introduced the as_ptr_cast_mut lint [1]:

Quoted 3 lines

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.

---
 Makefile              | 1 +
 rust/kernel/devres.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Makefile +1 -0
index c62bae2b107b..bb15b86182a3 100644
@@ -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 \
rust/kernel/devres.rs +1 -1
index 3a9d998ec371..598001157293 100644
@@ -143,7 +143,7 @@ fn remove_action(this: &Arc<Self>) {
             bindings::devm_remove_action_nowarn(
                 this.dev.as_raw(),
                 Some(this.callback),
-                this.as_ptr() as _,
+                this.as_ptr().cast_mut().cast(),
             )
         };
 
Signature · 1 line
2.48.1
Reviewed-by on v2 4/5
#11 lore raw

Re: [PATCH v2 4/5] rust: enable `clippy::as_ptr_cast_mut` lint

Quoted 6 lines · Tamir Duberstein

In Rust 1.66.0, Clippy introduced the as_ptr_cast_mut lint [1]:

Quoted 3 lines

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.

Quoted 8 lines

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.

---
Cheers,
Benno

Quoted 30 lines
---
 Makefile              | 1 +
 rust/kernel/devres.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Makefile +1 -0
index c62bae2b107b..bb15b86182a3 100644
@@ -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 \
rust/kernel/devres.rs +1 -1
index 3a9d998ec371..598001157293 100644
@@ -143,7 +143,7 @@ fn remove_action(this: &Arc<Self>) {
             bindings::devm_remove_action_nowarn(
                 this.dev.as_raw(),
                 Some(this.callback),
-                this.as_ptr() as _,
+                this.as_ptr().cast_mut().cast(),
             )
         };
 
#12 lore raw

PATCH v2 5/5 rust: enable `clippy::as_underscore` lint

In reply to Tamir Duberstein

In Rust 1.63.0, Clippy introduced the as_underscore lint [1]:

Quoted 5 lines

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.

---
 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/error.rs               |  2 +-
 rust/kernel/firmware.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(-)
Makefile +1 -0
index bb15b86182a3..2af40bfed9ce 100644
@@ -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 \
rust/kernel/block/mq/operations.rs +1 -1
index 864ff379dc91..d18ef55490da 100644
@@ -101,7 +101,7 @@ impl<T: Operations> OperationsVTable<T> {
         if let Err(e) = ret {
             e.to_blk_status()
         } else {
-            bindings::BLK_STS_OK as _
+            bindings::BLK_STS_OK as u8
         }
     }
 
rust/kernel/block/mq/request.rs +1 -1
index 10c6d69be7f3..bcf2b73d9189 100644
@@ -125,7 +125,7 @@ pub fn end_ok(this: ARef<Self>) -> Result<(), ARef<Self>> {
         // 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(())
     }
rust/kernel/device_id.rs +1 -1
index e5859217a579..4063f09d76d9 100644
@@ -82,7 +82,7 @@ impl<T: RawDeviceId, U, const N: usize> IdArray<T, U, N> {
             unsafe {
                 raw_ids[i]
                     .as_mut_ptr()
-                    .byte_offset(T::DRIVER_DATA_OFFSET as _)
+                    .byte_add(T::DRIVER_DATA_OFFSET)
                     .cast::<usize>()
                     .write(i);
             }
rust/kernel/devres.rs +8 -7
index 598001157293..20159b7c9293 100644
@@ -45,7 +45,7 @@ struct DevresInner<T> {
 /// # 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<T> {
 ///     unsafe fn new(paddr: usize) -> Result<Self>{
 ///         // 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 u64, SIZE) };
 ///         if addr.is_null() {
 ///             return Err(ENOMEM);
 ///         }
 ///
-///         Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
+///         Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))
 ///     }
 /// }
 ///
 /// impl<const SIZE: usize> Drop for IoMem<SIZE> {
 ///     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<Arc<DevresInner<T>>> {
 
         // 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<Arc<DevresInner<T>>> {
     }
 
     fn as_ptr(&self) -> *const Self {
-        self as _
+        self
     }
 
     fn remove_action(this: &Arc<Self>) {
rust/kernel/error.rs +1 -1
index 8654d52b0bb9..eb8fa52f08ba 100644
@@ -152,7 +152,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {
     /// Returns the error encoded as a pointer.
     pub fn to_ptr<T>(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.
rust/kernel/firmware.rs +1 -1
index c5162fdc95ff..9a279330261c 100644
@@ -61,7 +61,7 @@ fn request_internal(name: &CStr, dev: &Device, func: FwFunc) -> Result<Self> {
 
         // 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));
         }
rust/kernel/io.rs +9 -9
index d4a73e52e3ee..d375eed73dc8 100644
@@ -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<Self>{
 ///         // 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 u64, SIZE) };
 ///         if addr.is_null() {
 ///             return Err(ENOMEM);
 ///         }
 ///
-///         Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
+///         Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))
 ///     }
 /// }
 ///
 /// impl<const SIZE: usize> Drop for IoMem<SIZE> {
 ///     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(())
         }
     };
rust/kernel/miscdevice.rs +1 -1
index e14433b2ab9d..2c66e926bffb 100644
@@ -33,7 +33,7 @@ impl MiscDeviceOptions {
     pub const fn into_raw<T: MiscDevice>(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::<T>();
         result
rust/kernel/of.rs +3 -3
index 04f2d8ef29cb..40d1bd13682c 100644
@@ -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;
         }
 
rust/kernel/pci.rs +6 -3
index 63218abb7a25..a925732f6c7a 100644
@@ -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,
 ///     <MyDriver as pci::Driver>::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);
         }
     }
rust/kernel/str.rs +4 -4
index 6a1a982b946d..0b80a119d5f0 100644
@@ -692,9 +692,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,
         }
     }
 
@@ -719,7 +719,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.
rust/kernel/workqueue.rs +1 -1
index 8ff54105be3f..d03f3440cb5a 100644
@@ -198,7 +198,7 @@ pub fn enqueue<W, const ID: u64>(&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,
                 )
Signature · 1 line
2.48.1
#13 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 14 lines · Tamir Duberstein
rust/kernel/devres.rs +1 -1
index 598001157293..20159b7c9293 100644
@@ -45,7 +45,7 @@ struct DevresInner<T> {
 /// # 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.

rust/kernel/devres.rs struct DevresInner<T> { · line 62

Quoted 5 lines
rust/kernel/devres.rs +1 -1
@@ -59,19 +59,19 @@ struct DevresInner<T> {
 ///     unsafe fn new(paddr: usize) -> Result<Self>{
 ///         // 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 u64, SIZE) };

The argument of ioremap is defined as resource_size_t which ultimately maps to u64 on 64 bit systems and u32 on 32 bit ones. I don't think that we should have code like this... Is there another option?

Maybe Gary knows something here, do we have a type that represents that better?

rust/kernel/devres.rs struct DevresInner<T> { · line 67

Quoted 6 lines
rust/kernel/devres.rs +1 -1
 ///         if addr.is_null() {
 ///             return Err(ENOMEM);
 ///         }
 ///
-///         Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
+///         Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))

This should be addr.addr() (requires strict_provenance on Rust 1.83 & before).

(I am assuming that we're never casting the usize back to a pointer, since otherwise this change would introduce UB)

rust/kernel/devres.rs struct DevresInner<T> { · line 74

Quoted 8 lines
rust/kernel/devres.rs +1 -1
 ///     }
 /// }
 ///
 /// impl<const SIZE: usize> Drop for IoMem<SIZE> {
 ///     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); };

Can't this be a .cast::<c_void>()?

Quoted 9 lines
rust/kernel/devres.rs +0 -0
 ///     }
 /// }
 ///
rust/kernel/error.rs +0 -0
index 8654d52b0bb9..eb8fa52f08ba 100644

rust/kernel/error.rs pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { · line 155

Quoted 5 lines
rust/kernel/error.rs +1 -1
@@ -152,7 +152,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {
     /// Returns the error encoded as a pointer.
     pub fn to_ptr<T>(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() }

Can't this be a .into()?

rust/kernel/error.rs pub fn $name(&self, offset: usize) -> $type_name { · line 122

Quoted 10 lines
rust/kernel/error.rs +1 -1
     }
 
     /// Returns a string representing the error, if one exists.
@@ -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) }

Also here, is .cast::<c_void>() enough? (and below)

Quoted 9 lines
rust/kernel/error.rs +0 -0
         }
 
         /// Read IO data from a given offset.
rust/kernel/of.rs +0 -0
index 04f2d8ef29cb..40d1bd13682c 100644

rust/kernel/of.rs unsafe impl RawDeviceId for DeviceId { · line 25

Quoted 5 lines
rust/kernel/of.rs +1 -1
@@ -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

This should also be self.0.data.addr().

rust/kernel/of.rs pub const fn new(compatible: &'static CStr) -> Self { · line 37

Quoted 9 lines
rust/kernel/of.rs +1 -1
     }
 }
 
@@ -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`.

This feature has just been stabilized (5 days ago!):

    https://github.com/rust-lang/rust/issues/131415

@Miguel: Do we already have a target Rust version for dropping the RUSTC_BOOTSTRAP=1? If not, then I think we should use this feature now, since it will be stable by the time we bump the minimum version. (not in this patch [series] though)

rust/kernel/of.rs unsafe fn do_release(pdev: &Device, ioptr: usize, num: i32) { · line 323

Quoted 13 lines
rust/kernel/of.rs +2 -2
         let mut i = 0;
         while i < src.len() {
-            of.compatible[i] = src[i] as _;
+            of.compatible[i] = src[i];
             i += 1;
         }
 
@@ -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);

Again, probably castable.

Quoted 8 lines
rust/kernel/of.rs +0 -0
             bindings::pci_release_region(pdev.as_raw(), num);
         }
     }
rust/kernel/str.rs +0 -0
index 6a1a982b946d..0b80a119d5f0 100644

rust/kernel/str.rs fn new() -> Self { · line 697

Quoted 9 lines
rust/kernel/str.rs +3 -3
@@ -692,9 +692,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,

I would prefer if we use pos.expose_provenance() (also for end) here.

rust/kernel/str.rs pub(crate) unsafe fn from_buffer(buf: *mut u8, len: usize) -> Self { · line 722

Quoted 9 lines
rust/kernel/str.rs +1 -1
         }
     }
 
@@ -719,7 +719,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

This should then also be with_exposed_provenance(self.pos)

---
Cheers,
Benno

Quoted 16 lines
rust/kernel/str.rs +0 -0
     }
 
     /// Returns the number of bytes written to the formatter.
rust/kernel/workqueue.rs +1 -1
index 8ff54105be3f..d03f3440cb5a 100644
@@ -198,7 +198,7 @@ pub fn enqueue<W, const ID: u64>(&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,
                 )
#14 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 27 lines · Benno Lossin
Quoted 14 lines · Tamir Duberstein
rust/kernel/devres.rs +1 -1
index 598001157293..20159b7c9293 100644
@@ -45,7 +45,7 @@ struct DevresInner<T> {
 /// # 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.

rust/kernel/devres.rs struct DevresInner<T> { · line 62

Quoted 5 lines
rust/kernel/devres.rs +1 -1
@@ -59,19 +59,19 @@ struct DevresInner<T> {
 ///     unsafe fn new(paddr: usize) -> Result<Self>{
 ///         // 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 u64, SIZE) };

The argument of ioremap is defined as resource_size_t which ultimately maps to u64 on 64 bit systems and u32 on 32 bit ones. I don't think that we should have code like this... Is there another option?

Quoted 2 lines

Maybe Gary knows something here, do we have a type that represents that better?

Ah yeah the problem is that this type is an alias rather than a newtype. How do you feel about as bindings::phys_addr_t?

Quoted 10 lines

rust/kernel/devres.rs struct DevresInner<T> { · line 67

Quoted 6 lines
rust/kernel/devres.rs +1 -1
 ///         if addr.is_null() {
 ///             return Err(ENOMEM);
 ///         }
 ///
-///         Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
+///         Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))

This should be addr.addr() (requires strict_provenance on Rust 1.83 & before).

Quoted 2 lines

(I am assuming that we're never casting the usize back to a pointer, since otherwise this change would introduce UB)

Yeah, we don't have strict provenance APIs (and we can't introduce them without compiler tooling or bumping MSRV). I'm not sure if we are casting back to a pointer, but either way this change doesn't change the semantics - it is only spelling out the type.

Quoted 10 lines

rust/kernel/devres.rs struct DevresInner<T> { · line 74

Quoted 8 lines
rust/kernel/devres.rs +1 -1
 ///     }
 /// }
 ///
 /// impl<const SIZE: usize> Drop for IoMem<SIZE> {
 ///     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); };

Can't this be a .cast::<c_void>()?

This is an integer-to-pointer cast. addr returns usize:

impl<const SIZE: usize> IoRaw<SIZE> {
    [...]

    /// Returns the base address of the MMIO region.
    #[inline]
    pub fn addr(&self) -> usize {
        self.addr
    }

    [...]
}
Quoted 5 lines
Quoted 4 lines
rust/kernel/devres.rs +0 -0
 ///     }
 /// }
 ///
Quoted 12 lines

rust/kernel/error.rs pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { · line 155

Quoted 10 lines
rust/kernel/error.rs +1 -1
index 8654d52b0bb9..eb8fa52f08ba 100644
@@ -152,7 +152,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {
     /// Returns the error encoded as a pointer.
     pub fn to_ptr<T>(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() }

Can't this be a .into()?

error[E0277]: the trait bound isize: core::convert::From<i32> is not satisfied
--> ../rust/kernel/error.rs:155:49

    |
155 |         unsafe { bindings::ERR_PTR(self.0.get().into()).cast() }
    |                                                 ^^^^ the trait

core::convert::From<i32> is not implemented for isize

Quoted 5 lines
Quoted 4 lines
rust/kernel/error.rs +0 -0
     }
 
     /// Returns a string representing the error, if one exists.
Quoted 8 lines

rust/kernel/error.rs pub fn $name(&self, offset: usize) -> $type_name { · line 122

Quoted 6 lines
rust/kernel/error.rs +1 -1
@@ -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) }

Also here, is .cast::<c_void>() enough? (and below)

It's an integer-to-pointer cast. In the same impl<const SIZE: usize> IoRaw<SIZE> as above:

    fn io_addr_assert<U>(&self, offset: usize) -> usize {
        build_assert!(Self::offset_valid::<U>(offset, SIZE));

        self.addr() + offset
    }
Quoted 12 lines
Quoted 12 lines
rust/kernel/error.rs +0 -0
         }
 
         /// Read IO data from a given offset.
rust/kernel/of.rs +0 -0
index 04f2d8ef29cb..40d1bd13682c 100644
@@ -22,7 +22,7 @@ unsafe impl RawDeviceId for DeviceId {
     const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::of_device_id, data);
 
Quoted 5 lines

rust/kernel/of.rs unsafe impl RawDeviceId for DeviceId { · line 25

Quoted 3 lines
rust/kernel/of.rs +1 -1
     fn index(&self) -> usize {
-        self.0.data as _
+        self.0.data as usize

This should also be self.0.data.addr().

Can't do it without strict_provenance.

Quoted 8 lines
Quoted 8 lines
rust/kernel/of.rs +0 -0
     }
 }
 
@@ -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() };
 
Quoted 6 lines

rust/kernel/of.rs pub const fn new(compatible: &'static CStr) -> Self { · line 37

Quoted 2 lines
rust/kernel/of.rs +1 -1
-        // TODO: Use `clone_from_slice` once the corresponding types do match.
+        // TODO: Use `copy_from_slice` once stabilized for `const`.

This feature has just been stabilized (5 days ago!):

    https://github.com/rust-lang/rust/issues/131415

Yep! I know :)

Quoted 12 lines

@Miguel: Do we already have a target Rust version for dropping the RUSTC_BOOTSTRAP=1? If not, then I think we should use this feature now, since it will be stable by the time we bump the minimum version. (not in this patch [series] though)

Quoted 6 lines
rust/kernel/of.rs +1 -1
         let mut i = 0;
         while i < src.len() {
-            of.compatible[i] = src[i] as _;
+            of.compatible[i] = src[i];
             i += 1;
         }
Quoted 8 lines

rust/kernel/of.rs unsafe fn do_release(pdev: &Device, ioptr: usize, num: i32) { · line 323

Quoted 6 lines
rust/kernel/of.rs +1 -1
@@ -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);

Again, probably castable.

How? ioptr is a usize (you can see the prototype).

Quoted 13 lines
Quoted 13 lines
rust/kernel/of.rs +0 -0
             bindings::pci_release_region(pdev.as_raw(), num);
         }
     }
rust/kernel/str.rs +0 -1
index 6a1a982b946d..0b80a119d5f0 100644
@@ -692,9 +692,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 _,
Quoted 8 lines

rust/kernel/str.rs fn new() -> Self { · line 697

Quoted 5 lines
rust/kernel/str.rs +3 -2
-            pos: pos as _,
-            end: end as _,
+            beg: pos as usize,
+            pos: pos as usize,
+            end: end as usize,

I would prefer if we use pos.expose_provenance() (also for end) here.

Me too! But we can't until we actually start using strict provenance.

Quoted 4 lines
Quoted 4 lines
rust/kernel/str.rs +0 -0
         }
     }
 
Quoted 8 lines

rust/kernel/str.rs pub(crate) unsafe fn from_buffer(buf: *mut u8, len: usize) -> Self { · line 722

Quoted 6 lines
rust/kernel/str.rs +1 -1
@@ -719,7 +719,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

This should then also be with_exposed_provenance(self.pos)

Same as other instances of strict provenance.

#15 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 3 lines · Tamir Duberstein

Yeah, we don't have strict provenance APIs (and we can't introduce them without compiler tooling or bumping MSRV). I'm not sure if we are

The strict provenance APIs were added a long time ago (1.61) -- in fact we briefly discussed doing so back then (we started before that, with 1.58).

So unless we need some detail that changed recently (i.e. since 1.78), we should be able to use them, and it should be fairly safe since they are stable now (1.84).

Cheers,
Miguel

#16 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

In reply to Tamir Duberstein
Quoted 28 lines · Tamir Duberstein
Quoted 27 lines · Benno Lossin
Quoted 14 lines · Tamir Duberstein
rust/kernel/devres.rs +1 -1
index 598001157293..20159b7c9293 100644
@@ -45,7 +45,7 @@ struct DevresInner<T> {
 /// # 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.

rust/kernel/devres.rs struct DevresInner<T> { · line 62

Quoted 5 lines
rust/kernel/devres.rs +1 -1
@@ -59,19 +59,19 @@ struct DevresInner<T> {
 ///     unsafe fn new(paddr: usize) -> Result<Self>{
 ///         // 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 u64, SIZE) };

The argument of ioremap is defined as resource_size_t which ultimately maps to u64 on 64 bit systems and u32 on 32 bit ones. I don't think that we should have code like this... Is there another option?

Quoted 5 lines
Quoted 2 lines

Maybe Gary knows something here, do we have a type that represents that better?

Ah yeah the problem is that this type is an alias rather than a newtype. How do you feel about as bindings::phys_addr_t?

Yeah that's better.

Quoted 10 lines
Quoted 10 lines

rust/kernel/devres.rs struct DevresInner<T> { · line 67

Quoted 6 lines
rust/kernel/devres.rs +1 -1
 ///         if addr.is_null() {
 ///             return Err(ENOMEM);
 ///         }
 ///
-///         Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
+///         Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))

This should be addr.addr() (requires strict_provenance on Rust 1.83 & before).

Quoted 7 lines
Quoted 2 lines

(I am assuming that we're never casting the usize back to a pointer, since otherwise this change would introduce UB)

Yeah, we don't have strict provenance APIs (and we can't introduce them without compiler tooling or bumping MSRV). I'm not sure if we are casting back to a pointer, but either way this change doesn't change the semantics - it is only spelling out the type.

It's fine to enable the feature, since it's stable in a newer version of the compiler.

Quoted 11 lines
Quoted 10 lines

rust/kernel/devres.rs struct DevresInner<T> { · line 74

Quoted 8 lines
rust/kernel/devres.rs +1 -1
 ///     }
 /// }
 ///
 /// impl<const SIZE: usize> Drop for IoMem<SIZE> {
 ///     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); };

Can't this be a .cast::<c_void>()?

Quoted 1 line

This is an integer-to-pointer cast. addr returns usize:

Oh I missed the *mut... In that case, we can't use the addr suggestion that I made above, instead we should use expose_provenance above and with_exposed_provenance here.

Quoted 30 lines
impl<const SIZE: usize> IoRaw<SIZE> {
    [...]

    /// Returns the base address of the MMIO region.
    #[inline]
    pub fn addr(&self) -> usize {
        self.addr
    }

    [...]
}
Quoted 5 lines
Quoted 4 lines
rust/kernel/devres.rs +0 -0
 ///     }
 /// }
 ///
Quoted 12 lines

rust/kernel/error.rs pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { · line 155

Quoted 10 lines
rust/kernel/error.rs +1 -1
index 8654d52b0bb9..eb8fa52f08ba 100644
@@ -152,7 +152,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {
     /// Returns the error encoded as a pointer.
     pub fn to_ptr<T>(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() }

Can't this be a .into()?

Quoted 6 lines

error[E0277]: the trait bound isize: core::convert::From<i32> is not satisfied
--> ../rust/kernel/error.rs:155:49

    |
155 |         unsafe { bindings::ERR_PTR(self.0.get().into()).cast() }
    |                                                 ^^^^ the trait

core::convert::From<i32> is not implemented for isize

That's a bummer... I wonder why that doesn't exist.

Quoted 13 lines
Quoted 4 lines
Quoted 3 lines
rust/kernel/error.rs +0 -0
     }
 
     /// Returns a string representing the error, if one exists.
Quoted 8 lines

rust/kernel/error.rs pub fn $name(&self, offset: usize) -> $type_name { · line 122

Quoted 6 lines
rust/kernel/error.rs +1 -1
@@ -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) }

Also here, is .cast::<c_void>() enough? (and below)

Quoted 8 lines

It's an integer-to-pointer cast. In the same impl<const SIZE: usize> IoRaw<SIZE> as above:

    fn io_addr_assert<U>(&self, offset: usize) -> usize {
        build_assert!(Self::offset_valid::<U>(offset, SIZE));

        self.addr() + offset
    }

I would prefer we use the strict_provenance API.

Quoted 57 lines
Quoted 11 lines
Quoted 11 lines
rust/kernel/error.rs +0 -0
         }
 
         /// Read IO data from a given offset.
rust/kernel/of.rs +0 -0
index 04f2d8ef29cb..40d1bd13682c 100644
@@ -22,7 +22,7 @@ unsafe impl RawDeviceId for DeviceId {
     const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::of_device_id, data);
 
Quoted 5 lines

rust/kernel/of.rs unsafe impl RawDeviceId for DeviceId { · line 25

Quoted 3 lines
rust/kernel/of.rs +1 -1
     fn index(&self) -> usize {
-        self.0.data as _
+        self.0.data as usize

This should also be self.0.data.addr().

Can't do it without strict_provenance.

Quoted 8 lines
Quoted 8 lines
rust/kernel/of.rs +0 -0
     }
 }
 
@@ -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() };
 
Quoted 6 lines

rust/kernel/of.rs pub const fn new(compatible: &'static CStr) -> Self { · line 37

Quoted 2 lines
rust/kernel/of.rs +1 -1
-        // TODO: Use `clone_from_slice` once the corresponding types do match.
+        // TODO: Use `copy_from_slice` once stabilized for `const`.

This feature has just been stabilized (5 days ago!):

    https://github.com/rust-lang/rust/issues/131415

Yep! I know :)

Quoted 12 lines

@Miguel: Do we already have a target Rust version for dropping the RUSTC_BOOTSTRAP=1? If not, then I think we should use this feature now, since it will be stable by the time we bump the minimum version. (not in this patch [series] though)

Quoted 6 lines
rust/kernel/of.rs +1 -1
         let mut i = 0;
         while i < src.len() {
-            of.compatible[i] = src[i] as _;
+            of.compatible[i] = src[i];
             i += 1;
         }
Quoted 8 lines

rust/kernel/of.rs unsafe fn do_release(pdev: &Device, ioptr: usize, num: i32) { · line 323

Quoted 6 lines
rust/kernel/of.rs +1 -1
@@ -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);

Again, probably castable.

Quoted 1 line

How? ioptr is a usize (you can see the prototype).

Sorry, I missed all the *mut/*const prefixes here.

---
Cheers,
Benno

#17 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 196 lines · Benno Lossin
Quoted 28 lines · Tamir Duberstein
Quoted 27 lines · Benno Lossin
Quoted 14 lines · Tamir Duberstein
rust/kernel/devres.rs +1 -1
index 598001157293..20159b7c9293 100644
@@ -45,7 +45,7 @@ struct DevresInner<T> {
 /// # 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.

rust/kernel/devres.rs struct DevresInner<T> { · line 62

Quoted 5 lines
rust/kernel/devres.rs +1 -1
@@ -59,19 +59,19 @@ struct DevresInner<T> {
 ///     unsafe fn new(paddr: usize) -> Result<Self>{
 ///         // 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 u64, SIZE) };

The argument of ioremap is defined as resource_size_t which ultimately maps to u64 on 64 bit systems and u32 on 32 bit ones. I don't think that we should have code like this... Is there another option?

Quoted 5 lines
Quoted 2 lines

Maybe Gary knows something here, do we have a type that represents that better?

Ah yeah the problem is that this type is an alias rather than a newtype. How do you feel about as bindings::phys_addr_t?

Yeah that's better.

Quoted 10 lines
Quoted 10 lines

rust/kernel/devres.rs struct DevresInner<T> { · line 67

Quoted 6 lines
rust/kernel/devres.rs +1 -1
 ///         if addr.is_null() {
 ///             return Err(ENOMEM);
 ///         }
 ///
-///         Ok(IoMem(IoRaw::new(addr as _, SIZE)?))
+///         Ok(IoMem(IoRaw::new(addr as usize, SIZE)?))

This should be addr.addr() (requires strict_provenance on Rust 1.83 & before).

Quoted 7 lines
Quoted 2 lines

(I am assuming that we're never casting the usize back to a pointer, since otherwise this change would introduce UB)

Yeah, we don't have strict provenance APIs (and we can't introduce them without compiler tooling or bumping MSRV). I'm not sure if we are casting back to a pointer, but either way this change doesn't change the semantics - it is only spelling out the type.

It's fine to enable the feature, since it's stable in a newer version of the compiler.

Quoted 11 lines
Quoted 10 lines

rust/kernel/devres.rs struct DevresInner<T> { · line 74

Quoted 8 lines
rust/kernel/devres.rs +1 -1
 ///     }
 /// }
 ///
 /// impl<const SIZE: usize> Drop for IoMem<SIZE> {
 ///     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); };

Can't this be a .cast::<c_void>()?

Quoted 1 line

This is an integer-to-pointer cast. addr returns usize:

Oh I missed the *mut... In that case, we can't use the addr suggestion that I made above, instead we should use expose_provenance above and with_exposed_provenance here.

Quoted 30 lines
impl<const SIZE: usize> IoRaw<SIZE> {
    [...]

    /// Returns the base address of the MMIO region.
    #[inline]
    pub fn addr(&self) -> usize {
        self.addr
    }

    [...]
}
Quoted 5 lines
Quoted 4 lines
rust/kernel/devres.rs +0 -0
 ///     }
 /// }
 ///
Quoted 12 lines

rust/kernel/error.rs pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { · line 155

Quoted 10 lines
rust/kernel/error.rs +1 -1
index 8654d52b0bb9..eb8fa52f08ba 100644
@@ -152,7 +152,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {
     /// Returns the error encoded as a pointer.
     pub fn to_ptr<T>(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() }

Can't this be a .into()?

Quoted 6 lines

error[E0277]: the trait bound isize: core::convert::From<i32> is not satisfied
--> ../rust/kernel/error.rs:155:49

    |
155 |         unsafe { bindings::ERR_PTR(self.0.get().into()).cast() }
    |                                                 ^^^^ the trait

core::convert::From<i32> is not implemented for isize

That's a bummer... I wonder why that doesn't exist.

Quoted 13 lines
Quoted 4 lines
Quoted 3 lines
rust/kernel/error.rs +0 -0
     }
 
     /// Returns a string representing the error, if one exists.
Quoted 8 lines

rust/kernel/error.rs pub fn $name(&self, offset: usize) -> $type_name { · line 122

Quoted 6 lines
rust/kernel/error.rs +1 -1
@@ -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) }

Also here, is .cast::<c_void>() enough? (and below)

Quoted 8 lines

It's an integer-to-pointer cast. In the same impl<const SIZE: usize> IoRaw<SIZE> as above:

    fn io_addr_assert<U>(&self, offset: usize) -> usize {
        build_assert!(Self::offset_valid::<U>(offset, SIZE));

        self.addr() + offset
    }

I would prefer we use the strict_provenance API.

Quoted 57 lines
Quoted 11 lines
Quoted 11 lines
rust/kernel/error.rs +0 -0
         }
 
         /// Read IO data from a given offset.
rust/kernel/of.rs +0 -0
index 04f2d8ef29cb..40d1bd13682c 100644
@@ -22,7 +22,7 @@ unsafe impl RawDeviceId for DeviceId {
     const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::of_device_id, data);
 
Quoted 5 lines

rust/kernel/of.rs unsafe impl RawDeviceId for DeviceId { · line 25

Quoted 3 lines
rust/kernel/of.rs +1 -1
     fn index(&self) -> usize {
-        self.0.data as _
+        self.0.data as usize

This should also be self.0.data.addr().

Can't do it without strict_provenance.

Quoted 8 lines
Quoted 8 lines
rust/kernel/of.rs +0 -0
     }
 }
 
@@ -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() };
 
Quoted 6 lines

rust/kernel/of.rs pub const fn new(compatible: &'static CStr) -> Self { · line 37

Quoted 2 lines
rust/kernel/of.rs +1 -1
-        // TODO: Use `clone_from_slice` once the corresponding types do match.
+        // TODO: Use `copy_from_slice` once stabilized for `const`.

This feature has just been stabilized (5 days ago!):

    https://github.com/rust-lang/rust/issues/131415

Yep! I know :)

Quoted 20 lines

@Miguel: Do we already have a target Rust version for dropping the RUSTC_BOOTSTRAP=1? If not, then I think we should use this feature now, since it will be stable by the time we bump the minimum version. (not in this patch [series] though)

rust/kernel/of.rs unsafe fn do_release(pdev: &Device, ioptr: usize, num: i32) { · line 323

Quoted 13 lines
rust/kernel/of.rs +2 -2
         let mut i = 0;
         while i < src.len() {
-            of.compatible[i] = src[i] as _;
+            of.compatible[i] = src[i];
             i += 1;
         }
 
@@ -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);

Again, probably castable.

Quoted 8 lines
Quoted 1 line

How? ioptr is a usize (you can see the prototype).

Sorry, I missed all the *mut/*const prefixes here.

---
Cheers,
Benno

I think all the remaining comments are about strict provenance. I buy that this is a useful thing to do, but in the absence of automated tools to help do it, I'm not sure it's worth it to do it for just these things I happen to be touching rather than doing it throughout.

I couldn't find a clippy lint. Do you know of one? If not, should we file an issue?

Reviewed-by
#18 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 7 lines · Tamir Duberstein

I think all the remaining comments are about strict provenance. I buy that this is a useful thing to do, but in the absence of automated tools to help do it, I'm not sure it's worth it to do it for just these things I happen to be touching rather than doing it throughout.

I couldn't find a clippy lint. Do you know of one? If not, should we file an issue?

A quick search gave me:

https://doc.rust-lang.org/nightly/unstable-book/language-features/strict-provenance-lints.html

The linked tracking issue is closed which seems like a mistake, since it's not yet stabilized. I found a different issue tracking it though:

    https://github.com/rust-lang/rust/issues/130351

We probably should use both in that case:

#![feature(strict_provenance_lints)] #![warn(fuzzy_provenance_casts, lossy_provenance_casts)]

I don't want to push more work onto this series, so it's fine to leave them in. Thus:

We can either make this a good-first-issue, or if you also want to tackle this, then go ahead :)

---
Cheers,
Benno

#19 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 17 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein

I think all the remaining comments are about strict provenance. I buy that this is a useful thing to do, but in the absence of automated tools to help do it, I'm not sure it's worth it to do it for just these things I happen to be touching rather than doing it throughout.

I couldn't find a clippy lint. Do you know of one? If not, should we file an issue?

A quick search gave me:

https://doc.rust-lang.org/nightly/unstable-book/language-features/strict-provenance-lints.html

The linked tracking issue is closed which seems like a mistake, since it's not yet stabilized. I found a different issue tracking it though:

Quoted 6 lines
    https://github.com/rust-lang/rust/issues/130351

We probably should use both in that case:

#![feature(strict_provenance_lints)] #![warn(fuzzy_provenance_casts, lossy_provenance_casts)]

Nice! I didn't think to check rustc lints.

Quoted 4 lines

I don't want to push more work onto this series, so it's fine to leave them in. Thus:

Thanks!

Quoted 3 lines

We can either make this a good-first-issue, or if you also want to tackle this, then go ahead :)

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

I'll send v3 with the tags and the phys_addr_t fix shortly.

#20 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

---
Cheers,
Benno

#21 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 17 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 7 lines
Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

Alright, you've sniped me. This is coming in v3.

#22 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 23 lines · Tamir Duberstein
Quoted 21 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

Quoted 5 lines
Quoted 3 lines

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

Alright, you've sniped me. This is coming in v3.

I just realized I only covered the kernel crate. In order to cover all Rust code, I need to move the lints and the features out to the root Makefile. I tried something like this:

Quoted 32 lines
Makefile +8 -0
index 2af40bfed9ce..10af1e44370b 100644
@@ -466,13 +466,21 @@ KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
 KBUILD_USERCFLAGS  := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
 KBUILD_USERLDFLAGS := $(USERLDFLAGS)
 
+# Lints were moved to `strict_provenance_lints` when `strict_provenance` was stabilized.
+#
+# See https://github.com/rust-lang/rust/commit/56ee492a6e7a917b2b3f888e33dd52a13d3ecb64.
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE = $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 # These flags apply to all Rust code in the tree, including the kernel and
 # host programs.
 export rust_common_flags := --edition=2021 \
     -Zbinary_dep_depinfo=y \
+     -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" \
     -Astable_features \
     -Dnon_ascii_idents \
     -Dunsafe_op_in_unsafe_fn \
+     -Wfuzzy_provenance_casts \
+     -Wlossy_provenance_casts \
     -Wmissing_docs \
     -Wrust_2018_idioms \
     -Wunreachable_pub \
rust/Makefile +0 -0
index ea3849eb78f6..d7d5be741245 100644
@@ -435,8 +435,10 @@ $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE
 # symbol versions generated from Rust objects.

rust/Makefile $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE · line 444

Quoted 10 lines
rust/Makefile +3 -1
 $(obj)/exports.o: private skip_gendwarfksyms = 1
 
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE := $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 $(obj)/core.o: private skip_clippy = 1
-$(obj)/core.o: private skip_flags = -Wunreachable_pub
+$(obj)/core.o: private skip_flags = -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" -Wunreachable_pub -Wfuzzy_provenance_casts -Wlossy_provenance_casts
 $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
 $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \

but this doesn't work because CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE is not yet defined when I read it in the root Makefile. I can read it lower down and then append the feature flag to KBUILD_RUSTFLAGS but by then the rustdoc flags have been copied from rust_common_flags and so rustdoc doesn't get the feature flag, resulting in unknown lint warnings in rustdoc and kunit tests.

Any ideas?

#23 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 85 lines · Tamir Duberstein
Quoted 23 lines · Tamir Duberstein
Quoted 21 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

Quoted 5 lines
Quoted 3 lines

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

Alright, you've sniped me. This is coming in v3.

I just realized I only covered the kernel crate. In order to cover all Rust code, I need to move the lints and the features out to the root Makefile. I tried something like this:

Quoted 32 lines
Makefile +8 -0
index 2af40bfed9ce..10af1e44370b 100644
@@ -466,13 +466,21 @@ KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
 KBUILD_USERCFLAGS  := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
 KBUILD_USERLDFLAGS := $(USERLDFLAGS)
 
+# Lints were moved to `strict_provenance_lints` when `strict_provenance` was stabilized.
+#
+# See https://github.com/rust-lang/rust/commit/56ee492a6e7a917b2b3f888e33dd52a13d3ecb64.
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE = $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 # These flags apply to all Rust code in the tree, including the kernel and
 # host programs.
 export rust_common_flags := --edition=2021 \
     -Zbinary_dep_depinfo=y \
+     -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" \
     -Astable_features \
     -Dnon_ascii_idents \
     -Dunsafe_op_in_unsafe_fn \
+     -Wfuzzy_provenance_casts \
+     -Wlossy_provenance_casts \
     -Wmissing_docs \
     -Wrust_2018_idioms \
     -Wunreachable_pub \
rust/Makefile +0 -0
index ea3849eb78f6..d7d5be741245 100644
@@ -435,8 +435,10 @@ $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE
 # symbol versions generated from Rust objects.

rust/Makefile $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE · line 444

Quoted 10 lines
rust/Makefile +3 -1
 $(obj)/exports.o: private skip_gendwarfksyms = 1
 
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE := $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 $(obj)/core.o: private skip_clippy = 1
-$(obj)/core.o: private skip_flags = -Wunreachable_pub
+$(obj)/core.o: private skip_flags = -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" -Wunreachable_pub -Wfuzzy_provenance_casts -Wlossy_provenance_casts
 $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
 $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \

but this doesn't work because CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE is not yet defined when I read it in the root Makefile. I can read it lower down and then append the feature flag to KBUILD_RUSTFLAGS but by then the rustdoc flags have been copied from rust_common_flags and so rustdoc doesn't get the feature flag, resulting in unknown lint warnings in rustdoc and kunit tests.

Quoted 1 line

Any ideas?

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

---
Cheers,
Benno

#24 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 87 lines · Benno Lossin
Quoted 85 lines · Tamir Duberstein
Quoted 23 lines · Tamir Duberstein
Quoted 21 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

Quoted 5 lines
Quoted 3 lines

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

Alright, you've sniped me. This is coming in v3.

I just realized I only covered the kernel crate. In order to cover all Rust code, I need to move the lints and the features out to the root Makefile. I tried something like this:

Quoted 32 lines
Makefile +8 -0
index 2af40bfed9ce..10af1e44370b 100644
@@ -466,13 +466,21 @@ KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
 KBUILD_USERCFLAGS  := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
 KBUILD_USERLDFLAGS := $(USERLDFLAGS)
 
+# Lints were moved to `strict_provenance_lints` when `strict_provenance` was stabilized.
+#
+# See https://github.com/rust-lang/rust/commit/56ee492a6e7a917b2b3f888e33dd52a13d3ecb64.
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE = $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 # These flags apply to all Rust code in the tree, including the kernel and
 # host programs.
 export rust_common_flags := --edition=2021 \
     -Zbinary_dep_depinfo=y \
+     -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" \
     -Astable_features \
     -Dnon_ascii_idents \
     -Dunsafe_op_in_unsafe_fn \
+     -Wfuzzy_provenance_casts \
+     -Wlossy_provenance_casts \
     -Wmissing_docs \
     -Wrust_2018_idioms \
     -Wunreachable_pub \
rust/Makefile +0 -0
index ea3849eb78f6..d7d5be741245 100644
@@ -435,8 +435,10 @@ $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE
 # symbol versions generated from Rust objects.

rust/Makefile $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE · line 444

Quoted 10 lines
rust/Makefile +3 -1
 $(obj)/exports.o: private skip_gendwarfksyms = 1
 
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE := $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 $(obj)/core.o: private skip_clippy = 1
-$(obj)/core.o: private skip_flags = -Wunreachable_pub
+$(obj)/core.o: private skip_flags = -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" -Wunreachable_pub -Wfuzzy_provenance_casts -Wlossy_provenance_casts
 $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
 $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \

but this doesn't work because CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE is not yet defined when I read it in the root Makefile. I can read it lower down and then append the feature flag to KBUILD_RUSTFLAGS but by then the rustdoc flags have been copied from rust_common_flags and so rustdoc doesn't get the feature flag, resulting in unknown lint warnings in rustdoc and kunit tests.

Quoted 5 lines
Quoted 1 line

Any ideas?

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

#25 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 95 lines · Tamir Duberstein
Quoted 87 lines · Benno Lossin
Quoted 85 lines · Tamir Duberstein
Quoted 23 lines · Tamir Duberstein
Quoted 21 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

Quoted 5 lines
Quoted 3 lines

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

Alright, you've sniped me. This is coming in v3.

I just realized I only covered the kernel crate. In order to cover all Rust code, I need to move the lints and the features out to the root Makefile. I tried something like this:

Quoted 32 lines
Makefile +8 -0
index 2af40bfed9ce..10af1e44370b 100644
@@ -466,13 +466,21 @@ KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
 KBUILD_USERCFLAGS  := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
 KBUILD_USERLDFLAGS := $(USERLDFLAGS)
 
+# Lints were moved to `strict_provenance_lints` when `strict_provenance` was stabilized.
+#
+# See https://github.com/rust-lang/rust/commit/56ee492a6e7a917b2b3f888e33dd52a13d3ecb64.
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE = $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 # These flags apply to all Rust code in the tree, including the kernel and
 # host programs.
 export rust_common_flags := --edition=2021 \
     -Zbinary_dep_depinfo=y \
+     -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" \
     -Astable_features \
     -Dnon_ascii_idents \
     -Dunsafe_op_in_unsafe_fn \
+     -Wfuzzy_provenance_casts \
+     -Wlossy_provenance_casts \
     -Wmissing_docs \
     -Wrust_2018_idioms \
     -Wunreachable_pub \
rust/Makefile +0 -0
index ea3849eb78f6..d7d5be741245 100644
@@ -435,8 +435,10 @@ $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE
 # symbol versions generated from Rust objects.

rust/Makefile $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE · line 444

Quoted 10 lines
rust/Makefile +3 -1
 $(obj)/exports.o: private skip_gendwarfksyms = 1
 
+KBUILD_RUST_STRICT_PROVENANCE_FEATURE := $(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
+
 $(obj)/core.o: private skip_clippy = 1
-$(obj)/core.o: private skip_flags = -Wunreachable_pub
+$(obj)/core.o: private skip_flags = -Zcrate-attr="feature($(KBUILD_RUST_STRICT_PROVENANCE_FEATURE))" -Wunreachable_pub -Wfuzzy_provenance_casts -Wlossy_provenance_casts
 $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
 $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \

but this doesn't work because CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE is not yet defined when I read it in the root Makefile. I can read it lower down and then append the feature flag to KBUILD_RUSTFLAGS but by then the rustdoc flags have been copied from rust_common_flags and so rustdoc doesn't get the feature flag, resulting in unknown lint warnings in rustdoc and kunit tests.

Quoted 5 lines
Quoted 1 line

Any ideas?

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
#26 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
	    def_bool RUSTC_VERSION >= 108400

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Quoted 10 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

---
Cheers,
Benno

#27 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 18 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

Quoted 8 lines

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
            def_bool RUSTC_VERSION >= 108400

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Yep! That's exactly what I did, but as I mentioned up-thread, the result is that we only cover the kernel crate.

Quoted 12 lines
Quoted 11 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
Quoted 2 lines

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

Thanks, that's a helpful pointer, and it solves some problems but not all. The root Makefile contains this bit:

Quoted 2 lines

KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
-Zallow-features= $(HOSTRUSTFLAGS)

which means we can't use the provenance lints against these host targets (including e.g. rustdoc_test_gen). We can't remove this -Zallow-features= either because then core fails to compile.

I'm at the point where I think I need more involved help. Want to take a look at my attempt? It's here:
https://github.com/tamird/linux/tree/b4/ptr-as-ptr.

Thanks!
Tamir

#28 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 24 lines · Tamir Duberstein
Quoted 23 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
            def_bool RUSTC_VERSION >= 108400
Quoted 6 lines
Quoted 3 lines

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Yep! That's exactly what I did, but as I mentioned up-thread, the result is that we only cover the kernel crate.

Ah I see, can't we just have the above line in the other crate roots?

Quoted 20 lines
Quoted 11 lines
Quoted 10 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
Quoted 2 lines

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

Thanks, that's a helpful pointer, and it solves some problems but not all. The root Makefile contains this bit:

Quoted 2 lines

KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
-Zallow-features= $(HOSTRUSTFLAGS)

Quoted 7 lines

which means we can't use the provenance lints against these host targets (including e.g. rustdoc_test_gen). We can't remove this -Zallow-features= either because then core fails to compile.

I'm at the point where I think I need more involved help. Want to take a look at my attempt? It's here:
https://github.com/tamird/linux/tree/b4/ptr-as-ptr.

I'll take a look tomorrow, you're testing my knowledge of the build system a lot here :)

---
Cheers,
Benno

#29 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 26 lines · Benno Lossin
Quoted 24 lines · Tamir Duberstein
Quoted 23 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
            def_bool RUSTC_VERSION >= 108400
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Yep! That's exactly what I did, but as I mentioned up-thread, the result is that we only cover the kernel crate.

Ah I see, can't we just have the above line in the other crate roots?

The most difficult case is doctests. You'd have to add this to every example AFAICT.

Quoted 24 lines
Quoted 24 lines
Quoted 11 lines
Quoted 10 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
Quoted 2 lines

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

Thanks, that's a helpful pointer, and it solves some problems but not all. The root Makefile contains this bit:

Quoted 2 lines

KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
-Zallow-features= $(HOSTRUSTFLAGS)

which means we can't use the provenance lints against these host targets (including e.g. rustdoc_test_gen). We can't remove this -Zallow-features= either because then core fails to compile.

Quoted 6 lines
Quoted 3 lines

I'm at the point where I think I need more involved help. Want to take a look at my attempt? It's here:
https://github.com/tamird/linux/tree/b4/ptr-as-ptr.

I'll take a look tomorrow, you're testing my knowledge of the build system a lot here :)

We're guaranteed to learn something :)

#30 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 31 lines · Tamir Duberstein
Quoted 30 lines · Benno Lossin
Quoted 28 lines · Tamir Duberstein
Quoted 26 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
            def_bool RUSTC_VERSION >= 108400

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Quoted 35 lines
Quoted 4 lines
Quoted 2 lines

Yep! That's exactly what I did, but as I mentioned up-thread, the result is that we only cover the kernel crate.

Ah I see, can't we just have the above line in the other crate roots?

The most difficult case is doctests. You'd have to add this to every example AFAICT.

Quoted 27 lines
Quoted 27 lines
Quoted 11 lines
Quoted 10 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
Quoted 2 lines

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

Thanks, that's a helpful pointer, and it solves some problems but not all. The root Makefile contains this bit:

Quoted 2 lines

KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
-Zallow-features= $(HOSTRUSTFLAGS)

which means we can't use the provenance lints against these host targets (including e.g. rustdoc_test_gen). We can't remove this -Zallow-features= either because then core fails to compile.

I'm at the point where I think I need more involved help. Want to take a look at my attempt? It's here:
https://github.com/tamird/linux/tree/b4/ptr-as-ptr.

With doing allow(clippy::incompatible_msrv), I meant doing that globally, not having a module to re-export the functions :)

Quoted 4 lines
Quoted 2 lines

I'll take a look tomorrow, you're testing my knowledge of the build system a lot here :)

We're guaranteed to learn something :)

Yep! I managed to get it working, but it is rather janky and experimental. I don't think you should use this in your patch series unless Miguel has commented on it.

Notable things in the diff below:
* the hostrustflags don't get the *provenance_casts lints (which is correct, I think, but probably not the way I did it with filter-out)
* the crates compiler_builtins, bindings, uapi, build_error, libmacros, ffi, etc do get them, but probably shouldn't?

---
Cheers,
Benno

Makefile +3 -1
index 70bdbf2218fc..38a79337cd7b 100644
@@ -473,6 +473,8 @@ export rust_common_flags := --edition=2021 \
 			    -Astable_features \
 			    -Dnon_ascii_idents \
 			    -Dunsafe_op_in_unsafe_fn \
+			    -Wfuzzy_provenance_casts \
+			    -Wlossy_provenance_casts \
 			    -Wmissing_docs \
 			    -Wrust_2018_idioms \
 			    -Wunreachable_pub \
@@ -493,7 +495,7 @@ KBUILD_HOSTCFLAGS   := $(KBUILD_USERHOSTCFLAGS) $(HOST_LFS_CFLAGS) \
 		       $(HOSTCFLAGS) -I $(srctree)/scripts/include
 KBUILD_HOSTCXXFLAGS := -Wall -O2 $(HOST_LFS_CFLAGS) $(HOSTCXXFLAGS) \
 		       -I $(srctree)/scripts/include
-KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
+KBUILD_HOSTRUSTFLAGS := $(filter-out -Wfuzzy_provenance_casts -Wlossy_provenance_casts,$(rust_common_flags)) -O -Cstrip=debuginfo \
 			-Zallow-features= $(HOSTRUSTFLAGS)
 KBUILD_HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS) $(HOSTLDFLAGS)
 KBUILD_HOSTLDLIBS   := $(HOST_LFS_LIBS) $(HOSTLDLIBS)
init/Kconfig +3 -0
index d0d021b3fa3b..82e28d6f7c3f 100644
@@ -132,6 +132,9 @@ config CC_HAS_COUNTED_BY
 config RUSTC_HAS_COERCE_POINTEE
 	def_bool RUSTC_VERSION >= 108400
 
+config RUSTC_HAS_STABLE_STRICT_PROVENANCE
+	def_bool RUSTC_VERSION >= 108400
+
 config PAHOLE_VERSION
 	int
 	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
rust/Makefile +2 -1
index ea3849eb78f6..998b57c6e5f7 100644
@@ -436,7 +436,8 @@ $(obj)/helpers/helpers.o: $(src)/helpers/helpers.c $(recordmcount_source) FORCE
 $(obj)/exports.o: private skip_gendwarfksyms = 1
 
 $(obj)/core.o: private skip_clippy = 1
-$(obj)/core.o: private skip_flags = -Wunreachable_pub
+$(obj)/core.o: private skip_flags = -Wunreachable_pub \
+    -Wfuzzy_provenance_casts -Wlossy_provenance_casts
 $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
 $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \
rust/bindings/lib.rs +8 -0
index 014af0d1fc70..185bf29e44d9 100644
@@ -9,6 +9,14 @@
 //! using this crate.
 
 #![no_std]
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
 // See <https://github.com/rust-lang/rust-bindgen/issues/1651>.
 #![cfg_attr(test, allow(deref_nullptr))]
 #![cfg_attr(test, allow(unaligned_references))]
rust/build_error.rs +8 -0
index fa24eeef9929..84e24598857f 100644
@@ -18,6 +18,14 @@
 //! [const-context]: https://doc.rust-lang.org/reference/const_eval.html#const-context
 
 #![no_std]
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
 
 /// Panics if executed in [const context][const-context], or triggers a build error if not.
 ///
rust/compiler_builtins.rs +8 -0
index f14b8d7caf89..0dcb25a644f6 100644
@@ -21,6 +21,14 @@
 
 #![allow(internal_features)]
 #![feature(compiler_builtins)]
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
 #![compiler_builtins]
 #![no_builtins]
 #![no_std]
rust/ffi.rs +8 -0
index 584f75b49862..28a5e9a09b70 100644
@@ -8,6 +8,14 @@
 //! C ABI. The kernel does not use [`core::ffi`], so it can customise the mapping that deviates from
 //! the platform default.
 
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
 #![no_std]
 
 macro_rules! alias {
rust/kernel/lib.rs +8 -0
index 398242f92a96..6fd4fb2176aa 100644
@@ -13,6 +13,14 @@
 
 #![no_std]
 #![feature(arbitrary_self_types)]
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
 #![cfg_attr(CONFIG_RUSTC_HAS_COERCE_POINTEE, feature(derive_coerce_pointee))]
 #![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(coerce_unsized))]
 #![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(dispatch_from_dyn))]
rust/macros/lib.rs +9 -0
index 8c7b786377ee..91450de998d3 100644
@@ -2,6 +2,15 @@
 
 //! Crate for all kernel procedural macros.
 
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
+
 // When fixdep scans this, it will find this string `CONFIG_RUSTC_VERSION_TEXT`
 // and thus add a dependency on `include/config/RUSTC_VERSION_TEXT`, which is
 // touched by Kconfig when the version string from the compiler changes.
rust/uapi/lib.rs +8 -0
index 13495910271f..84ef3828e0d4 100644
@@ -8,6 +8,14 @@
 //! userspace APIs.
 
 #![no_std]
+#![cfg_attr(
+    not(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),
+    feature(strict_provenance)
+)]
+#![cfg_attr(
+    CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE,
+    feature(strict_provenance_lints)
+)]
 // See <https://github.com/rust-lang/rust-bindgen/issues/1651>.
 #![cfg_attr(test, allow(deref_nullptr))]
 #![cfg_attr(test, allow(unaligned_references))]
scripts/Makefile.build +4 -1
index 993708d11874..021ee36ae8f2 100644
@@ -226,7 +226,10 @@ $(obj)/%.lst: $(obj)/%.c FORCE
 # Compile Rust sources (.rs)
 # ---------------------------------------------------------------------------
 
-rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,lint_reasons
+# Lints were moved to `strict_provenance_lints` when `strict_provenance` was stabilized.
+#
+# See https://github.com/rust-lang/rust/commit/56ee492a6e7a917b2b3f888e33dd52a13d3ecb64.
+rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,lint_reasons,$(if $(CONFIG_RUSTC_HAS_STABLE_STRICT_PROVENANCE),strict_provenance_lints,strict_provenance)
 
 # `--out-dir` is required to avoid temporaries being created by `rustc` in the
 # current working directory, which may be not accessible in the out-of-tree
#31 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 65 lines · Benno Lossin
Quoted 63 lines · Tamir Duberstein
Quoted 26 lines · Benno Lossin
Quoted 24 lines · Tamir Duberstein
Quoted 23 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
            def_bool RUSTC_VERSION >= 108400
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Yep! That's exactly what I did, but as I mentioned up-thread, the result is that we only cover the kernel crate.

Ah I see, can't we just have the above line in the other crate roots?

The most difficult case is doctests. You'd have to add this to every example AFAICT.

Quoted 24 lines
Quoted 24 lines
Quoted 11 lines
Quoted 10 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
Quoted 2 lines

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

Thanks, that's a helpful pointer, and it solves some problems but not all. The root Makefile contains this bit:

Quoted 2 lines

KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
-Zallow-features= $(HOSTRUSTFLAGS)

which means we can't use the provenance lints against these host targets (including e.g. rustdoc_test_gen). We can't remove this -Zallow-features= either because then core fails to compile.

Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

I'm at the point where I think I need more involved help. Want to take a look at my attempt? It's here:
https://github.com/tamird/linux/tree/b4/ptr-as-ptr.

With doing allow(clippy::incompatible_msrv), I meant doing that globally, not having a module to re-export the functions :)

Yeah, but I think that's too big a hammer. It's a useful warning, and it doesn't accept per-item configuration.

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

I'll take a look tomorrow, you're testing my knowledge of the build system a lot here :)

We're guaranteed to learn something :)

Yep! I managed to get it working, but it is rather janky and experimental. I don't think you should use this in your patch series unless Miguel has commented on it.

Quoted 5 lines

Notable things in the diff below:
* the hostrustflags don't get the *provenance_casts lints (which is correct, I think, but probably not the way I did it with filter-out)
* the crates compiler_builtins, bindings, uapi, build_error, libmacros, ffi, etc do get them, but probably shouldn't?

Why don't we want host programs to have the same warnings applied? Why don't we want it for all those other crates?

I'd expect we want uniform diagnostics settings throughout which is why these things are in the Makefile rather than in individual crates in the first place.

Your patch sidesteps the problems I'm having by not applying these lints to host crates, but I think we should.

#32 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 70 lines · Tamir Duberstein
Quoted 69 lines · Benno Lossin
Quoted 66 lines · Tamir Duberstein
Quoted 26 lines · Benno Lossin
Quoted 24 lines · Tamir Duberstein
Quoted 23 lines · Benno Lossin
Quoted 7 lines · Tamir Duberstein
Quoted 6 lines · Tamir Duberstein
Quoted 3 lines · Benno Lossin

Always enable the features, we have allow(stable_features) for this reason (then you don't have to do this dance with checking if it's already stable or not :)

Quoted 5 lines
Quoted 5 lines

It's not so simple. In rustc < 1.84.0 the lints *and* the strict provenance APIs are behind feature(strict_provenance). In rustc >= 1.84.0 the lints are behind feature(strict_provenance_lints). So you need to read the config to learn that you need to enable feature(strict_provenance_lints).

I see... And strict_provenance_lints doesn't exist in <1.84? That's a bit of a bummer...

But I guess we could have this config option (in init/Kconfig):

    config RUSTC_HAS_STRICT_PROVENANCE
            def_bool RUSTC_VERSION >= 108400
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

and then do this in lib.rs:

#![cfg_attr(CONFIG_RUSTC_HAS_STRICT_PROVENANCE, feature(strict_provenance_lints))]

Yep! That's exactly what I did, but as I mentioned up-thread, the result is that we only cover the kernel crate.

Ah I see, can't we just have the above line in the other crate roots?

The most difficult case is doctests. You'd have to add this to every example AFAICT.

Quoted 27 lines
Quoted 27 lines
Quoted 11 lines
Quoted 10 lines

Actually this isn't even the only problem. It seems that -Astable_features doesn't affect features enabled on the command line at all:

error[E0725]: the feature strict_provenance is not in the list of allowed features
--> <crate attribute>:1:9

  |
1 | feature(strict_provenance)
  |         ^^^^^^^^^^^^^^^^^
Quoted 2 lines

That's because you need to append the feature to rust_allowed_features in scripts/Makefile.build (AFAIK).

Thanks, that's a helpful pointer, and it solves some problems but not all. The root Makefile contains this bit:

Quoted 2 lines

KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
-Zallow-features= $(HOSTRUSTFLAGS)

which means we can't use the provenance lints against these host targets (including e.g. rustdoc_test_gen). We can't remove this -Zallow-features= either because then core fails to compile.

I'm at the point where I think I need more involved help. Want to take a look at my attempt? It's here:
https://github.com/tamird/linux/tree/b4/ptr-as-ptr.

Quoted 5 lines
Quoted 2 lines

With doing allow(clippy::incompatible_msrv), I meant doing that globally, not having a module to re-export the functions :)

Yeah, but I think that's too big a hammer. It's a useful warning, and it doesn't accept per-item configuration.

Hmm, I don't think it's as useful. We're going to be using more unstable features until we eventually bump the minimum version when we can disable RUSTC_BOOTSTRAP=1. From that point onwards, it will be very useful, but before that I don't think that it matters too much. Maybe the others disagree.

Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

I'll take a look tomorrow, you're testing my knowledge of the build system a lot here :)

We're guaranteed to learn something :)

Yep! I managed to get it working, but it is rather janky and experimental. I don't think you should use this in your patch series unless Miguel has commented on it.

Quoted 8 lines
Quoted 5 lines

Notable things in the diff below:
* the hostrustflags don't get the *provenance_casts lints (which is correct, I think, but probably not the way I did it with filter-out)
* the crates compiler_builtins, bindings, uapi, build_error, libmacros, ffi, etc do get them, but probably shouldn't?

Why don't we want host programs to have the same warnings applied? Why don't we want it for all those other crates?

I have never looked at the rust hostprogs before, so I'm missing some context here.

I didn't enable them, because they are currently being compiled without any unstable features and I thought we might want to keep that. (though I don't really see a reason not to compile them with unstable features that we also use for the kernel crate)

Quoted 6 lines

I'd expect we want uniform diagnostics settings throughout which is why these things are in the Makefile rather than in individual crates in the first place.

Your patch sidesteps the problems I'm having by not applying these lints to host crates, but I think we should.

We're probably working on some stuff that Miguel's new build system will do entirely differently. So I wouldn't worry too much about getting it perfect, as it will be removed in a couple cycles.

---
Cheers,
Benno

#33 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

Quoted 8 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein
Quoted 4 lines · Benno Lossin

With doing allow(clippy::incompatible_msrv), I meant doing that globally, not having a module to re-export the functions :)

Quoted 8 lines
Quoted 2 lines

Yeah, but I think that's too big a hammer. It's a useful warning, and it doesn't accept per-item configuration.

Hmm, I don't think it's as useful. We're going to be using more unstable features until we eventually bump the minimum version when we can disable RUSTC_BOOTSTRAP=1. From that point onwards, it will be very useful, but before that I don't think that it matters too much. Maybe the others disagree.

I'd rather keep this narrowly scoped for now -- putting the genie back in the bottle later is usually harder.

Quoted 15 lines
Quoted 2 lines

Why don't we want host programs to have the same warnings applied? Why don't we want it for all those other crates?

I have never looked at the rust hostprogs before, so I'm missing some context here.

I didn't enable them, because they are currently being compiled without any unstable features and I thought we might want to keep that. (though I don't really see a reason not to compile them with unstable features that we also use for the kernel crate)

Quoted 4 lines

I'd expect we want uniform diagnostics settings throughout which is why these things are in the Makefile rather than in individual crates in the first place.

Quoted 6 lines
Quoted 2 lines

Your patch sidesteps the problems I'm having by not applying these lints to host crates, but I think we should.

We're probably working on some stuff that Miguel's new build system will do entirely differently. So I wouldn't worry too much about getting it perfect, as it will be removed in a couple cycles.

I got it working, but it's pretty messy. Let's discuss on v3.

#34 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

In reply to Tamir Duberstein
Quoted 22 lines · Tamir Duberstein
Quoted 21 lines · Benno Lossin
Quoted 6 lines · Tamir Duberstein

I tried using the strict provenance lints locally and I think we can't until we properly bump MSRV due to clippy::incompatible_msrv:

warning: current MSRV (Minimum Supported Rust Version) is 1.78.0 but this item is stable since 1.84.0
--> ../rust/kernel/str.rs:696:22

Quoted 6 lines
    |
696 |             pos: pos.expose_provenance(),
    |                      ^^^^^^^^^^^^^^^^^^^
    |

= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv

Oh this is annoying...

Quoted 3 lines

This is with #![feature(strict_provenance)]. I can file the issue but I think it's blocked on MSRV >= 1.84.0. But maybe you know of a path forward :)

Quoted 5 lines
Quoted 3 lines

I think we should be able to just allow(clippy::incompatible_msrv), since Miguel & other maintainers will test with 1.78 (or at least are supposed to :).

Alright, you've sniped me.

Sorry about that :)

Quoted 1 line

This is coming in v3.

Thanks a lot!

---
Cheers,
Benno

#35 lore raw

Re: [PATCH v2 5/5] rust: enable `clippy::as_underscore` lint

In reply to Benno Lossin
Quoted 9 lines · Benno Lossin

This feature has just been stabilized (5 days ago!):

    https://github.com/rust-lang/rust/issues/131415

@Miguel: Do we already have a target Rust version for dropping the RUSTC_BOOTSTRAP=1? If not, then I think we should use this feature now, since it will be stable by the time we bump the minimum version. (not in this patch [series] though)

We don't (in any case, while we will not use languages unstable features soon, we will still need tooling features).

So please feel free to use it, but it seems it is only unstably const since 1.85.0, no?

Cheers,
Miguel

#36 lore raw
In reply to Tamir Duberstein

Hi Tamir,

Quoted 10 lines · Tamir Duberstein

This started with a patch that enabled clippy::ptr_as_ptr. Benno Lossin suggested I also look into clippy::ptr_cast_constness and I discovered clippy::as_ptr_cast_mut. This series now enables all 3 lints. It also enables clippy::as_underscore which ensures other pointer casts weren't missed. The first commit reduces the need for pointer casts and is shared with another series[1].

Thanks for this series! Did you encounter any instances of $val as $ty where you couldn't convert them due to unsizing? I remember that we had some cases back then (maybe Alice remembers them too?). If not then no worries :)

---
Cheers,
Benno

#37 lore raw
Quoted 11 lines · Benno Lossin

Hi Tamir,

Quoted 7 lines · Tamir Duberstein

This started with a patch that enabled clippy::ptr_as_ptr. Benno Lossin suggested I also look into clippy::ptr_cast_constness and I discovered clippy::as_ptr_cast_mut. This series now enables all 3 lints. It also enables clippy::as_underscore which ensures other pointer casts weren't missed. The first commit reduces the need for pointer casts and is shared with another series[1].

Quoted 8 lines
Quoted 3 lines

Thanks for this series! Did you encounter any instances of $val as $ty where you couldn't convert them due to unsizing? I remember that we had some cases back then (maybe Alice remembers them too?). If not then no worries :)

I didn't :)

Thank you for the reviews!