rust: reduce `as` casts, enable related lints
Subsystems (30)
v12 cover rust: reduce `as` 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.
As a later addition, clippy::cast_lossless and clippy::ref_as_ptr are also enabled.
---
Changes in v12:
- Remove stale mention of a dependency. (Miguel Ojeda)
- Apply to config, cpufreq, and nova. (Miguel Ojeda)
- Link to v11: https://lore.kernel.org/r/[email protected]
Changes in v11:
- Rebase on v6.16-rc1.
- Replace some as <integer> with as bindings::T and others with as ffi::T. (Miguel Ojeda)
- Revert explicit ffi::c_void import which is in the prelude. (Miguel Ojeda)
- Link to v10: https://lore.kernel.org/r/[email protected]
Changes in v10:
- Move fragment from "rust: enable clippy::ptr_cast_constness lint" to "rust: enable clippy::ptr_as_ptr lint". (Boqun Feng)
- Replace (...).into() with T::from(...) where the destination type isn't obvious in "rust: enable clippy::cast_lossless lint". (Boqun Feng)
- Link to v9: https://lore.kernel.org/r/[email protected]
Changes in v9:
- Replace ref-to-ptr coercion using let bindings with core::ptr::from_{ref,mut}. (Boqun Feng).
- Link to v8: https://lore.kernel.org/r/[email protected]
Changes in v8:
- Use coercion to go ref -> ptr.
- rustfmt.
- Rebase on v6.15-rc1.
- Extract first commit to its own series as it is shared with other series.
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- Add patch to enable clippy::ref_as_ptr.
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- Drop strict provenance patch.
- Fix URLs in doc comments.
- Add patch to enable clippy::cast_lossless.
- Rebase on rust-next.
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Use pointer::addr in OF. (Boqun Feng)
- Add documentation on stubs. (Benno Lossin)
- Mark stubs #[inline].
- Pick up Alice's RB on a shared commit from
https://lore.kernel.org/all/[email protected]/.
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Add missing SoB. (Benno Lossin)
- Use without_provenance_mut in alloc. (Boqun Feng)
- Limit strict provenance lints to the kernel crate to avoid complex logic in the build system. This can be revisited on MSRV >= 1.84.0.
- Rebase on rust-next.
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Fixed clippy warning in rust/kernel/firmware.rs. (kernel test robot)
- s/as u64/as bindings::phys_addr_t/g. (Benno Lossin)
- Use strict provenance APIs and enable lints. (Benno Lossin)
- Link to v2: https://lore.kernel.org/r/[email protected]
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 (6):
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
rust: enable clippy::cast_lossless lint
rust: enable clippy::ref_as_ptr lint
Makefile | 6 ++++ drivers/gpu/drm/drm_panic_qr.rs | 4 +-- drivers/gpu/nova-core/driver.rs | 2 +- drivers/gpu/nova-core/regs.rs | 2 +- drivers/gpu/nova-core/regs/macros.rs | 2 +- rust/bindings/lib.rs | 3 ++ 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 | 11 +++++-- rust/kernel/configfs.rs | 22 +++++--------- rust/kernel/cpufreq.rs | 2 +- rust/kernel/device.rs | 4 +-- rust/kernel/device_id.rs | 4 +-- rust/kernel/devres.rs | 17 +++++------ rust/kernel/dma.rs | 6 ++-- rust/kernel/drm/device.rs | 6 ++-- rust/kernel/error.rs | 2 +- rust/kernel/firmware.rs | 3 +- rust/kernel/fs/file.rs | 2 +- rust/kernel/io.rs | 18 ++++++------ rust/kernel/kunit.rs | 11 ++++--- rust/kernel/list/impl_list_item_mod.rs | 2 +- rust/kernel/miscdevice.rs | 2 +- rust/kernel/mm/virt.rs | 52 +++++++++++++++++----------------- rust/kernel/net/phy.rs | 4 +-- rust/kernel/of.rs | 6 ++-- rust/kernel/pci.rs | 11 ++++--- rust/kernel/platform.rs | 4 ++- rust/kernel/print.rs | 6 ++-- rust/kernel/seq_file.rs | 2 +- rust/kernel/str.rs | 14 ++++----- rust/kernel/sync/poll.rs | 2 +- rust/kernel/time/hrtimer/pin.rs | 2 +- rust/kernel/time/hrtimer/pin_mut.rs | 2 +- rust/kernel/uaccess.rs | 4 +-- rust/kernel/workqueue.rs | 8 +++--- rust/uapi/lib.rs | 3 ++ 38 files changed, 139 insertions(+), 120 deletions(-)
---
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
change-id: 20250307-ptr-as-ptr-21b1867fc4d4
Best regards,
Signature · 1 line
Tamir Duberstein <[email protected]>
PATCH v12 1/6 rust: enable `clippy::ptr_as_ptr` lint
In Rust 1.51.0, Clippy introduced the ptr_as_ptr lint [1]:
Quoted 3 lines
Though
ascasts between raw pointers are not terrible,pointer::castis safer because it cannot accidentally change the pointer's mutability, nor cast the pointer to other types likeusize.
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 core::ptr::from_ref(&x).cast() with or without ::<T> according to the previous rules. The core::ptr::from_ref call is required because (x as *const _).cast::<T>() results in inference failure.
- Native literal C strings are replaced with c_str!().as_char_ptr().
- *mut *mut T as _ is replaced with let *mut *const T = (*mut *mut T).cast();` since pointer to pointer can be confusing.
Apply these changes and enable the lint -- no functional change intended.
--- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/alloc/allocator_test.rs | 2 +- rust/kernel/alloc/kvec.rs | 4 ++-- rust/kernel/configfs.rs | 2 +- rust/kernel/cpufreq.rs | 2 +- rust/kernel/device.rs | 4 ++-- rust/kernel/devres.rs | 2 +- rust/kernel/dma.rs | 4 ++-- rust/kernel/error.rs | 2 +- rust/kernel/firmware.rs | 3 ++- rust/kernel/fs/file.rs | 2 +- rust/kernel/kunit.rs | 11 +++++++---- rust/kernel/list/impl_list_item_mod.rs | 2 +- rust/kernel/pci.rs | 2 +- rust/kernel/platform.rs | 4 +++- rust/kernel/print.rs | 6 +++--- rust/kernel/seq_file.rs | 2 +- rust/kernel/str.rs | 2 +- rust/kernel/sync/poll.rs | 2 +- rust/kernel/time/hrtimer/pin.rs | 2 +- rust/kernel/time/hrtimer/pin_mut.rs | 2 +- rust/kernel/workqueue.rs | 6 +++--- rust/uapi/lib.rs | 1 + 24 files changed, 40 insertions(+), 31 deletions(-)
Makefile +1 -0
@@ -484,6 +484,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::needless_bitwise_bool \ -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
@@ -25,6 +25,7 @@ )]#[allow(dead_code)] +#[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] #[cfg_attr( CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES , allow(unnecessary_transmutes))] mod bindings_raw {
rust/kernel/alloc/allocator_test.rs +1 -1
@@ -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
@@ -288,7 +288,7 @@ pub fn spare_capacity_mut(&mut self) -> &mut [MaybeUninit<T>] {// - `self.len` is smaller than `self.capacity` by the type invariant 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.
@@ -847,7 +847,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 (ptras _ , len, len) } +unsafe {Vec ::from_raw_parts (ptr.cast (), len, len) } } }
rust/kernel/configfs.rs +1 -1
@@ -561,7 +561,7 @@ impl<const ID: u64, O, Data> Attribute<ID, O, Data>let data: &Data =unsafe {get_group_data (c_group) };// SAFETY: By function safety requirements, `page` is writable for `PAGE_SIZE`. -let ret =O ::show (data,unsafe { &mut *(pageas *mut [u8 ;PAGE_SIZE ]) }); +let ret =O ::show (data,unsafe { &mut *(page.cast ::<[u8 ;PAGE_SIZE ]>()) });match ret {Ok (size) => sizeas isize ,
rust/kernel/cpufreq.rs +1 -1
@@ -647,7 +647,7 @@ pub fn data<T: ForeignOwnable>(&mut self) -> Option<<T>::Borrowed<'_>> {fn set_data <T :ForeignOwnable >(&mut self, data:T ) ->Result {if self.as_ref ().driver_data.is_null () {// Transfer the ownership of the data to the foreign interface. - self.as_mut_ref ().driver_data = <T as ForeignOwnable >::into_foreign (data)as _ ; + self.as_mut_ref ().driver_data = <T as ForeignOwnable >::into_foreign (data).cast ();Ok (()) }else {Err (EBUSY )
rust/kernel/device.rs +2 -2
@@ -195,10 +195,10 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) {#[cfg( CONFIG_PRINTK )] unsafe { bindings::_dev_printk ( - klevelas *const _ as *const crate ::ffi::c_char , + klevel.as_ptr ().cast ::<crate ::ffi::c_char >(), self.as_raw (),c_str! ("%pA" ).as_char_ptr (), - &msgas *const _ as *const crate ::ffi::c_void , + core::ptr::from_ref (&msg).cast ::<crate ::ffi::c_void >(), ) }; }
rust/kernel/devres.rs +1 -1
@@ -154,7 +154,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 = ptras *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/dma.rs +2 -2
@@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret as *mut T, + cpu_addr: ret.cast::<T>(), dma_attrs, }) }
@@ -293,7 +293,7 @@ fn drop(&mut self) { bindings::dma_free_attrs ( self.dev.as_raw (), size, - self.cpu_addras _ , + self.cpu_addr.cast (), self.dma_handle, self.dma_attrs.as_raw (), )
rust/kernel/error.rs +1 -1
@@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {/// Returns the error encoded as a pointer. pub fn to_ptr <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/firmware.rs +2 -1
@@ -62,10 +62,11 @@ impl Firmware {fn request_internal (name: &CStr , dev: &Device , func:FwFunc ) ->Result <Self > {let mut fw: *mut bindings::firmware = core::ptr::null_mut ();let pfw: *mut *mut bindings::firmware = &mut fw; +let pfw: *mut *const bindings::firmware = pfw.cast ();// SAFETY: `pfw` is a valid pointer to a NULL initialized `bindings::firmware` pointer. // `name` and `dev` are valid as by their type invariants. -let ret =unsafe { func.0 (pfwas _ , 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/fs/file.rs +1 -1
@@ -366,7 +366,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 (selfas *const File as *const bindings::file ) } +unsafe {LocalFile ::from_raw_file ((selfas *const Self ).cast ()) } } }
rust/kernel/kunit.rs +7 -4
@@ -9,6 +9,9 @@use crate ::prelude::*;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.
@@ -19,8 +22,8 @@ pub fn err(args: fmt::Arguments<'_>) {#[cfg( CONFIG_PRINTK )] unsafe { bindings::_printk ( -c"\x013%pA" .as_ptr ()as _ , - &argsas *const _ as *const c_void , +c_str! ("\x013%pA" ).as_char_ptr (), + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }
@@ -35,8 +38,8 @@ pub fn info(args: fmt::Arguments<'_>) {#[cfg( CONFIG_PRINTK )] unsafe { bindings::_printk ( -c"\x016%pA" .as_ptr ()as _ , - &argsas *const _ as *const c_void , +c_str! ("\x016%pA" ).as_char_ptr (), + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }
rust/kernel/list/impl_list_item_mod.rs +1 -1
@@ -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 { (ptras *mut u8 ).add (Self ::OFFSET )as *mut ListLinks <ID > } +unsafe { ptr.cast ::<u8 >().add (Self ::OFFSET ).cast () } } }
rust/kernel/pci.rs +1 -1
@@ -78,7 +78,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
@@ -69,7 +69,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 +3 -3
@@ -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 { *(ptras *const fmt::Arguments <'_>) }); +let _ = w.write_fmt (unsafe { *ptr.cast ::<fmt::Arguments <'_>>() }); w.pos ().cast () }
@@ -109,7 +109,7 @@ pub unsafe fn call_printk( bindings::_printk ( format_string.as_ptr (), module_name.as_ptr (), - &argsas *const _ as *const c_void , + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }
@@ -129,7 +129,7 @@ pub fn call_printk_cont(args: fmt::Arguments<'_>) {unsafe { bindings::_printk ( format_strings::CONT .as_ptr (), - &argsas *const _ as *const c_void , + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }
rust/kernel/seq_file.rs +1 -1
@@ -37,7 +37,7 @@ pub fn call_printf(&self, args: core::fmt::Arguments<'_>) { bindings::seq_printf ( self.inner.get (),c_str! ("%pA" ).as_char_ptr (), - &argsas *const _ as *const crate ::ffi::c_void , + core::ptr::from_ref (&args).cast ::<crate ::ffi::c_void >(), ); } }
rust/kernel/str.rs +1 -1
@@ -237,7 +237,7 @@ pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Self {// to a `NUL`-terminated C string. let len =unsafe { bindings::strlen (ptr) } +1 ;// SAFETY: Lifetime guaranteed by the safety precondition. -let bytes =unsafe { core::slice::from_raw_parts (ptras _ , 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
@@ -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/time/hrtimer/pin.rs +1 -1
@@ -79,7 +79,7 @@ impl<'a, T> RawHrTimerCallback for Pin<&'a T>unsafe extern "C" fn run (ptr: *mut bindings::hrtimer ) -> bindings::hrtimer_restart {// `HrTimer` is `repr(C)` -let timer_ptr = ptras *mut HrTimer <T >; +let timer_ptr = ptr.cast ::<HrTimer <T >>();// SAFETY: By the safety requirement of this function, `timer_ptr` // points to a `HrTimer<T>` contained in an `T`.
rust/kernel/time/hrtimer/pin_mut.rs +1 -1
@@ -83,7 +83,7 @@ impl<'a, T> RawHrTimerCallback for Pin<&'a mut T>unsafe extern "C" fn run (ptr: *mut bindings::hrtimer ) -> bindings::hrtimer_restart {// `HrTimer` is `repr(C)` -let timer_ptr = ptras *mut HrTimer <T >; +let timer_ptr = ptr.cast ::<HrTimer <T >>();// SAFETY: By the safety requirement of this function, `timer_ptr` // points to a `HrTimer<T>` contained in an `T`.
rust/kernel/workqueue.rs +3 -3
@@ -170,7 +170,7 @@ impl Queue {pub unsafe fn from_raw <'a>(ptr: *const bindings::workqueue_struct ) -> &'aQueue {// SAFETY: The `Queue` type is `#[repr(transparent)]`, so the pointer cast is valid. The // caller promises that the pointer is not dangling. -unsafe { &*(ptras *const Queue ) } +unsafe { &*ptr.cast ::<Queue >() } }/// Enqueues a work item.
@@ -522,7 +522,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 = ptras *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.
@@ -575,7 +575,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 = ptras *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
@@ -14,6 +14,7 @@#![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs,
Signature · 1 line
2.49.0
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
Quoted 21 lines · Tamir Duberstein
In Rust 1.51.0, Clippy introduced the
ptr_as_ptrlint [1]:Quoted 3 lines
Though
ascasts between raw pointers are not terrible,pointer::castis safer because it cannot accidentally change the pointer's mutability, nor cast the pointer to other types likeusize.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 withcore::ptr::from_ref(&x).cast()with or without::<T>according to the previous rules. Thecore::ptr::from_refcall is required because(x as *const _).cast::<T>()results in inference failure.
- Native literal C strings are replaced withc_str!().as_char_ptr().
-*mut *mut T as _is replaced withlet *mut *const T = (*mut *mut T).cast();` since pointer to pointer can be confusing.
Quoted 7 lines
Apply these changes and enable the lint -- no functional change intended.
Reviewed-by Benno Lossin <[email protected]>Reviewed-by Boqun Feng <[email protected]>Signed-off-by Tamir Duberstein <[email protected]>
@Andreas Hindborg could you please have a look for configfs?
@Rafael J. Wysocki @Viresh Kumar could you please have a look for cpufreq?
Quoted 427 lines
--- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/alloc/allocator_test.rs | 2 +- rust/kernel/alloc/kvec.rs | 4 ++-- rust/kernel/configfs.rs | 2 +- rust/kernel/cpufreq.rs | 2 +- rust/kernel/device.rs | 4 ++-- rust/kernel/devres.rs | 2 +- rust/kernel/dma.rs | 4 ++-- rust/kernel/error.rs | 2 +- rust/kernel/firmware.rs | 3 ++- rust/kernel/fs/file.rs | 2 +- rust/kernel/kunit.rs | 11 +++++++---- rust/kernel/list/impl_list_item_mod.rs | 2 +- rust/kernel/pci.rs | 2 +- rust/kernel/platform.rs | 4 +++- rust/kernel/print.rs | 6 +++--- rust/kernel/seq_file.rs | 2 +- rust/kernel/str.rs | 2 +- rust/kernel/sync/poll.rs | 2 +- rust/kernel/time/hrtimer/pin.rs | 2 +- rust/kernel/time/hrtimer/pin_mut.rs | 2 +- rust/kernel/workqueue.rs | 6 +++--- rust/uapi/lib.rs | 1 + 24 files changed, 40 insertions(+), 31 deletions(-)Makefile +1
-0@@ -484,6 +484,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::needless_bitwise_bool \ -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@@ -25,6 +25,7 @@ )]#[allow(dead_code)] +#[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] #[cfg_attr( CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES , allow(unnecessary_transmutes))] mod bindings_raw {rust/kernel/alloc/allocator_test.rs +1
-1@@ -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@@ -288,7 +288,7 @@ pub fn spare_capacity_mut(&mut self) -> &mut [MaybeUninit<T>] {// - `self.len` is smaller than `self.capacity` by the type invariant 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. @@ -847,7 +847,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 (ptras _ , len, len) } +unsafe {Vec ::from_raw_parts (ptr.cast (), len, len) } } }rust/kernel/configfs.rs +1
-1@@ -561,7 +561,7 @@ impl<const ID: u64, O, Data> Attribute<ID, O, Data>let data: &Data =unsafe {get_group_data (c_group) };// SAFETY: By function safety requirements, `page` is writable for `PAGE_SIZE`. -let ret =O ::show (data,unsafe { &mut *(pageas *mut [u8 ;PAGE_SIZE ]) }); +let ret =O ::show (data,unsafe { &mut *(page.cast ::<[u8 ;PAGE_SIZE ]>()) });match ret {Ok (size) => sizeas isize ,rust/kernel/cpufreq.rs +1
-1@@ -647,7 +647,7 @@ pub fn data<T: ForeignOwnable>(&mut self) -> Option<<T>::Borrowed<'_>> {fn set_data <T :ForeignOwnable >(&mut self, data:T ) ->Result {if self.as_ref ().driver_data.is_null () {// Transfer the ownership of the data to the foreign interface. - self.as_mut_ref ().driver_data = <T as ForeignOwnable >::into_foreign (data)as _ ; + self.as_mut_ref ().driver_data = <T as ForeignOwnable >::into_foreign (data).cast ();Ok (()) }else {Err (EBUSY )rust/kernel/device.rs +2
-2@@ -195,10 +195,10 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) {#[cfg( CONFIG_PRINTK )] unsafe { bindings::_dev_printk ( - klevelas *const _ as *const crate ::ffi::c_char , + klevel.as_ptr ().cast ::<crate ::ffi::c_char >(), self.as_raw (),c_str! ("%pA" ).as_char_ptr (), - &msgas *const _ as *const crate ::ffi::c_void , + core::ptr::from_ref (&msg).cast ::<crate ::ffi::c_void >(), ) }; }rust/kernel/devres.rs +1
-1@@ -154,7 +154,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 = ptras *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/dma.rs +2
-2@@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret as *mut T, + cpu_addr: ret.cast::<T>(), dma_attrs, }) }@@ -293,7 +293,7 @@ fn drop(&mut self) { bindings::dma_free_attrs ( self.dev.as_raw (), size, - self.cpu_addras _ , + self.cpu_addr.cast (), self.dma_handle, self.dma_attrs.as_raw (), )rust/kernel/error.rs +1
-1@@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {/// Returns the error encoded as a pointer. pub fn to_ptr <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/firmware.rs +2
-1@@ -62,10 +62,11 @@ impl Firmware {fn request_internal (name: &CStr , dev: &Device , func:FwFunc ) ->Result <Self > {let mut fw: *mut bindings::firmware = core::ptr::null_mut ();let pfw: *mut *mut bindings::firmware = &mut fw; +let pfw: *mut *const bindings::firmware = pfw.cast ();// SAFETY: `pfw` is a valid pointer to a NULL initialized `bindings::firmware` pointer. // `name` and `dev` are valid as by their type invariants. -let ret =unsafe { func.0 (pfwas _ , 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/fs/file.rs +1
-1@@ -366,7 +366,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 (selfas *const File as *const bindings::file ) } +unsafe {LocalFile ::from_raw_file ((selfas *const Self ).cast ()) } } }rust/kernel/kunit.rs +7
-4@@ -9,6 +9,9 @@use crate ::prelude::*;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. @@ -19,8 +22,8 @@ pub fn err(args: fmt::Arguments<'_>) {#[cfg( CONFIG_PRINTK )] unsafe { bindings::_printk ( -c"\x013%pA" .as_ptr ()as _ , - &argsas *const _ as *const c_void , +c_str! ("\x013%pA" ).as_char_ptr (), + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }@@ -35,8 +38,8 @@ pub fn info(args: fmt::Arguments<'_>) {#[cfg( CONFIG_PRINTK )] unsafe { bindings::_printk ( -c"\x016%pA" .as_ptr ()as _ , - &argsas *const _ as *const c_void , +c_str! ("\x016%pA" ).as_char_ptr (), + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }rust/kernel/list/impl_list_item_mod.rs +1
-1@@ -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 { (ptras *mut u8 ).add (Self ::OFFSET )as *mut ListLinks <ID > } +unsafe { ptr.cast ::<u8 >().add (Self ::OFFSET ).cast () } } }rust/kernel/pci.rs +1
-1@@ -78,7 +78,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@@ -69,7 +69,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 +3
-3@@ -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 { *(ptras *const fmt::Arguments <'_>) }); +let _ = w.write_fmt (unsafe { *ptr.cast ::<fmt::Arguments <'_>>() }); w.pos ().cast () }@@ -109,7 +109,7 @@ pub unsafe fn call_printk( bindings::_printk ( format_string.as_ptr (), module_name.as_ptr (), - &argsas *const _ as *const c_void , + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }@@ -129,7 +129,7 @@ pub fn call_printk_cont(args: fmt::Arguments<'_>) {unsafe { bindings::_printk ( format_strings::CONT .as_ptr (), - &argsas *const _ as *const c_void , + core::ptr::from_ref (&args).cast ::<c_void >(), ); } }rust/kernel/seq_file.rs +1
-1@@ -37,7 +37,7 @@ pub fn call_printf(&self, args: core::fmt::Arguments<'_>) { bindings::seq_printf ( self.inner.get (),c_str! ("%pA" ).as_char_ptr (), - &argsas *const _ as *const crate ::ffi::c_void , + core::ptr::from_ref (&args).cast ::<crate ::ffi::c_void >(), ); } }rust/kernel/str.rs +1
-1@@ -237,7 +237,7 @@ pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Self {// to a `NUL`-terminated C string. let len =unsafe { bindings::strlen (ptr) } +1 ;// SAFETY: Lifetime guaranteed by the safety precondition. -let bytes =unsafe { core::slice::from_raw_parts (ptras _ , 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@@ -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/time/hrtimer/pin.rs +1
-1@@ -79,7 +79,7 @@ impl<'a, T> RawHrTimerCallback for Pin<&'a T>unsafe extern "C" fn run (ptr: *mut bindings::hrtimer ) -> bindings::hrtimer_restart {// `HrTimer` is `repr(C)` -let timer_ptr = ptras *mut HrTimer <T >; +let timer_ptr = ptr.cast ::<HrTimer <T >>();// SAFETY: By the safety requirement of this function, `timer_ptr` // points to a `HrTimer<T>` contained in an `T`. rust/kernel/time/hrtimer/pin_mut.rs +1
-1@@ -83,7 +83,7 @@ impl<'a, T> RawHrTimerCallback for Pin<&'a mut T>unsafe extern "C" fn run (ptr: *mut bindings::hrtimer ) -> bindings::hrtimer_restart {// `HrTimer` is `repr(C)` -let timer_ptr = ptras *mut HrTimer <T >; +let timer_ptr = ptr.cast ::<HrTimer <T >>();// SAFETY: By the safety requirement of this function, `timer_ptr` // points to a `HrTimer<T>` contained in an `T`. rust/kernel/workqueue.rs +3
-3@@ -170,7 +170,7 @@ impl Queue {pub unsafe fn from_raw <'a>(ptr: *const bindings::workqueue_struct ) -> &'aQueue {// SAFETY: The `Queue` type is `#[repr(transparent)]`, so the pointer cast is valid. The // caller promises that the pointer is not dangling. -unsafe { &*(ptras *const Queue ) } +unsafe { &*ptr.cast ::<Queue >() } }/// Enqueues a work item. @@ -522,7 +522,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 = ptras *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. @@ -575,7 +575,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 = ptras *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
-1@@ -14,6 +14,7 @@#![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs, --2.49.0
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
Quoted 4 lines · Tamir Duberstein
@Andreas Hindborg could you please have a look for configfs?
@Rafael J. Wysocki @Viresh Kumar could you please have a look for cpufreq?
Thanks Tamir.
Christian, Danilo, David, Greg, Tejun: It would also be nice to get Acked-by's for your bits. Thanks!
Cheers,
Miguel
Tejun Heo
Acked-byRe: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
Quoted 10 lines · Miguel Ojeda
Quoted 4 lines · Tamir Duberstein
@Andreas Hindborg could you please have a look for configfs?
@Rafael J. Wysocki @Viresh Kumar could you please have a look for cpufreq?
Thanks Tamir.
Christian, Danilo, David, Greg, Tejun: It would also be nice to get Acked-by's for your bits. Thanks!
For wq part:
Thanks.
Signature · 1 line
tejun
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
In reply to Miguel OjedaQuoted 10 lines · Miguel Ojeda
Quoted 4 lines · Tamir Duberstein
@Andreas Hindborg could you please have a look for configfs?
@Rafael J. Wysocki @Viresh Kumar could you please have a look for cpufreq?
Thanks Tamir.
Christian, Danilo, David, Greg, Tejun: It would also be nice to get Acked-by's for your bits. Thanks!
For the whole series and the bits I maintain:
--
Independent from that, won't this potentially leave us with a lot of warnings from code that goes through other trees in the upcoming merge window? How do we deal with that?
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
Quoted 15 lines · Danilo Krummrich
Quoted 10 lines · Miguel Ojeda
Quoted 4 lines · Tamir Duberstein
@Andreas Hindborg could you please have a look for configfs?
@Rafael J. Wysocki @Viresh Kumar could you please have a look for cpufreq?
Thanks Tamir.
Christian, Danilo, David, Greg, Tejun: It would also be nice to get Acked-by's for your bits. Thanks!
For the whole series and the bits I maintain:
Quoted 7 lines
Acked-by Danilo Krummrich <[email protected]>--
Independent from that, won't this potentially leave us with a lot of warnings from code that goes through other trees in the upcoming merge window? How do we deal with that?
I think the idea was to take this during rc so that all trees have it by the start of the next merge window. I'm not 100% clear on the kernel mechanics here, but that's my understanding.
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
In reply to Danilo KrummrichQuoted 4 lines · Danilo Krummrich
Independent from that, won't this potentially leave us with a lot of warnings from code that goes through other trees in the upcoming merge window? How do we deal with that?
Yeah, good question.
Since they are Clippy ones, it should not be a big deal (e.g. we already had a case of a lint Clippy lingering for a long time due to timing of merge window etc. in the QR code).
In this case, I didn't see new ones in -next yet when I looked, so it should be mostly fine I think. It is also why I asked Tamir to re-send it at the beginning of the cycle, and then a v12 to include a few newer parts that were missed that landed lately.
So, worst case, they get fixed during the -rcs.
But, yeah, a while ago I proposed to have -rc1 to -rc2 as "treewide cleanups time" -- it would make this sort of things (that is not fully automated, but close) easy.
Cheers,
Miguel
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
In reply to Miguel OjedaQuoted 10 lines · Miguel Ojeda
Quoted 4 lines · Tamir Duberstein
@Andreas Hindborg could you please have a look for configfs?
@Rafael J. Wysocki @Viresh Kumar could you please have a look for cpufreq?
Thanks Tamir.
Christian, Danilo, David, Greg, Tejun: It would also be nice to get Acked-by's for your bits. Thanks!
Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
In reply to Tamir DubersteinQuoted 3 lines · Tamir Duberstein
Apply these changes and enable the lint -- no functional change intended.
We need one more for opp [1] -- Viresh: I can do it on apply, unless you disagree.
Cheers,
Miguel
[1]
rust/kernel/opp.rs +0 -0
@@ -92,7 +92,7 @@ fn to_c_str_array(names: &[CString]) ->
Result<KVec<*const u8>> {
let mut list = KVec::with_capacity(names.len() + 1, GFP_KERNEL)?;
for name in names.iter() {
- list.push(name.as_ptr() as _, GFP_KERNEL)?;
+ list.push(name.as_ptr().cast(), GFP_KERNEL)?;
}
list.push(ptr::null(), GFP_KERNEL)?;Re: [PATCH v12 1/6] rust: enable `clippy::ptr_as_ptr` lint
Quoted 7 lines · Miguel Ojeda
Quoted 3 lines · Tamir Duberstein
Apply these changes and enable the lint -- no functional change intended.
We need one more for
opp[1] -- Viresh: I can do it on apply, unless you disagree.
Please do. Thanks.
Quoted 13 lines
rust/kernel/opp.rs +1
-1@@ -92,7 +92,7 @@ fn to_c_str_array(names: &[CString]) -> Result<KVec<*const u8>> {let mut list =KVec ::with_capacity (names.len () +1 ,GFP_KERNEL )?;for namein names.iter () { - list.push (name.as_ptr ()as _ ,GFP_KERNEL )?; + list.push (name.as_ptr ().cast (),GFP_KERNEL )?; }
Quoted 1 line
list.push(ptr::null(), GFP_KERNEL)?;
For cpufreq/opp:
Signature · 1 line
viresh
PATCH v12 2/6 rust: enable `clippy::ptr_cast_constness` lint
In reply to Tamir DubersteinIn Rust 1.72.0, Clippy introduced the ptr_cast_constness lint [1]:
Quoted 3 lines
Though
ascasts between raw pointers are not terrible,pointer::cast_mutandpointer::cast_constare safer because they cannot accidentally cast the pointer to another type.
There are only 3 affected sites:
- *mut T as *const U as *mut U becomes (*mut T).cast().
- &self as *const Self as *mut Self becomes core::ptr::from_ref(self).cast_mut().
- *const T as *mut _ becommes (*const T).cast_mut().
Apply these changes and enable the lint -- no functional change intended.
--- Makefile | 1 + rust/kernel/block/mq/request.rs | 4 ++-- rust/kernel/drm/device.rs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-)
Makefile +1 -0
@@ -485,6 +485,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 +2 -2
@@ -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 (ptras *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.
@@ -155,7 +155,7 @@ pub(crate) fn wrapper_ref(&self) -> &RequestDataWrapper {// 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 (selfas *const Self as *mut Self ).as_ref () } +unsafe {Self ::wrapper_ptr (core::ptr::from_ref (self).cast_mut ()).as_ref () } } }
rust/kernel/drm/device.rs +2 -2
@@ -83,8 +83,8 @@ impl<T: drm::Driver> Device<T> { major: T::INFO.major, minor: T::INFO.minor, patchlevel: T::INFO.patchlevel, - name: T::INFO.name.as_char_ptr() as *mut _, - desc: T::INFO.desc.as_char_ptr() as *mut _, + name: T::INFO.name.as_char_ptr().cast_mut(), + desc: T::INFO.desc.as_char_ptr().cast_mut(), driver_features: drm::driver::FEAT_GEM, ioctls: T::IOCTLS.as_ptr(),
Signature · 1 line
2.49.0
Re: [PATCH v12 2/6] rust: enable `clippy::ptr_cast_constness` lint
Quoted 2 lines · Tamir Duberstein
rust/kernel/drm/device.rs | 4 ++--
Danilo: for completeness: if you don't want this, please shout. Thanks!
Cheers,
Miguel
PATCH v12 3/6 rust: enable `clippy::as_ptr_cast_mut` lint
In reply to Tamir DubersteinIn Rust 1.66.0, Clippy introduced the as_ptr_cast_mut lint [1]:
Quoted 3 lines
Since
as_ptrtakes 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
@@ -479,6 +479,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
@@ -140,7 +140,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.49.0
Re: [PATCH v12 3/6] rust: enable `clippy::as_ptr_cast_mut` lint
Quoted 2 lines · Tamir Duberstein
rust/kernel/devres.rs | 2 +-
Danilo, Greg: for completeness: if you don't want this, please shout. Thanks!
Cheers,
Miguel
Re: [PATCH v12 3/6] rust: enable `clippy::as_ptr_cast_mut` lint
Quoted 5 lines · Miguel Ojeda
Quoted 2 lines · Tamir Duberstein
rust/kernel/devres.rs | 2 +-Danilo, Greg: for completeness: if you don't want this, please shout. Thanks!
PATCH v12 4/6 rust: enable `clippy::as_underscore` lint
In reply to Tamir DubersteinIn 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 + drivers/gpu/nova-core/driver.rs | 2 +- rust/kernel/block/mq/operations.rs | 2 +- rust/kernel/block/mq/request.rs | 7 ++++- rust/kernel/device_id.rs | 2 +- rust/kernel/devres.rs | 13 +++++----- rust/kernel/dma.rs | 2 +- rust/kernel/drm/device.rs | 2 +- rust/kernel/error.rs | 2 +- rust/kernel/io.rs | 18 ++++++------- rust/kernel/miscdevice.rs | 2 +- rust/kernel/mm/virt.rs | 52 +++++++++++++++++++------------------- rust/kernel/of.rs | 6 ++--- rust/kernel/pci.rs | 9 ++++--- rust/kernel/str.rs | 8 +++--- rust/kernel/workqueue.rs | 2 +- 16 files changed, 70 insertions(+), 60 deletions(-)
Makefile +1 -0
@@ -480,6 +480,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 \
drivers/gpu/nova-core/driver.rs +1 -1
@@ -19,7 +19,7 @@ pub(crate) struct NovaCore { MODULE_PCI_TABLE, <NovaCore as pci::Driver>::IdInfo, [( - pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_NVIDIA , bindings::PCI_ANY_ID as _ ), + pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_NVIDIA , bindings::PCI_ANY_ID as u32 ), () )] );
rust/kernel/block/mq/operations.rs +1 -1
@@ -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 bindings::blk_status_t } }
rust/kernel/block/mq/request.rs +6 -1
@@ -125,7 +125,12 @@ 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 bindings::blk_status_t , + ) + };Ok (()) }
rust/kernel/device_id.rs +1 -1
@@ -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 +7 -6
@@ -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 bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl<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); }; /// } /// } ///
@@ -112,8 +112,9 @@ fn new(dev: &Device<Bound>, 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), dataas _ ) }; +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
@@ -127,7 +128,7 @@ fn new(dev: &Device<Bound>, data: T, flags: Flags) -> Result<Arc<DevresInner<T>> }fn as_ptr (&self) -> *const Self { - selfas _ + self }fn remove_action (this: &Arc <Self >) {
rust/kernel/dma.rs +1 -1
@@ -38,7 +38,7 @@impl Attrs {/// Get the raw representation of this attribute. pub (crate )fn as_raw (self) ->crate ::ffi::c_ulong { - self.0 as _ + self.0 as crate ::ffi::c_ulong }/// Check whether `flags` is contained in `self`.
rust/kernel/drm/device.rs +1 -1
@@ -89,7 +89,7 @@ impl<T: drm::Driver> Device<T> { driver_features: drm::driver::FEAT_GEM, ioctls: T::IOCTLS.as_ptr(), num_ioctls: T::IOCTLS.len() as i32, - fops: &Self::GEM_FOPS as _, + fops: &Self::GEM_FOPS, };const GEM_FOPS : bindings::file_operations = drm::gem::create_fops ();
rust/kernel/error.rs +1 -1
@@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {/// Returns the error encoded as a pointer. pub fn to_ptr <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/io.rs +9 -9
@@ -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 bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl<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::$c_fn(addr as _) } + unsafe { bindings::$c_fn(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::$c_fn(addr as _) }) + Ok(unsafe { bindings::$c_fn(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::$c_fn(value, addr as _, ) } + unsafe { bindings::$c_fn(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::$c_fn(value, addr as _) } + unsafe { bindings::$c_fn(value, addr as *mut c_void) }Ok (()) } };
rust/kernel/miscdevice.rs +1 -1
@@ -34,7 +34,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 ffi::c_int ; result.name = self.name.as_char_ptr (); result.fops =MiscdeviceVTable ::<T >::build (); result
rust/kernel/mm/virt.rs +26 -26
106 lines not on this page · raw message
rust/kernel/of.rs +3 -3
@@ -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 .dataas _ + self.0 .dataas 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
@@ -171,7 +171,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_dataas _ + self.0 .driver_data } }
@@ -206,7 +206,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), +/// (), +/// ) /// ] /// ); ///
@@ -330,7 +333,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 (), ioptras _ ); + bindings::pci_iounmap (pdev.as_raw (), ioptras *mut kernel::ffi::c_void ); bindings::pci_release_region (pdev.as_raw (), num); } }
rust/kernel/str.rs +4 -4
@@ -728,9 +728,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: posas _ , - pos: posas _ , - end: endas _ , + beg: posas usize , + pos: posas usize , + end: endas usize , } }
@@ -755,7 +755,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.posas _ + self.posas *mut u8 }/// Returns the number of bytes written to the formatter.
rust/kernel/workqueue.rs +1 -1
@@ -198,7 +198,7 @@ pub fn enqueue<W, const ID: u64>(&self, w: W) -> W::EnqueueOutputunsafe { w.__enqueue (move |work_ptr| { bindings::queue_work_on ( - bindings::wq_misc_consts_WORK_CPU_UNBOUNDas _ , + bindings::wq_misc_consts_WORK_CPU_UNBOUNDas ffi::c_int , queue_ptr, work_ptr, )
Signature · 1 line
2.49.0
Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
Quoted 22 lines · Tamir Duberstein
In Rust 1.63.0, Clippy introduced the
as_underscorelint [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
asconversions, 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.
Quoted 4 lines
Reviewed-by Benno Lossin <[email protected]>Reviewed-by Boqun Feng <[email protected]>Signed-off-by Tamir Duberstein <[email protected]>
@Danilo Krummrich could you please have a look for nova?
Quoted 483 lines
--- Makefile | 1 + drivers/gpu/nova-core/driver.rs | 2 +- rust/kernel/block/mq/operations.rs | 2 +- rust/kernel/block/mq/request.rs | 7 ++++- rust/kernel/device_id.rs | 2 +- rust/kernel/devres.rs | 13 +++++----- rust/kernel/dma.rs | 2 +- rust/kernel/drm/device.rs | 2 +- rust/kernel/error.rs | 2 +- rust/kernel/io.rs | 18 ++++++------- rust/kernel/miscdevice.rs | 2 +- rust/kernel/mm/virt.rs | 52 +++++++++++++++++++------------------- rust/kernel/of.rs | 6 ++--- rust/kernel/pci.rs | 9 ++++--- rust/kernel/str.rs | 8 +++--- rust/kernel/workqueue.rs | 2 +- 16 files changed, 70 insertions(+), 60 deletions(-)Makefile +1
-0@@ -480,6 +480,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 \drivers/gpu/nova-core/driver.rs +1
-1@@ -19,7 +19,7 @@ pub(crate) struct NovaCore { MODULE_PCI_TABLE, <NovaCore as pci::Driver>::IdInfo, [( - pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_NVIDIA , bindings::PCI_ANY_ID as _ ), + pci::DeviceId ::from_id (bindings::PCI_VENDOR_ID_NVIDIA , bindings::PCI_ANY_ID as u32 ), () )] );rust/kernel/block/mq/operations.rs +1
-1@@ -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 bindings::blk_status_t } }rust/kernel/block/mq/request.rs +6
-1@@ -125,7 +125,12 @@ 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 bindings::blk_status_t , + ) + };Ok (()) }rust/kernel/device_id.rs +1
-1@@ -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 +7
-6@@ -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 bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl<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); }; /// } /// } /// @@ -112,8 +112,9 @@ fn new(dev: &Device<Bound>, 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), dataas _ ) }; +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 @@ -127,7 +128,7 @@ fn new(dev: &Device<Bound>, data: T, flags: Flags) -> Result<Arc<DevresInner<T>> }fn as_ptr (&self) -> *const Self { - selfas _ + self }fn remove_action (this: &Arc <Self >) {rust/kernel/dma.rs +1
-1@@ -38,7 +38,7 @@impl Attrs {/// Get the raw representation of this attribute. pub (crate )fn as_raw (self) ->crate ::ffi::c_ulong { - self.0 as _ + self.0 as crate ::ffi::c_ulong }/// Check whether `flags` is contained in `self`. rust/kernel/drm/device.rs +1
-1@@ -89,7 +89,7 @@ impl<T: drm::Driver> Device<T> { driver_features: drm::driver::FEAT_GEM, ioctls: T::IOCTLS.as_ptr(), num_ioctls: T::IOCTLS.len() as i32, - fops: &Self::GEM_FOPS as _, + fops: &Self::GEM_FOPS, };const GEM_FOPS : bindings::file_operations = drm::gem::create_fops ();rust/kernel/error.rs +1
-1@@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {/// Returns the error encoded as a pointer. pub fn to_ptr <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/io.rs +9
-9@@ -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 bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl<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::$c_fn(addr as _) } + unsafe { bindings::$c_fn(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::$c_fn(addr as _) }) + Ok(unsafe { bindings::$c_fn(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::$c_fn(value, addr as _, ) } + unsafe { bindings::$c_fn(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::$c_fn(value, addr as _) } + unsafe { bindings::$c_fn(value, addr as *mut c_void) }Ok (()) } };rust/kernel/miscdevice.rs +1
-1@@ -34,7 +34,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 ffi::c_int ; result.name = self.name.as_char_ptr (); result.fops =MiscdeviceVTable ::<T >::build (); resultrust/kernel/mm/virt.rs +26
-26@@ -392,80 +392,80 @@ pub mod flags {use crate ::bindings;/// No flags are set. -pub const NONE :vm_flags_t = bindings::VM_NONE as _ ; +pub const NONE :vm_flags_t = bindings::VM_NONE as vm_flags_t ;/// Mapping allows reads. -pub const READ :vm_flags_t = bindings::VM_READ as _ ; +pub const READ :vm_flags_t = bindings::VM_READ as vm_flags_t ;/// Mapping allows writes. -pub const WRITE :vm_flags_t = bindings::VM_WRITE as _ ; +pub const WRITE :vm_flags_t = bindings::VM_WRITE as vm_flags_t ;/// Mapping allows execution. -pub const EXEC :vm_flags_t = bindings::VM_EXEC as _ ; +pub const EXEC :vm_flags_t = bindings::VM_EXEC as vm_flags_t ;/// Mapping is shared. -pub const SHARED :vm_flags_t = bindings::VM_SHARED as _ ; +pub const SHARED :vm_flags_t = bindings::VM_SHARED as vm_flags_t ;/// Mapping may be updated to allow reads. -pub const MAYREAD :vm_flags_t = bindings::VM_MAYREAD as _ ; +pub const MAYREAD :vm_flags_t = bindings::VM_MAYREAD as vm_flags_t ;/// Mapping may be updated to allow writes. -pub const MAYWRITE :vm_flags_t = bindings::VM_MAYWRITE as _ ; +pub const MAYWRITE :vm_flags_t = bindings::VM_MAYWRITE as vm_flags_t ;/// Mapping may be updated to allow execution. -pub const MAYEXEC :vm_flags_t = bindings::VM_MAYEXEC as _ ; +pub const MAYEXEC :vm_flags_t = bindings::VM_MAYEXEC as vm_flags_t ;/// Mapping may be updated to be shared. -pub const MAYSHARE :vm_flags_t = bindings::VM_MAYSHARE as _ ; +pub const MAYSHARE :vm_flags_t = bindings::VM_MAYSHARE as vm_flags_t ;/// Page-ranges managed without `struct page`, just pure PFN. -pub const PFNMAP :vm_flags_t = bindings::VM_PFNMAP as _ ; +pub const PFNMAP :vm_flags_t = bindings::VM_PFNMAP as vm_flags_t ;/// Memory mapped I/O or similar. -pub const IO :vm_flags_t = bindings::VM_IO as _ ; +pub const IO :vm_flags_t = bindings::VM_IO as vm_flags_t ;/// Do not copy this vma on fork. -pub const DONTCOPY :vm_flags_t = bindings::VM_DONTCOPY as _ ; +pub const DONTCOPY :vm_flags_t = bindings::VM_DONTCOPY as vm_flags_t ;/// Cannot expand with mremap(). -pub const DONTEXPAND :vm_flags_t = bindings::VM_DONTEXPAND as _ ; +pub const DONTEXPAND :vm_flags_t = bindings::VM_DONTEXPAND as vm_flags_t ;/// Lock the pages covered when they are faulted in. -pub const LOCKONFAULT :vm_flags_t = bindings::VM_LOCKONFAULT as _ ; +pub const LOCKONFAULT :vm_flags_t = bindings::VM_LOCKONFAULT as vm_flags_t ;/// Is a VM accounted object. -pub const ACCOUNT :vm_flags_t = bindings::VM_ACCOUNT as _ ; +pub const ACCOUNT :vm_flags_t = bindings::VM_ACCOUNT as vm_flags_t ;/// Should the VM suppress accounting. -pub const NORESERVE :vm_flags_t = bindings::VM_NORESERVE as _ ; +pub const NORESERVE :vm_flags_t = bindings::VM_NORESERVE as vm_flags_t ;/// Huge TLB Page VM. -pub const HUGETLB :vm_flags_t = bindings::VM_HUGETLB as _ ; +pub const HUGETLB :vm_flags_t = bindings::VM_HUGETLB as vm_flags_t ;/// Synchronous page faults. (DAX-specific) -pub const SYNC :vm_flags_t = bindings::VM_SYNC as _ ; +pub const SYNC :vm_flags_t = bindings::VM_SYNC as vm_flags_t ;/// Architecture-specific flag. -pub const ARCH_1 :vm_flags_t = bindings::VM_ARCH_1 as _ ; +pub const ARCH_1 :vm_flags_t = bindings::VM_ARCH_1 as vm_flags_t ;/// Wipe VMA contents in child on fork. -pub const WIPEONFORK :vm_flags_t = bindings::VM_WIPEONFORK as _ ; +pub const WIPEONFORK :vm_flags_t = bindings::VM_WIPEONFORK as vm_flags_t ;/// Do not include in the core dump. -pub const DONTDUMP :vm_flags_t = bindings::VM_DONTDUMP as _ ; +pub const DONTDUMP :vm_flags_t = bindings::VM_DONTDUMP as vm_flags_t ;/// Not soft dirty clean area. -pub const SOFTDIRTY :vm_flags_t = bindings::VM_SOFTDIRTY as _ ; +pub const SOFTDIRTY :vm_flags_t = bindings::VM_SOFTDIRTY as vm_flags_t ;/// Can contain `struct page` and pure PFN pages. -pub const MIXEDMAP :vm_flags_t = bindings::VM_MIXEDMAP as _ ; +pub const MIXEDMAP :vm_flags_t = bindings::VM_MIXEDMAP as vm_flags_t ;/// MADV_HUGEPAGE marked this vma. -pub const HUGEPAGE :vm_flags_t = bindings::VM_HUGEPAGE as _ ; +pub const HUGEPAGE :vm_flags_t = bindings::VM_HUGEPAGE as vm_flags_t ;/// MADV_NOHUGEPAGE marked this vma. -pub const NOHUGEPAGE :vm_flags_t = bindings::VM_NOHUGEPAGE as _ ; +pub const NOHUGEPAGE :vm_flags_t = bindings::VM_NOHUGEPAGE as vm_flags_t ;/// KSM may merge identical pages. -pub const MERGEABLE :vm_flags_t = bindings::VM_MERGEABLE as _ ; +pub const MERGEABLE :vm_flags_t = bindings::VM_MERGEABLE as vm_flags_t ; }rust/kernel/of.rs +3
-3@@ -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 .dataas _ + self.0 .dataas 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@@ -171,7 +171,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_dataas _ + self.0 .driver_data } }@@ -206,7 +206,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), +/// (), +/// ) /// ] /// ); /// @@ -330,7 +333,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 (), ioptras _ ); + bindings::pci_iounmap (pdev.as_raw (), ioptras *mut kernel::ffi::c_void ); bindings::pci_release_region (pdev.as_raw (), num); } }rust/kernel/str.rs +4
-4@@ -728,9 +728,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: posas _ , - pos: posas _ , - end: endas _ , + beg: posas usize , + pos: posas usize , + end: endas usize , } }@@ -755,7 +755,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.posas _ + self.posas *mut u8 }/// Returns the number of bytes written to the formatter. rust/kernel/workqueue.rs +1
-2@@ -198,7 +198,7 @@ pub fn enqueue<W, const ID: u64>(&self, w: W) -> W::EnqueueOutputunsafe { w.__enqueue (move |work_ptr| { bindings::queue_work_on ( - bindings::wq_misc_consts_WORK_CPU_UNBOUNDas _ , + bindings::wq_misc_consts_WORK_CPU_UNBOUNDas ffi::c_int , queue_ptr, work_ptr, ) --2.49.0
Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
Quoted 2 lines · Tamir Duberstein
@Danilo Krummrich could you please have a look for nova?
Alice, Christian, Danilo, Greg, Tejun: it would also be nice to get Acked-by's for your (other) bits.
Thanks!
Cheers,
Miguel
Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
Quoted 6 lines · Miguel Ojeda
Quoted 2 lines · Tamir Duberstein
@Danilo Krummrich could you please have a look for nova?
Alice, Christian, Danilo, Greg, Tejun: it would also be nice to get Acked-by's for your (other) bits.
Danilo Krummrich
maintainerRe: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
In reply to Tamir Dubersteinrust/kernel/error.rs pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { · line 156
Quoted 10 lines · Tamir Duberstein
rust/kernel/error.rs +1
-1@@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t {/// Returns the error encoded as a pointer. pub fn to_ptr <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 () }
Shouldn't this be c_long?
Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
Quoted 2 lines · Danilo Krummrich
Shouldn't this be
c_long?
Yeah, agreed, it is clearer -- I mentioned that for similar ones in a previous version.
Cheers,
Miguel
Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
Quoted 7 lines · Miguel Ojeda
Quoted 2 lines · Danilo Krummrich
Shouldn't this be
c_long?Yeah, agreed, it is clearer -- I mentioned that for similar ones in a previous version.
+1
Miguel, would you mind taking care of this on apply? Quite a big series to send again.
Cheers.
Tamir
Re: [PATCH v12 4/6] rust: enable `clippy::as_underscore` lint
Quoted 3 lines · Tamir Duberstein
Miguel, would you mind taking care of this on apply? Quite a big series to send again.
Yeah, of course.
Cheers,
Miguel
PATCH v12 5/6 rust: enable `clippy::cast_lossless` lint
In reply to Tamir DubersteinBefore Rust 1.29.0, Clippy introduced the cast_lossless lint [1]:
Quoted 6 lines
Rust’s
askeyword will perform many kinds of conversions, including silently lossy conversions. Conversion functions such asi32::fromwill only perform lossless conversions. Using the conversion functions prevents conversions from becoming silently lossy if the input types ever change, and makes it clear for people reading the code that the conversion is lossless.
While this doesn't eliminate unchecked as conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended.
--- Makefile | 1 + drivers/gpu/drm/drm_panic_qr.rs | 4 ++-- drivers/gpu/nova-core/regs.rs | 2 +- drivers/gpu/nova-core/regs/macros.rs | 2 +- rust/bindings/lib.rs | 1 + rust/kernel/net/phy.rs | 4 ++-- rust/uapi/lib.rs | 1 + 7 files changed, 9 insertions(+), 6 deletions(-)
Makefile +1 -0
@@ -481,6 +481,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ -Wclippy::as_underscore \ + -Wclippy::cast_lossless \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \
drivers/gpu/drm/drm_panic_qr.rs +2 -2
@@ -404,7 +404,7 @@ fn pop3(&mut self) -> Option<(u16, usize)> {let mut out =0 ;let mut exp =1 ;for iin 0 ..poplen { - out += self.decimals[self.len + i]as u16 * exp; + out += u16::from (self.decimals[self.len + i]) * exp; exp *=10 ; }Some ((out,NUM_CHARS_BITS [poplen]))
@@ -425,7 +425,7 @@ fn next(&mut self) -> Option<Self::Item> {match self.segment {Segment ::Binary (data) => {if self.offset < data.len () { -let byte = data[self.offset]as u16 ; +let byte = u16::from (data[self.offset]); self.offset +=1 ;Some ((byte,8 )) }else {
drivers/gpu/nova-core/regs.rs +1 -1
@@ -32,7 +32,7 @@ pub(crate) fn architecture(self) -> Result<Architecture> {pub (crate )fn chipset (self) ->Result <Chipset > { self.architecture () .map (|arch| { - ((archas u32 ) <<Self ::IMPLEMENTATION .len ()) | self.implementation ()as u32 + ((archas u32 ) <<Self ::IMPLEMENTATION .len ()) | u32::from (self.implementation ()) }) .and_then (Chipset ::try_from) }
drivers/gpu/nova-core/regs/macros.rs +1 -1
@@ -264,7 +264,7 @@ pub(crate) fn $field(self) -> $res_type { pub(crate) fn [<set_ $field>](mut self, value: $to_type) -> Self { const MASK: u32 = $name::[<$field:upper _MASK>]; const SHIFT: u32 = $name::[<$field:upper _SHIFT>]; -let value = ((valueas u32 ) <<SHIFT ) &MASK ; +let value = (u32::from (value) <<SHIFT ) &MASK ; self.0 = (self.0 & !MASK ) | value; self
rust/bindings/lib.rs +1 -0
@@ -25,6 +25,7 @@ )]#[allow(dead_code)] +#[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] #[cfg_attr( CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES , allow(unnecessary_transmutes))]
rust/kernel/net/phy.rs +2 -2
@@ -142,7 +142,7 @@ pub fn is_autoneg_enabled(&self) -> bool {// SAFETY: The struct invariant ensures that we may access // this field without additional synchronization. let bit_field =unsafe { &(*self.0 .get ())._bitfield_1 }; - bit_field.get (13 ,1 ) == bindings::AUTONEG_ENABLE as u64 + bit_field.get (13 ,1 ) == u64::from (bindings::AUTONEG_ENABLE ) }/// Gets the current auto-negotiation state.
@@ -427,7 +427,7 @@ impl<T: Driver> Adapter<T> {// where we hold `phy_device->lock`, so the accessors on // `Device` are okay to call. let dev =unsafe {Device ::from_raw (phydev) }; -T ::match_phy_device (dev)as i32 +T ::match_phy_device (dev).into () }/// # Safety
rust/uapi/lib.rs +1 -0
@@ -14,6 +14,7 @@#![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::cast_lossless, clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code,
Signature · 1 line
2.49.0
Re: [PATCH v12 5/6] rust: enable `clippy::cast_lossless` lint
Quoted 15 lines · Tamir Duberstein
Before Rust 1.29.0, Clippy introduced the
cast_losslesslint [1]:Quoted 6 lines
Rust’s
askeyword will perform many kinds of conversions, including silently lossy conversions. Conversion functions such asi32::fromwill only perform lossless conversions. Using the conversion functions prevents conversions from becoming silently lossy if the input types ever change, and makes it clear for people reading the code that the conversion is lossless.While this doesn't eliminate unchecked
asconversions, 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.
Quoted 6 lines
Suggested-by Benno Lossin <[email protected]>Reviewed-by Benno Lossin <[email protected]>Reviewed-by Boqun Feng <[email protected]>Signed-off-by Tamir Duberstein <[email protected]>
@Danilo Krummrich could you please have a look for drm and nova?
Quoted 120 lines
--- Makefile | 1 + drivers/gpu/drm/drm_panic_qr.rs | 4 ++-- drivers/gpu/nova-core/regs.rs | 2 +- drivers/gpu/nova-core/regs/macros.rs | 2 +- rust/bindings/lib.rs | 1 + rust/kernel/net/phy.rs | 4 ++-- rust/uapi/lib.rs | 1 + 7 files changed, 9 insertions(+), 6 deletions(-)Makefile +1
-0@@ -481,6 +481,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ -Wclippy::as_underscore \ + -Wclippy::cast_lossless \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \drivers/gpu/drm/drm_panic_qr.rs +2
-2@@ -404,7 +404,7 @@ fn pop3(&mut self) -> Option<(u16, usize)> {let mut out =0 ;let mut exp =1 ;for iin 0 ..poplen { - out += self.decimals[self.len + i]as u16 * exp; + out += u16::from (self.decimals[self.len + i]) * exp; exp *=10 ; }Some ((out,NUM_CHARS_BITS [poplen]))@@ -425,7 +425,7 @@ fn next(&mut self) -> Option<Self::Item> {match self.segment {Segment ::Binary (data) => {if self.offset < data.len () { -let byte = data[self.offset]as u16 ; +let byte = u16::from (data[self.offset]); self.offset +=1 ;Some ((byte,8 )) }else {drivers/gpu/nova-core/regs.rs +1
-1@@ -32,7 +32,7 @@ pub(crate) fn architecture(self) -> Result<Architecture> {pub (crate )fn chipset (self) ->Result <Chipset > { self.architecture () .map (|arch| { - ((archas u32 ) <<Self ::IMPLEMENTATION .len ()) | self.implementation ()as u32 + ((archas u32 ) <<Self ::IMPLEMENTATION .len ()) | u32::from (self.implementation ()) }) .and_then (Chipset ::try_from) }drivers/gpu/nova-core/regs/macros.rs +1
-1@@ -264,7 +264,7 @@ pub(crate) fn $field(self) -> $res_type { pub(crate) fn [<set_ $field>](mut self, value: $to_type) -> Self { const MASK: u32 = $name::[<$field:upper _MASK>]; const SHIFT: u32 = $name::[<$field:upper _SHIFT>]; -let value = ((valueas u32 ) <<SHIFT ) &MASK ; +let value = (u32::from (value) <<SHIFT ) &MASK ; self.0 = (self.0 & !MASK ) | value; selfrust/bindings/lib.rs +1
-0@@ -25,6 +25,7 @@ )]#[allow(dead_code)] +#[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] #[cfg_attr( CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES , allow(unnecessary_transmutes))] rust/kernel/net/phy.rs +2
-2@@ -142,7 +142,7 @@ pub fn is_autoneg_enabled(&self) -> bool {// SAFETY: The struct invariant ensures that we may access // this field without additional synchronization. let bit_field =unsafe { &(*self.0 .get ())._bitfield_1 }; - bit_field.get (13 ,1 ) == bindings::AUTONEG_ENABLE as u64 + bit_field.get (13 ,1 ) == u64::from (bindings::AUTONEG_ENABLE ) }/// Gets the current auto-negotiation state. @@ -427,7 +427,7 @@ impl<T: Driver> Adapter<T> {// where we hold `phy_device->lock`, so the accessors on // `Device` are okay to call. let dev =unsafe {Device ::from_raw (phydev) }; -T ::match_phy_device (dev)as i32 +T ::match_phy_device (dev).into () }/// # Safety rust/uapi/lib.rs +1
-1@@ -14,6 +14,7 @@#![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::cast_lossless, clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, --2.49.0
Re: [PATCH v12 5/6] rust: enable `clippy::cast_lossless` lint
Quoted 2 lines · Tamir Duberstein
@Danilo Krummrich could you please have a look for drm and nova?
Jocelyn, Tomo: it would also be nice to get Acked-by's for your bits.
Thanks!
Cheers,
Miguel
Re: [PATCH v12 5/6] rust: enable `clippy::cast_lossless` lint
In reply to Tamir DubersteinQuoted 9 lines · Tamir Duberstein
Before Rust 1.29.0, Clippy introduced the
cast_losslesslint [1]:Quoted 6 lines
Rust’s
askeyword will perform many kinds of conversions, including silently lossy conversions. Conversion functions such asi32::fromwill only perform lossless conversions. Using the conversion functions prevents conversions from becoming silently lossy if the input types ever change, and makes it clear for people reading the code that the conversion is lossless.
Quoted 4 lines
While this doesn't eliminate unchecked
asconversions, 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.
Thanks, it looks good to me, for the drm_panic_qr.rs part.
Quoted 124 lines
Suggested-by Benno Lossin <[email protected]>Reviewed-by Benno Lossin <[email protected]>Reviewed-by Boqun Feng <[email protected]>Signed-off-by Tamir Duberstein <[email protected]>--- Makefile | 1 + drivers/gpu/drm/drm_panic_qr.rs | 4 ++-- drivers/gpu/nova-core/regs.rs | 2 +- drivers/gpu/nova-core/regs/macros.rs | 2 +- rust/bindings/lib.rs | 1 + rust/kernel/net/phy.rs | 4 ++-- rust/uapi/lib.rs | 1 + 7 files changed, 9 insertions(+), 6 deletions(-)Makefile +1
-0@@ -481,6 +481,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ -Wclippy::as_underscore \ + -Wclippy::cast_lossless \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \drivers/gpu/drm/drm_panic_qr.rs +2
-2@@ -404,7 +404,7 @@ fn pop3(&mut self) -> Option<(u16, usize)> {let mut out =0 ;let mut exp =1 ;for iin 0 ..poplen { - out += self.decimals[self.len + i]as u16 * exp; + out += u16::from (self.decimals[self.len + i]) * exp; exp *=10 ; }Some ((out,NUM_CHARS_BITS [poplen]))@@ -425,7 +425,7 @@ fn next(&mut self) -> Option<Self::Item> {match self.segment {Segment ::Binary (data) => {if self.offset < data.len () { -let byte = data[self.offset]as u16 ; +let byte = u16::from (data[self.offset]); self.offset +=1 ;Some ((byte,8 )) }else {drivers/gpu/nova-core/regs.rs +1
-1@@ -32,7 +32,7 @@ pub(crate) fn architecture(self) -> Result<Architecture> {pub (crate )fn chipset (self) ->Result <Chipset > { self.architecture () .map (|arch| { - ((archas u32 ) <<Self ::IMPLEMENTATION .len ()) | self.implementation ()as u32 + ((archas u32 ) <<Self ::IMPLEMENTATION .len ()) | u32::from (self.implementation ()) }) .and_then (Chipset ::try_from) }drivers/gpu/nova-core/regs/macros.rs +1
-1@@ -264,7 +264,7 @@ pub(crate) fn $field(self) -> $res_type { pub(crate) fn [<set_ $field>](mut self, value: $to_type) -> Self { const MASK: u32 = $name::[<$field:upper _MASK>]; const SHIFT: u32 = $name::[<$field:upper _SHIFT>]; -let value = ((valueas u32 ) <<SHIFT ) &MASK ; +let value = (u32::from (value) <<SHIFT ) &MASK ; self.0 = (self.0 & !MASK ) | value; selfrust/bindings/lib.rs +1
-0@@ -25,6 +25,7 @@ )]#[allow(dead_code)] +#[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] #[cfg_attr( CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES , allow(unnecessary_transmutes))] rust/kernel/net/phy.rs +2
-2@@ -142,7 +142,7 @@ pub fn is_autoneg_enabled(&self) -> bool {// SAFETY: The struct invariant ensures that we may access // this field without additional synchronization. let bit_field =unsafe { &(*self.0 .get ())._bitfield_1 }; - bit_field.get (13 ,1 ) == bindings::AUTONEG_ENABLE as u64 + bit_field.get (13 ,1 ) == u64::from (bindings::AUTONEG_ENABLE ) }/// Gets the current auto-negotiation state. @@ -427,7 +427,7 @@ impl<T: Driver> Adapter<T> {// where we hold `phy_device->lock`, so the accessors on // `Device` are okay to call. let dev =unsafe {Device ::from_raw (phydev) }; -T ::match_phy_device (dev)as i32 +T ::match_phy_device (dev).into () }/// # Safety rust/uapi/lib.rs +1
-0@@ -14,6 +14,7 @@#![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::cast_lossless, clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code,
Re: [PATCH v12 5/6] rust: enable `clippy::cast_lossless` lint
In reply to Tamir DubersteinQuoted 20 lines · On Sun, 15 Jun 2025 16:55:09 -0400 Tamir Duberstein <[email protected]> wrote:
Before Rust 1.29.0, Clippy introduced the
cast_losslesslint [1]:Quoted 6 lines
Rust’s
askeyword will perform many kinds of conversions, including silently lossy conversions. Conversion functions such asi32::fromwill only perform lossless conversions. Using the conversion functions prevents conversions from becoming silently lossy if the input types ever change, and makes it clear for people reading the code that the conversion is lossless.While this doesn't eliminate unchecked
asconversions, 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.Suggested-by Benno Lossin <[email protected]>Reviewed-by Benno Lossin <[email protected]>Reviewed-by Boqun Feng <[email protected]>Signed-off-by Tamir Duberstein <[email protected]>
Quoted 9 lines
--- Makefile | 1 + drivers/gpu/drm/drm_panic_qr.rs | 4 ++-- drivers/gpu/nova-core/regs.rs | 2 +- drivers/gpu/nova-core/regs/macros.rs | 2 +- rust/bindings/lib.rs | 1 + rust/kernel/net/phy.rs | 4 ++-- rust/uapi/lib.rs | 1 + 7 files changed, 9 insertions(+), 6 deletions(-)
For PHY part:
PATCH v12 6/6 rust: enable `clippy::ref_as_ptr` lint
In reply to Tamir DubersteinIn Rust 1.78.0, Clippy introduced the ref_as_ptr lint [1]:
Quoted 1 line
Using
ascasts may result in silently changing mutability or type.
While this doesn't eliminate unchecked as conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended.
--- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/configfs.rs | 20 ++++++-------------- rust/kernel/device_id.rs | 2 +- rust/kernel/fs/file.rs | 2 +- rust/kernel/str.rs | 4 ++-- rust/kernel/uaccess.rs | 4 ++-- rust/uapi/lib.rs | 1 + 8 files changed, 15 insertions(+), 20 deletions(-)
Makefile +1 -0
@@ -489,6 +489,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::no_mangle_with_rust_abi \ -Wclippy::ptr_as_ptr \ -Wclippy::ptr_cast_constness \ + -Wclippy::ref_as_ptr \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \
rust/bindings/lib.rs +1 -0
@@ -27,6 +27,7 @@#[allow(dead_code)] #[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] +#[allow(clippy::ref_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] #[cfg_attr( CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES , allow(unnecessary_transmutes))] mod bindings_raw {
rust/kernel/configfs.rs +6 -14
@@ -426,7 +426,7 @@ impl<Parent, Child> GroupOperationsVTable<Parent, Child> };const fn vtable_ptr () -> *const bindings::configfs_group_operations { - &Self ::VTABLE as *const bindings::configfs_group_operations + &Self ::VTABLE } }
@@ -464,7 +464,7 @@ impl<Data> ItemOperationsVTable<Group<Data>, Data> };const fn vtable_ptr () -> *const bindings::configfs_item_operations { - &Self ::VTABLE as *const bindings::configfs_item_operations + &Self ::VTABLE } }
@@ -476,7 +476,7 @@ impl<Data> ItemOperationsVTable<Subsystem<Data>, Data> { };const fn vtable_ptr () -> *const bindings::configfs_item_operations { - &Self ::VTABLE as *const bindings::configfs_item_operations + &Self ::VTABLE } }
@@ -717,11 +717,7 @@ impl<const N: usize, Data> AttributeList<N, Data> {// SAFETY: By function safety requirements, we have exclusive access to // `self` and the reference created below will be exclusive. -unsafe { - (&mut *self.0 .get ())[I ] = (attributeas *const Attribute <ID ,O ,Data >) - .cast_mut () - .cast () - }; +unsafe { (&mut *self.0 .get ())[I ] = core::ptr::from_ref (attribute).cast_mut ().cast () }; } }
@@ -761,9 +757,7 @@ pub const fn new_with_child_ctor<const N: usize, Child>( ct_owner: owner.as_ptr(), ct_group_ops: GroupOperationsVTable::<Data, Child>::vtable_ptr().cast_mut(), ct_item_ops: ItemOperationsVTable::<$tpe, Data>::vtable_ptr().cast_mut(), - ct_attrs: (attributes as *const AttributeList<N, Data>) - .cast_mut() - .cast(), + ct_attrs: core::ptr::from_ref(attributes).cast_mut().cast(), ct_bin_attrs: core::ptr::null_mut(), }), _p: PhantomData,
@@ -780,9 +774,7 @@ pub const fn new<const N: usize>( ct_owner: owner.as_ptr(), ct_group_ops: core::ptr::null_mut(), ct_item_ops: ItemOperationsVTable::<$tpe, Data>::vtable_ptr().cast_mut(), - ct_attrs: (attributes as *const AttributeList<N, Data>) - .cast_mut() - .cast(), + ct_attrs: core::ptr::from_ref(attributes).cast_mut().cast(), ct_bin_attrs: core::ptr::null_mut(), }), _p: PhantomData,
rust/kernel/device_id.rs +1 -1
@@ -136,7 +136,7 @@ impl<T: RawDeviceId, U, const N: usize> IdTable<T, U> for IdArray<T, U, N> {fn as_ptr (&self) -> *const T ::RawType {// This cannot be `self.ids.as_ptr()`, as the return pointer must have correct provenance // to access the sentinel. - (selfas *const Self ).cast () + core::ptr::from_ref (self).cast () }fn id (&self, index:usize ) -> &T ::RawType {
rust/kernel/fs/file.rs +1 -1
@@ -366,7 +366,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 ((selfas *const Self ).cast ()) } +unsafe {LocalFile ::from_raw_file (core::ptr::from_ref (self).cast ()) } } }
rust/kernel/str.rs +2 -2
@@ -29,7 +29,7 @@ pub const fn is_empty(&self) -> bool {#[inline] pub const fn from_bytes (bytes: &[u8 ]) -> &Self {// SAFETY: `BStr` is transparent to `[u8]`. -unsafe { &*(bytesas *const [u8 ]as *const BStr ) } +unsafe { &*(core::ptr::from_ref (bytes)as *const BStr ) } }/// Strip a prefix from `self`. Delegates to [`slice::strip_prefix`].
@@ -290,7 +290,7 @@ pub const fn from_bytes_with_nul(bytes: &[u8]) -> Result<&Self, CStrConvertError#[inline] pub unsafe fn from_bytes_with_nul_unchecked_mut (bytes: &mut [u8 ]) -> &mut CStr {// SAFETY: Properties of `bytes` guaranteed by the safety precondition. -unsafe { &mut *(bytesas *mut [u8 ]as *mut CStr ) } +unsafe { &mut *(core::ptr::from_mut (bytes)as *mut CStr ) } }/// Returns a C pointer to the string.
rust/kernel/uaccess.rs +2 -2
@@ -240,7 +240,7 @@ pub fn read_raw(&mut self, out: &mut [MaybeUninit<u8>]) -> Result {pub fn read_slice (&mut self, out: &mut [u8 ]) ->Result {// SAFETY: The types are compatible and `read_raw` doesn't write uninitialized bytes to // `out`. -let out =unsafe { &mut *(outas *mut [u8 ]as *mut [MaybeUninit <u8 >]) }; +let out =unsafe { &mut *(core::ptr::from_mut (out)as *mut [MaybeUninit <u8 >]) }; self.read_raw (out) }
@@ -355,7 +355,7 @@ pub fn write<T: AsBytes>(&mut self, value: &T) -> Result {let res =unsafe { bindings::_copy_to_user ( self.ptras *mut c_void , - (valueas *const T ).cast ::<c_void >(), + core::ptr::from_ref (value).cast ::<c_void >(), len, ) };
rust/uapi/lib.rs +1 -0
@@ -16,6 +16,7 @@ clippy::all, clippy::cast_lossless, clippy::ptr_as_ptr, + clippy::ref_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs,
Signature · 1 line
2.49.0
Re: [PATCH v12 6/6] rust: enable `clippy::ref_as_ptr` lint
Quoted 4 lines · Tamir Duberstein
rust/kernel/configfs.rs | 20 ++++++-------------- rust/kernel/device_id.rs | 2 +- rust/kernel/fs/file.rs | 2 +-
Andreas, Christian, Danilo, Greg: it would be nice to get Acked-by's for your bits.
(This particular one can be tricky in other cases due to lifetime extension.)
Thanks!
Cheers,
Miguel
Miguel Ojeda
AppliedQuoted 11 lines · Tamir Duberstein
This started with a patch that enabled
clippy::ptr_as_ptr. Benno Lossin suggested I also look intoclippy::ptr_cast_constnessand I discoveredclippy::as_ptr_cast_mut. This series now enables all 3 lints. It also enablesclippy::as_underscorewhich ensures other pointer casts weren't missed.As a later addition,
clippy::cast_losslessandclippy::ref_as_ptrare also enabled.Signed-off-by Tamir Duberstein <[email protected]>
Applied to rust-next -- thanks everyone!
[ Added .cast() for opp. - Miguel ]
[ Changed isize to c_long. - Miguel ]
It would still be nice to get the couple remaining Acked-bys (happy to rebase to apply them), but I feel we are in good shape, and it is a good time to put it into linux-next so that people see the lint before they start applying new code into their branches.
Cheers,
Miguel