From patchwork Wed Apr 16 17:36:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14054326 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F37FA2153C4; Wed, 16 Apr 2025 17:36:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824987; cv=none; b=liu5TpTkmiIdDGUy53EWpdngZiXPLii/eos6hIiOcT+Ez+sBUiaNEdkCNG057VAhYTEPJxaMM6W8RSBvC+zbbk2DUsKb9W7+gmVKd3uYmWduDQjS/Je+bd2kZzqXAplHx0bXV/DrdMiO+18dGZP7QZR0mu8oHzkLl1pp3aiUSec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824987; c=relaxed/simple; bh=I4x8fdtV2ymBXE+I+wmKa9DR7ZQmm5C+JWY3G1Fag1M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eyhGY43TO4qwGk0JmToxG4tgLRXBraLJzIip30+e2snLhNe+fcPKSj+3RjUq1+4dFadx5638QP3TD5rL8eeFLG/VDHCQwTH3G+g1ZU4/WEngIyun7NsmxaFK2tbEgCge66dCK1W6Vn5Evnc3A5GzB3PxrCHtdCS0DNZ8iEB9s/4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fzcy9SA/; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fzcy9SA/" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6e8f06e13a4so10084966d6.0; Wed, 16 Apr 2025 10:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744824984; x=1745429784; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5TOx7GWJKmmI/6FKx4LFn0YeTNpJgD9zOAUQsnEnoRk=; b=fzcy9SA/giXepxOUhDISzSZmMLHT0VTwwJJHl8TDnq155RXTh9CVsesIYTI8v5nWq+ qn7IywC/ltGbMqQvFMzVK0JrTVDCkt8dWSjlxLCuW3L6BLy3n6tbe//XoY80w7dWDfzn VijkNrGkpABrKVvBKPjaM9yACi959GkuaJVsCIurHl31LbHeG1K8zZr5XoKHWwR9GKTb jorWldDSFOvdx0pm160yyK9X0D61MVSz3uUr4WVJlf4oIAL/cDx1k34eqXkh1CRnFxdV 2VQbb/+fh0XkCMOsd5gYHBs4/CROhigK06WyvRRYCM/+/RqQiOFoVGZTSr52qA/dQ/aU AqUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744824984; x=1745429784; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5TOx7GWJKmmI/6FKx4LFn0YeTNpJgD9zOAUQsnEnoRk=; b=wJl/f4fD6nVr9oRXOg1UaaQh6X7qGGGUTapXfzFrmDb0I45rag6MYv0ij3qwVA9ich QyZ6wMTzcQWVurn3ToCyk4OIjVH+r23xskIcC8TYtbJ1UoUufZ9Xsghu9+EnPsgvmDys HEx0GM7573FXLoIclb1742p6sxM4+J97X2gLyeX0V4HBlhrgOXgAgZ+JfVn2XMe6It/h 9uamVleIq/SIK2ij8cvZdLXku/icrG3ND/3CZIlAWUHADyqsjcU0Zg0ZkkNTtRqdSgyc tcL+vdjucwXdtS2sI7BAXN8mWvT/tstEcp43RwV03Rdzc7HgME7mU5fnjNtuw9Bhhe2t iMfg== X-Forwarded-Encrypted: i=1; AJvYcCU77O1qjWhW53qnPu7t6e6aOIh9Rwk2hpc4mPv7PU7jczGiv24qKJFGgWXvdMCNFuHqB2EA4ex7f97F@vger.kernel.org, AJvYcCUiD0NumdRzygn8W29bl0V7cUnbABRuo0kvwB8+MgVcOp03sCcxAO47s0zY07mQ/D5KB4aUyT1URzOSDjdNF7YG@vger.kernel.org, AJvYcCUxhIMbFVAHii5aVsKWq8GqOOjrOFYd9z2mQLkZBN2IZlpQfLJ1W1Ek8lKw9JfSb990KnQoPyRVUblN@vger.kernel.org, AJvYcCVMb3Htlq9J4I7XENcfsdQp1fc+2mqxWhEF+zA6VY+Twfm+MqFW4vRwHrM7e/p0UuaowV6sanhlXvbeNk4=@vger.kernel.org, AJvYcCVirXVhwAe5GGMW5nwuIQpQh+ECMbd2JO2Dd+ERO242OfMASLq5Vbzyr+ZRHhf7JZsQg68RHFr5@vger.kernel.org, AJvYcCWWL47F285593qmmLHYhydgMDjgmt9WfEX56uJ1Tqkn0OSyFP2zS6uEZQl3T9PVVd6v18+rGfiK7XthEJCv@vger.kernel.org, AJvYcCXGFJFBfDSrNfvOuCXHDcI9cF3blV9Xqr2q3K05zrqn8zfI1KA2QYeCkwAU1bZtMz7ExF6DCzZYVLWeiFkJMak=@vger.kernel.org X-Gm-Message-State: AOJu0Yzeja7iCGIw2fnR7mXaRD5Pv4taxxfdCVYyezNSJXErVE4uM1Fq BJCi9DRAwsuu+FgEl9KJE526oCcWnEhu3HZaWEsFcAcNHPJeX4hA X-Gm-Gg: ASbGncunDrqbmgH6k8OkoLbmJihVmgCuJ0SMuf/H6R7hGbvcpIHd8wpvXULjJfISfuh CKzKDGe7QTIa2U7wF7axfwXoFyR9Ri4Jm+Cpj1Vcpuu5rk7wwGbowZA3zDpObVLq/zsIeg0NTyG WO8Bjsb2wkrys+18fQMLrKCH7bEHq8GGJzTvUlCqiDDflfbA8GKC/kiMmRY4zs0eXeQUocbjL2q ZJcwrQHpvt/F6znrOrRincldMGrQLGNiiq0wdASF5Lh5bpiQM9ZLwGgW9go250cImdb78M7P8Ky MvqJYweJHnBTVGrBJqNDAuwe6IJSYCbkFz69/20g31IunFJGd+xqyM6G9CohRgCmapZRcosSg6o fxZhv926MHsZfnXi0KrEXJj+fiUiRFgpQFYsx6Zj5zcKU X-Google-Smtp-Source: AGHT+IHJzzNylGQPDvJbjG/Mms3QfsnMlDYYat3HUnSiBNzr35o97CrKOaJrZdwL2GYrZeVBL4Wxyw== X-Received: by 2002:a05:6214:1d0a:b0:6ea:eeb6:c82b with SMTP id 6a1803df08f44-6f2b9955501mr5949146d6.2.1744824983542; Wed, 16 Apr 2025 10:36:23 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:a61d]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f0dea07c50sm118289886d6.77.2025.04.16.10.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 10:36:23 -0700 (PDT) From: Tamir Duberstein Date: Wed, 16 Apr 2025 13:36:05 -0400 Subject: [PATCH v9 1/6] rust: enable `clippy::ptr_as_ptr` lint Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ptr-as-ptr-v9-1-18ec29b1b1f3@gmail.com> References: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> In-Reply-To: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Nicolas Schier Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.51.0, Clippy introduced the `ptr_as_ptr` lint [1]: > Though `as` casts between raw pointers are not terrible, > `pointer::cast` is safer because it cannot accidentally change the > pointer's mutability, nor cast the pointer to other types like `usize`. There are a few classes of changes required: - Modules generated by bindgen are marked `#[allow(clippy::ptr_as_ptr)]`. - Inferred casts (` as _`) are replaced with `.cast()`. - Ascribed casts (` as *... T`) are replaced with `.cast::()`. - Multistep casts from references (` as *const _ as *const T`) are replaced with `core::ptr::from_ref(&x).cast()` with or without `::` according to the previous rules. The `core::ptr::from_ref` call is required because `(x as *const _).cast::()` results in inference failure. - Native literal C strings are replaced with `c_str!().as_char_ptr()`. - `*mut *mut T as _` is replaced with `let *mut *const T = (*mut *mut T)`.cast();` since pointer to pointer can be confusing. Apply these changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_as_ptr [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein Reviewed-by: Boqun Feng --- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/alloc/allocator_test.rs | 2 +- rust/kernel/alloc/kvec.rs | 4 ++-- 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 | 10 +++++----- rust/uapi/lib.rs | 1 + 22 files changed, 40 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 38689a0c3605..5d2931344490 100644 --- a/Makefile +++ b/Makefile @@ -480,6 +480,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::needless_continue \ -Aclippy::needless_lifetimes \ -Wclippy::no_mangle_with_rust_abi \ + -Wclippy::ptr_as_ptr \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \ diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index 014af0d1fc70..0486a32ed314 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -25,6 +25,7 @@ )] #[allow(dead_code)] +#[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] mod bindings_raw { // Manual definition for blocklisted types. diff --git a/rust/kernel/alloc/allocator_test.rs b/rust/kernel/alloc/allocator_test.rs index c37d4c0c64e9..8017aa9d5213 100644 --- a/rust/kernel/alloc/allocator_test.rs +++ b/rust/kernel/alloc/allocator_test.rs @@ -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::(); let dst = NonNull::new(dst).ok_or(AllocError)?; if flags.contains(__GFP_ZERO) { diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs index ae9d072741ce..c12844764671 100644 --- a/rust/kernel/alloc/kvec.rs +++ b/rust/kernel/alloc/kvec.rs @@ -262,7 +262,7 @@ pub fn spare_capacity_mut(&mut self) -> &mut [MaybeUninit] { // - `self.len` is smaller than `self.capacity` and hence, the resulting pointer is // guaranteed to be part of the same allocated object. // - `self.len` can not overflow `isize`. - let ptr = unsafe { self.as_mut_ptr().add(self.len) } as *mut MaybeUninit; + let ptr = unsafe { self.as_mut_ptr().add(self.len) }.cast::>(); // SAFETY: The memory between `self.len` and `self.capacity` is guaranteed to be allocated // and valid, but uninitialized. @@ -554,7 +554,7 @@ fn drop(&mut self) { // - `ptr` points to memory with at least a size of `size_of::() * len`, // - all elements within `b` are initialized values of `T`, // - `len` does not exceed `isize::MAX`. - unsafe { Vec::from_raw_parts(ptr as _, len, len) } + unsafe { Vec::from_raw_parts(ptr.cast(), len, len) } } } diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 21b343a1dc4d..9fd7da4865a8 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -174,10 +174,10 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) { #[cfg(CONFIG_PRINTK)] unsafe { bindings::_dev_printk( - klevel as *const _ as *const crate::ffi::c_char, + klevel.as_ptr().cast::(), self.as_raw(), c_str!("%pA").as_char_ptr(), - &msg as *const _ as *const crate::ffi::c_void, + core::ptr::from_ref(&msg).cast::(), ) }; } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index ddb1ce4a78d9..9e649d70716a 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -157,7 +157,7 @@ fn remove_action(this: &Arc) { #[allow(clippy::missing_safety_doc)] unsafe extern "C" fn devres_callback(ptr: *mut kernel::ffi::c_void) { - let ptr = ptr as *mut DevresInner; + let ptr = ptr.cast::>(); // Devres owned this memory; now that we received the callback, drop the `Arc` and hence the // reference. // SAFETY: Safe, since we leaked an `Arc` reference to devm_add_action() in diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index 8cdc76043ee7..f395d1a6fe48 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret as *mut T, + cpu_addr: ret.cast(), dma_attrs, }) } @@ -293,7 +293,7 @@ fn drop(&mut self) { bindings::dma_free_attrs( self.dev.as_raw(), size, - self.cpu_addr as _, + self.cpu_addr.cast(), self.dma_handle, self.dma_attrs.as_raw(), ) diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 3dee3139fcd4..afcb00cb6a75 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { /// Returns the error encoded as a pointer. pub fn to_ptr(self) -> *mut T { // SAFETY: `self.0` is a valid error due to its invariant. - unsafe { bindings::ERR_PTR(self.0.get() as _) as *mut _ } + unsafe { bindings::ERR_PTR(self.0.get() as _).cast() } } /// Returns a string representing the error, if one exists. diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index f04b058b09b2..d96b5724b4a3 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -58,10 +58,11 @@ impl Firmware { fn request_internal(name: &CStr, dev: &Device, func: FwFunc) -> Result { let mut fw: *mut bindings::firmware = core::ptr::null_mut(); let pfw: *mut *mut bindings::firmware = &mut fw; + let pfw: *mut *const bindings::firmware = pfw.cast(); // SAFETY: `pfw` is a valid pointer to a NULL initialized `bindings::firmware` pointer. // `name` and `dev` are valid as by their type invariants. - let ret = unsafe { func.0(pfw as _, name.as_char_ptr(), dev.as_raw()) }; + let ret = unsafe { func.0(pfw, name.as_char_ptr(), dev.as_raw()) }; if ret != 0 { return Err(Error::from_errno(ret)); } diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs index 13a0e44cd1aa..791f493ada10 100644 --- a/rust/kernel/fs/file.rs +++ b/rust/kernel/fs/file.rs @@ -364,7 +364,7 @@ fn deref(&self) -> &LocalFile { // // By the type invariants, there are no `fdget_pos` calls that did not take the // `f_pos_lock` mutex. - unsafe { LocalFile::from_raw_file(self as *const File as *const bindings::file) } + unsafe { LocalFile::from_raw_file((self as *const Self).cast()) } } } diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 1604fb6a5b1b..3afea8b96e04 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -8,6 +8,9 @@ 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. @@ -18,8 +21,8 @@ pub fn err(args: fmt::Arguments<'_>) { #[cfg(CONFIG_PRINTK)] unsafe { bindings::_printk( - c"\x013%pA".as_ptr() as _, - &args as *const _ as *const c_void, + c_str!("\x013%pA").as_char_ptr(), + core::ptr::from_ref(&args).cast::(), ); } } @@ -34,8 +37,8 @@ pub fn info(args: fmt::Arguments<'_>) { #[cfg(CONFIG_PRINTK)] unsafe { bindings::_printk( - c"\x016%pA".as_ptr() as _, - &args as *const _ as *const c_void, + c_str!("\x016%pA").as_char_ptr(), + core::ptr::from_ref(&args).cast::(), ); } } diff --git a/rust/kernel/list/impl_list_item_mod.rs b/rust/kernel/list/impl_list_item_mod.rs index a0438537cee1..1f9498c1458f 100644 --- a/rust/kernel/list/impl_list_item_mod.rs +++ b/rust/kernel/list/impl_list_item_mod.rs @@ -34,7 +34,7 @@ pub unsafe trait HasListLinks { unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut ListLinks { // SAFETY: The caller promises that the pointer is valid. The implementer promises that the // `OFFSET` constant is correct. - unsafe { (ptr as *mut u8).add(Self::OFFSET) as *mut ListLinks } + unsafe { ptr.cast::().add(Self::OFFSET).cast() } } } diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index c97d6d470b28..391b4f070b1c 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -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), } diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 4917cb34e2fe..6c0bd343c61b 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -70,7 +70,9 @@ extern "C" fn probe_callback(pdev: *mut bindings::platform_device) -> kernel::ff // Let the `struct platform_device` own a reference of the driver's private data. // SAFETY: By the type invariant `pdev.as_raw` returns a valid pointer to a // `struct platform_device`. - unsafe { bindings::platform_set_drvdata(pdev.as_raw(), data.into_foreign() as _) }; + unsafe { + bindings::platform_set_drvdata(pdev.as_raw(), data.into_foreign().cast()) + }; } Err(err) => return Error::to_errno(err), } diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs index cf4714242e14..13a894abe146 100644 --- a/rust/kernel/print.rs +++ b/rust/kernel/print.rs @@ -25,7 +25,7 @@ // SAFETY: The C contract guarantees that `buf` is valid if it's less than `end`. let mut w = unsafe { RawFormatter::from_ptrs(buf.cast(), end.cast()) }; // SAFETY: TODO. - let _ = w.write_fmt(unsafe { *(ptr as *const fmt::Arguments<'_>) }); + let _ = w.write_fmt(unsafe { *ptr.cast::>() }); w.pos().cast() } @@ -109,7 +109,7 @@ pub unsafe fn call_printk( bindings::_printk( format_string.as_ptr(), module_name.as_ptr(), - &args as *const _ as *const c_void, + core::ptr::from_ref(&args).cast::(), ); } } @@ -129,7 +129,7 @@ pub fn call_printk_cont(args: fmt::Arguments<'_>) { unsafe { bindings::_printk( format_strings::CONT.as_ptr(), - &args as *const _ as *const c_void, + core::ptr::from_ref(&args).cast::(), ); } } diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 7a9403eb6e5b..8f199b1a3bb1 100644 --- a/rust/kernel/seq_file.rs +++ b/rust/kernel/seq_file.rs @@ -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(), - &args as *const _ as *const crate::ffi::c_void, + core::ptr::from_ref(&args).cast::(), ); } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 878111cb77bc..02863c40c21b 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -237,7 +237,7 @@ pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Self { // to a `NUL`-terminated C string. let len = unsafe { bindings::strlen(ptr) } + 1; // SAFETY: Lifetime guaranteed by the safety precondition. - let bytes = unsafe { core::slice::from_raw_parts(ptr as _, len) }; + let bytes = unsafe { core::slice::from_raw_parts(ptr.cast(), len) }; // SAFETY: As `len` is returned by `strlen`, `bytes` does not contain interior `NUL`. // As we have added 1 to `len`, the last byte is known to be `NUL`. unsafe { Self::from_bytes_with_nul_unchecked(bytes) } diff --git a/rust/kernel/sync/poll.rs b/rust/kernel/sync/poll.rs index d7e6e59e124b..339ab6097be7 100644 --- a/rust/kernel/sync/poll.rs +++ b/rust/kernel/sync/poll.rs @@ -73,7 +73,7 @@ pub fn register_wait(&mut self, file: &File, cv: &PollCondVar) { // be destroyed, the destructor must run. That destructor first removes all waiters, // and then waits for an rcu grace period. Therefore, `cv.wait_queue_head` is valid for // long enough. - unsafe { qproc(file.as_ptr() as _, cv.wait_queue_head.get(), self.0.get()) }; + unsafe { qproc(file.as_ptr().cast(), cv.wait_queue_head.get(), self.0.get()) }; } } } diff --git a/rust/kernel/time/hrtimer/pin.rs b/rust/kernel/time/hrtimer/pin.rs index f760db265c7b..47154f3bd422 100644 --- a/rust/kernel/time/hrtimer/pin.rs +++ b/rust/kernel/time/hrtimer/pin.rs @@ -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 = ptr as *mut HrTimer; + let timer_ptr = ptr.cast::>(); // SAFETY: By the safety requirement of this function, `timer_ptr` // points to a `HrTimer` contained in an `T`. diff --git a/rust/kernel/time/hrtimer/pin_mut.rs b/rust/kernel/time/hrtimer/pin_mut.rs index 90c0351d62e4..e29ff8837206 100644 --- a/rust/kernel/time/hrtimer/pin_mut.rs +++ b/rust/kernel/time/hrtimer/pin_mut.rs @@ -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 = ptr as *mut HrTimer; + let timer_ptr = ptr.cast::>(); // SAFETY: By the safety requirement of this function, `timer_ptr` // points to a `HrTimer` contained in an `T`. diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index f98bd02b838f..223fe5e8ed82 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -170,7 +170,7 @@ impl Queue { pub unsafe fn from_raw<'a>(ptr: *const bindings::workqueue_struct) -> &'a Queue { // SAFETY: The `Queue` type is `#[repr(transparent)]`, so the pointer cast is valid. The // caller promises that the pointer is not dangling. - unsafe { &*(ptr as *const Queue) } + unsafe { &*ptr.cast::() } } /// Enqueues a work item. @@ -457,7 +457,7 @@ fn get_work_offset(&self) -> usize { #[inline] unsafe fn raw_get_work(ptr: *mut Self) -> *mut Work { // SAFETY: The caller promises that the pointer is valid. - unsafe { (ptr as *mut u8).add(Self::OFFSET) as *mut Work } + unsafe { ptr.cast::().add(Self::OFFSET).cast::>() } } /// Returns a pointer to the struct containing the [`Work`] field. @@ -472,7 +472,7 @@ unsafe fn work_container_of(ptr: *mut Work) -> *mut Self { // SAFETY: The caller promises that the pointer points at a field of the right type in the // right kind of struct. - unsafe { (ptr as *mut u8).sub(Self::OFFSET) as *mut Self } + unsafe { ptr.cast::().sub(Self::OFFSET).cast::() } } } @@ -538,7 +538,7 @@ unsafe impl WorkItemPointer for Arc { unsafe extern "C" fn run(ptr: *mut bindings::work_struct) { // The `__enqueue` method always uses a `work_struct` stored in a `Work`. - let ptr = ptr as *mut Work; + let ptr = ptr.cast::>(); // SAFETY: This computes the pointer that `__enqueue` got from `Arc::into_raw`. let ptr = unsafe { T::work_container_of(ptr) }; // SAFETY: This pointer comes from `Arc::into_raw` and we've been given back ownership. @@ -591,7 +591,7 @@ unsafe impl WorkItemPointer for Pin> { unsafe extern "C" fn run(ptr: *mut bindings::work_struct) { // The `__enqueue` method always uses a `work_struct` stored in a `Work`. - let ptr = ptr as *mut Work; + let ptr = ptr.cast::>(); // SAFETY: This computes the pointer that `__enqueue` got from `Arc::into_raw`. let ptr = unsafe { T::work_container_of(ptr) }; // SAFETY: This pointer comes from `Arc::into_raw` and we've been given back ownership. diff --git a/rust/uapi/lib.rs b/rust/uapi/lib.rs index 13495910271f..f03b7aead35a 100644 --- a/rust/uapi/lib.rs +++ b/rust/uapi/lib.rs @@ -14,6 +14,7 @@ #![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs, From patchwork Wed Apr 16 17:36:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14054327 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B07B6219A71; Wed, 16 Apr 2025 17:36:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824988; cv=none; b=OD8qgFAVDfaFpC5eDZNe6O+m5bHcesv2cs3lEYYje2UzZJE3qdIByWaDzZ86q7vp93Na3rAyGffRwB255B0g9OAY4ye/fnfxxrC92sFn1dftPn/7IPo8JpK52E2GJqRor1SE/NcdrP89JAXxwyHyQUCceR8ND7aTAiMsYygX784= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824988; c=relaxed/simple; bh=BrBKHbaTMC9r3OZ4ZcvFVn9kP3njL2115M5/9TpT85M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UC6ZPeBRZ3Qy4RUo8eVof+75RbPBiETBNo46KTpC/NsS6QBfu1AnqiykNjKebzXCN8Vmv6HB5Rh9Mx3tk4t5WU9yoperD6BnPxLxvuIEs+H17QgFXGYm7EzrTf3r87pqKqI57k4LflLBLhmnyBPB5Jg3T8ECU6RNIgcE9zowAt0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EOr2qDez; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EOr2qDez" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-6ed16ce246bso39297476d6.3; Wed, 16 Apr 2025 10:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744824985; x=1745429785; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dJDBBJuQk0zO1YYyCYhFBx0Rtrb+rmDlBpZnK9sGyyk=; b=EOr2qDezbMfDi0q0FDT9L5NG1lcxHTRWoNNO0UEmDwj+JOj3IUXyEa5vtfNjquPh9G RL2/LdCRS0heLpyEyiHPHFLr0aFbjZw0+QifSTpKz+1KPc4d30UgsaH7/y8hnt32Ddaf 9NB4t31jxaHJOIrubOId1lBgRrtQIDdFoHXBdQk2qWqIRhVEdu+G/rMSyW4qthLJmfoG +ywEGzqAffk+U6tEI3DDxWkRbQeZQ28tytJCp6Tg0YTpGSSc893K/Sz9CCBPMfTcQQur WhOQzvGeSbUsP/VpsDsMNcp/dTEzQrTKThcK2kdJguzBYnxlym039q8PakU8sjqFkR1x UKtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744824985; x=1745429785; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dJDBBJuQk0zO1YYyCYhFBx0Rtrb+rmDlBpZnK9sGyyk=; b=JKjknXTT3A/5g4mrN+z00/0JK7O/5lfnxyzmlGYR7246isvD3KJXKwS04HvC+ghTID AADA1U2bvs6BxIvmcx+89uybmAEuQcJYne+DFIAY3W2psltA1BoDdmQkqG3Zknde44Uj WynSa1WoiFvtdcdp7THNR8OJ0nq5RcDdANp6n/+Epp3hYYgS0X8tmF3B0URz44uMGKrp oDcXxuNMObmqNeRcXqKRiA4sNZBuBiyCLXA354a669HlUSCXpjpAaShIynyHEUAa+L3G HOgkB+01VwjeMhjIFKUao8RlcU2MwAo22cr4kIMNRHeYkcX6SlBAg1GSOnx+kXtcrDyr upJw== X-Forwarded-Encrypted: i=1; AJvYcCUP+XrwQAMQLO3wAL92hITmohn5f4iGh6jP8XwKLt0odhTUWzrXlumHj2QUTWWSyyl7VmTH3hnQVGhe@vger.kernel.org, AJvYcCV2xlVwTMXQmNtjx6Ofu2LUcjRAAsCZY/JKwJ3hkWXfec7Lpdw8X5J2sZc7yNJgps3JRY38Olw6Gbg1chzyW0o=@vger.kernel.org, AJvYcCVNBsNiBkKmRBiZixDQEJbf3fxlQPa6ZeHXw0Kq8bLe/zLb3yvSSBsx4NVfeRCHdt5vU601/t+Z@vger.kernel.org, AJvYcCW8p8n3U/C5kMpPSk/1MpaJpoIvg1I59vxOJ+6yhDkuoxCTHNlIztm93TVccu3fe9iZkoWwFr0qrcFLVghy@vger.kernel.org, AJvYcCW9wnEbLuO7JNQA0Nm9lxAWV842gNFT451Y45YLQ69YhKA7iUvmJ/SpePBj2RGGdnllGUKzwJ0X07+L@vger.kernel.org, AJvYcCXPzQglR8xyb6q+RkztFE0f0rH0zGPspKf9h48BlvHTkrtJEM0WXZtKDU0ujkZT4sjBBTyOAgtozbPFbBEMW1CW@vger.kernel.org, AJvYcCXYQmlEaNcnStCXmru3lxqy3jjM8aIFxDODg4fe6tcx0r+fLg2YQE0xP9LKDB7lITJEMAtSAhdz3IEu+ZI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+ZiuDXJAyhfrJI8jbUhzSWI5uevipf+WAMihnyyUOZLLpybqC ksYQw8RLxgK+zfVHpfDC6TX4T7jdnvEp7JZP2ITGMYThqLbDIVX6 X-Gm-Gg: ASbGncuv+FiMxROjYK2jr966ij5SCX9RzeLHhOmwozMaM7IsO+QFvyCpMJXZ5dRnEf4 tGp2QV54hHdmYlfeZH5tSWu/kF4S1hcwtlVMMO41BOwPOfMf9Uf8T4ppf5Ei7NyaG2txntOnOvj daGW5Anja2OSLBHGLPEBgD3CpCqne/+4EJ7KCv1GBLUooAqSC2kV7MogIhprw+XsCtD0bv8QcwL diustmT0BVWat4JuI0H5ae17CaD9v9FefyycwSpdGpPWiuC4MXT57BTiS02vnbwsBbV3a8bdu/z aQFfT4DgJ8YbuFm/ximsqng5Aj9UF/W/XC5f2HrOpByXdVtYFXMSFY6CviwJWypPzKYaA1LUUG1 v85wnUeLjHwQzDbMJoOZ/q61s6tjjj5k9KH6Oajtats/E X-Google-Smtp-Source: AGHT+IGvStqMejrtJadrdvE+zWRyHrQ23Hn7yDYS1rshWoBmONfgRKt3F6tOokW8CHrD7/YmbgoA2w== X-Received: by 2002:a05:6214:1cce:b0:6e4:4288:61a3 with SMTP id 6a1803df08f44-6f2b2f30abfmr36229256d6.18.1744824985307; Wed, 16 Apr 2025 10:36:25 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:a61d]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f0dea07c50sm118289886d6.77.2025.04.16.10.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 10:36:24 -0700 (PDT) From: Tamir Duberstein Date: Wed, 16 Apr 2025 13:36:06 -0400 Subject: [PATCH v9 2/6] rust: enable `clippy::ptr_cast_constness` lint Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ptr-as-ptr-v9-2-18ec29b1b1f3@gmail.com> References: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> In-Reply-To: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Nicolas Schier Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.72.0, Clippy introduced the `ptr_cast_constness` lint [1]: > Though `as` casts between raw pointers are not terrible, > `pointer::cast_mut` and `pointer::cast_const` are safer because they > cannot accidentally cast the pointer to another type. There are only 2 affected sites: - `*mut T as *const U as *mut U` becomes `(*mut T).cast()` - `&self as *const Self as *mut Self` becomes `core::ptr::from_ref(self).cast_mut()`. Apply these changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_cast_constness [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/kernel/block/mq/request.rs | 4 ++-- rust/kernel/dma.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5d2931344490..7b85b2a8d371 100644 --- a/Makefile +++ b/Makefile @@ -481,6 +481,7 @@ export rust_common_flags := --edition=2021 \ -Aclippy::needless_lifetimes \ -Wclippy::no_mangle_with_rust_abi \ -Wclippy::ptr_as_ptr \ + -Wclippy::ptr_cast_constness \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \ diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/request.rs index 4a5b7ec914ef..af5c9ac94f36 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -69,7 +69,7 @@ pub(crate) unsafe fn aref_from_raw(ptr: *mut bindings::request) -> ARef { // INVARIANT: By the safety requirements of this function, invariants are upheld. // SAFETY: By the safety requirement of this function, we own a // reference count that we can pass to `ARef`. - unsafe { ARef::from_raw(NonNull::new_unchecked(ptr as *const Self as *mut Self)) } + unsafe { ARef::from_raw(NonNull::new_unchecked(ptr.cast())) } } /// Notify the block layer that a request is going to be processed now. @@ -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(self as *const Self as *mut Self).as_ref() } + unsafe { Self::wrapper_ptr(core::ptr::from_ref(self).cast_mut()).as_ref() } } } diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index f395d1a6fe48..43ecf3c2e860 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret.cast(), + cpu_addr: ret.cast::(), dma_attrs, }) } From patchwork Wed Apr 16 17:36:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14054328 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 573D621ADD6; Wed, 16 Apr 2025 17:36:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824989; cv=none; b=SVqM06xXewYR/V1cKeqA/gu0L2qTtyy1XsGWUK4SBwBHNIz8EfRixpMQrgbfQ6JCXHTgT9rQ0tFX6jTupxg5RfxaMqyV/MmxrQy7uPkMs6onCjIhtWCm07IV8MvVNQure1Hh1oYdbTSZKmUUAM+JMu9e2Qgp94nfa2LK1wYzFlc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824989; c=relaxed/simple; bh=aDDrOps01d2tlLzt3LaJGP74NrXJiZ8HlX3eJ61yYi0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Arj9baLtT2ohxYgT650uTlpltDZAaMJ1b//ZmD8/0LrEAaV/bBFCONtWTaPaQ20X4uyyjliyn5GnnSV1qUEdaXzs2g/HM4nZcBKRKMC7sqrioNoBeYlyRypy1ilitZ2oWkynfZgRshC17esDRn9rwhWotsijxdTJoqh5kiU7/Sc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=E48E4M32; arc=none smtp.client-ip=209.85.219.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="E48E4M32" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6ecfc7ed0c1so57335436d6.3; Wed, 16 Apr 2025 10:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744824987; x=1745429787; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sORjvcO0tUIMjXvZbPyesA3RS3F2BYfcBEs3dz3VH8Y=; b=E48E4M32ZZ/xO6iQKzMBgbfOu/4WMUJU9vNG5V1t2luUp/I2/HpnfzOI+mpiGt7wcn CvoLexNYXpJXL/ZP/jJ+J+AgU/UK/XCMxgfjxqbXZlOWBCIbcnetKx7dC18hR+Bbq6hp YzWpUzijOsYSr1Up1Itv8PrMSm1W69SzA3HV67a40uFdcEWbyg/dAjIaYY8jp5Xcrtau +3s9eHju1pI8gMMRbaACbKefrP9SYixZeLzPb9ajYbXfR4y6ENIB+Oq/RY1taHGLxd1z az+4E5E7kC7LA/7MJzKTEroKG4tfyO5/Kqg2N+gRuN87qBNal+nj4nGvBAOz5OUn7aDE /e7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744824987; x=1745429787; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sORjvcO0tUIMjXvZbPyesA3RS3F2BYfcBEs3dz3VH8Y=; b=B0dwqvfpafVnvdGpQpO9O38fA0BUMTkldaGvlxhvNqz4z4aFk6mINFp9pttlgl9OTW jzNBYpOsfd4D/Kw/k0MXeqZwGYbn/PIvL2rem8X/bxV6/huqFg8+mafGaKZdm6e/gJgL SrfTztWj+RvQ9iirzzTCaebTgzpohd4F6G77SfMVg9sfhmWGf6ieSL2XzAyGu8TQzNlU AOoSi0S1RjWleU2UIO/EUw5FN9VhE0ul+RfFOfh4WtLdmOFQ8b+BxiucItf9Ej8tvK7b b1qgEnvVdNqHowRaMU2BBUVHTPnWKcR1rBRAStXLgxqiUyaY/ezQq9afg2s2G8S5yE1I NXlA== X-Forwarded-Encrypted: i=1; AJvYcCWabETnV+kYKHiXE5pRo6O3nAoVZTo8QUZyXc9v3OhNpUKDDVuMzB+5Xrd0Ort4/hfhKrxgWwQq5BB/+Yo=@vger.kernel.org, AJvYcCWnXT+J2buVz3R8bZnJneXLAZlKb7Nsg/S82iNyRsKQacT1ZMdSLg7/Q/KeswjkBWh2OopBmqEx@vger.kernel.org, AJvYcCWrNXOVlgVDJle0gy7ubsVfreoJuBDusw6UK8uOrKm5T91jufOO2RfPFaYUxpgJ51F4zUrHRSyMx4qs@vger.kernel.org, AJvYcCXZ4SLOHONrNijoYIjk3DHEXHnyeiQecN3x6DBPr9eexumGxO24a/HvYiS5CMqKR1DUJOVaMfQ+A0T1j9vPdp4=@vger.kernel.org, AJvYcCXe3jWbzWPJrg8HHdDom7p5NnpHnks5OT3yWPsVg+kl6ijDZqgMWjP+MqCapQlVESDkDnKEXBrTJU+C@vger.kernel.org, AJvYcCXhmy39bYrzGKk4CIIkTLccTH99T4VilrrlMTCAXJ79YRtHKZGvOUZzYVH5muySqlTJSr6agNeyQzGsY7AJtoMn@vger.kernel.org, AJvYcCXkZIZaXtxmqkqTB6o5tdzI7P+TxDXd/jrIBisM/Yg/Z46CGbWRkCNFHqCXATgP1gKnOf4fkywgAnUdsTms@vger.kernel.org X-Gm-Message-State: AOJu0YzRlMiY2mnPG7UKu/yLhZe6e7mL6Xi4jv1yjV0HFVQopco8YWZH jWhqbmb0yO5KVOHiiILrQaqGg93HHxsGGWZp/7hMNXJD+8+42Ict X-Gm-Gg: ASbGncumdBan4OpaeVdntPPXQM9mQaaVENTjrRfYSyBgue1LXHipY78FU+5j0QEgxkq 6NChNadSShwWrY4t+a1zErO2yiaNPVbv6giSmZYKLbz2+yEBtp3p8FAT+wPUXxwlDkp2A0LVcW+ JkgCytDfoXhqFbSOLA5LmMRN4k+Eb/UIbsAYFDijCF5BzUbi5OzH2wqP+1f40kEnewMXA8ijDGe OCnaWpvkTlMuNbnE58nDKMFrFvIEQrlmkqY04XUU3Grr8GelAKw2nvehMUgxLKD/ECNIx+i4vvD R8J1e1WyemIle4O/urzk4F9WacVP1/9BFTWwsdPdhAhIgcDxkfB5aSNrW1sG4byeP0uanWsYfnp G3rYB2NxmCnFaZTGIXc0qJn6hg1w3wnxG1mGP1lVfclHw X-Google-Smtp-Source: AGHT+IEdGY2wFQqajLYK8mKt0U3F/fNAP2mW/+4VwbP2os6RpAAcUYU2SqjB20jtKZ0BY8vcuLVuMA== X-Received: by 2002:a05:6214:3008:b0:6e6:61f1:458a with SMTP id 6a1803df08f44-6f2b2f429a0mr34380666d6.14.1744824986976; Wed, 16 Apr 2025 10:36:26 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:a61d]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f0dea07c50sm118289886d6.77.2025.04.16.10.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 10:36:26 -0700 (PDT) From: Tamir Duberstein Date: Wed, 16 Apr 2025 13:36:07 -0400 Subject: [PATCH v9 3/6] rust: enable `clippy::as_ptr_cast_mut` lint Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ptr-as-ptr-v9-3-18ec29b1b1f3@gmail.com> References: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> In-Reply-To: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Nicolas Schier Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.66.0, Clippy introduced the `as_ptr_cast_mut` lint [1]: > Since `as_ptr` takes a `&self`, the pointer won’t have write > permissions unless interior mutability is used, making it unlikely > that having it as a mutable pointer is correct. There is only one affected callsite, and the change amounts to replacing `as _` with `.cast_mut().cast()`. This doesn't change the semantics, but is more descriptive of what's going on. Apply this change and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#as_ptr_cast_mut [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein Reviewed-by: Boqun Feng --- Makefile | 1 + rust/kernel/devres.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7b85b2a8d371..04a5246171f9 100644 --- a/Makefile +++ b/Makefile @@ -474,6 +474,7 @@ export rust_common_flags := --edition=2021 \ -Wrust_2018_idioms \ -Wunreachable_pub \ -Wclippy::all \ + -Wclippy::as_ptr_cast_mut \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \ diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 9e649d70716a..f7e8f5f53622 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -143,7 +143,7 @@ fn remove_action(this: &Arc) { bindings::devm_remove_action_nowarn( this.dev.as_raw(), Some(this.callback), - this.as_ptr() as _, + this.as_ptr().cast_mut().cast(), ) }; From patchwork Wed Apr 16 17:36:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14054329 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4206122155B; Wed, 16 Apr 2025 17:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824992; cv=none; b=bQF4nswcDGcti1OlP2Nc+gKPRjr54j6MMVlHv9RmNvyAjlYVJJyuAfRXBwvFZ45rjYR1N0Qcu6hjMeF0zjRJNAEdtkx+ffZaXfgwz0aKGfX/jDWbtrE/eelVb+4IYVKzOQqt1JJrbS5RCfnjQr5GIuBB6UhzJtO2lzfsu3NB1GY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824992; c=relaxed/simple; bh=ihemSaj72N8gInNz4BOWhIrCAjjufD53rTjyqiMKttY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ETdS6i3o1JkHJLdm13dQVzigRPSkTgktcyjDhSfCkKQsdbpN11POk2mswMqbVX44IRBFWnJUCKwVQLTDUMP3FH9bk4vf8tAAuDp0XKa7r8jK+vYWKSrypO99iWAd9cp/xCnHk2ZXxEXPfTqfytLDJ9LPf+wxqPPhjwwm3t5zbkA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B7w0GQRa; arc=none smtp.client-ip=209.85.219.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B7w0GQRa" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6eaf1b6ce9aso75957016d6.2; Wed, 16 Apr 2025 10:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744824989; x=1745429789; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PTMp91jc5/i2ox7E4srdp1ckIQaYPFYMzEqm4uDnACg=; b=B7w0GQRaKdZT5ZkFIACqG5Lx0gf/OMdL++map93w4VVTZW6Pyp8/6vgazpEUHOGz9P bFHHvWK4aFa3JdHSit2TD5l0sGKRkQJM4dqTMn+saaiBBQbyNxbAvhEzIWbBVmS+r73R PKyW0F3XX0pI/lMq1DBXuhi793lRmXCVX+wObebNnqqPnz+B1T8PS9YUeTvuenPfv2kV KE3ClutSAUdd3JooKvzojfQ118ceXwjapgm4Xoa6LBV6ysus3LpUMUXC9/D5Tcdbuy3C yEh5M6Ddq3Q3x6XFQPU/+/c+pndf+nElnH3OlhLczryZr4D2W9qRCcuDIx6c81Qb9XYU JFoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744824989; x=1745429789; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PTMp91jc5/i2ox7E4srdp1ckIQaYPFYMzEqm4uDnACg=; b=sDt1RVlRwZlYsKZGBxCZJTEzFUMwTnL1w4buP7sfYhahECtUG36ivQNVSWiD+PjxEK AYFvTl25X2G0aMHqGc4Hll66RhxN+3cyLtrzrIgYfJayVgosxTlTYGNyuLzuM8h16MQV khwbGWKCs7nqX2mbFD/vKKY2uAWnrq9GbHNgSrDhDsQ6bJuxPThrEAAiwFWy2X9gb/Qo 9U9bPQ9BXqcnkKHuZEY91ETKo6ptsI1fxCGKTijz7ajYqi9bYktVxiyjallAuPpFlo7g 1XAaSsyh6lZg0AYRYGX6U2h98NlkLTVAI0FlPTfapRssuTP5QlBhFhweG9j0tScnLow8 D2Mg== X-Forwarded-Encrypted: i=1; AJvYcCU3K94O8NSIPkI/2OhHyLb7bPtnu5wnWAMfpABaUrFVuckGeLfYFSqjzx/zeC+HEdAYHGjGeySGaeI2@vger.kernel.org, AJvYcCU3gh5iqvW/zZI/KAzdBoVDlrSR0dHfVxc/VlSj/snsFxVJQ7X7Ytw+26E5164LRC1m/6vsDHe1wPULGpTr@vger.kernel.org, AJvYcCVY/tGi1sIhlhSM+SEGdiPK6ghRfuF4STl5voBVhNjNFJJ0lIzfxuRH2jrFssDSiAEA5C5WpOxj@vger.kernel.org, AJvYcCWZQy6rlRtMCaquGmvxfAivHF8+ad7Y64JWyTST+aA4GrOeJALKiytBaG9DcTT8pJuwxUSvDQ5zt7GuW+ussaM=@vger.kernel.org, AJvYcCWcrciYRWZa2MLE2jR56cI17qiKaacH3n23gUiNp1WaMXKvGXaAQppdlHvE5B1+cbKUiMEicSR9+xtt@vger.kernel.org, AJvYcCX9Li3tddxwblrpRmRuNXbuYWqZSoQ/oGrMSR7Kx7EhvS1x6P+jurkphkK/CcN60s4f2frLL/7zHT/XSKjMT0Ed@vger.kernel.org, AJvYcCXpQwFQnFGyVlh7fCPZBGL7DOBNmZ6f2L4sUYYeL2h9U4M+/YcAJnRrU0yAmg3D5xuF5JohpkbvHaFWFU4=@vger.kernel.org X-Gm-Message-State: AOJu0YwAbHF1z2proBgvzad2c3a7MqLTt6GZPqyaj3sLYmh1DU6mDMJD zHcY7OQ1h5W0sGB1HriMw3aDJgzk4t7Xc/XLp74o2WQ78rVxaJqD X-Gm-Gg: ASbGnctMXdJfTgN4WHkW08xmJoVsCOP0ml8FyoRKzSqDlG62JuPX3FUlrMPdcn0Dr+G ASm/jnriQP+XG8gUifk7pcWQ2q1k1HGgOWpfIg+M02Mmyya6dwk9QEcZc8gIo0l66V7uurBqeNW mnU2IKIgWATdnaI3ZVQkPVbEELOorHHnXaQQ7Hrgyji0HM2XALyS5V4azl32zmJTKmUEK/sln5o hDSVwonMP0Vu3HHQxeSlwovhm0dOFffh1WYcjms1A3XC9Tv5Zmu0md29S6MKsgmXxt2X3qjErsd w3QpoQb7nRtva1BKqgGvHa307nYIYN56+ZjGcGjVPnw+Ui14e/srPwaHhqTwfbExHPf8veVa/U5 hRXLE5HB46SQgZjAT/cOvWrNMg6C7WkOTCYwsOFc1T9M0 X-Google-Smtp-Source: AGHT+IFi4Si7IQ1YT5jNg+KUgkbiBbDQAH0O7wbLFp+MkBgnkmjllD9NBpwzc5qHxT3agd+CwJmDfw== X-Received: by 2002:a05:6214:c2e:b0:6e8:97d2:9999 with SMTP id 6a1803df08f44-6f2b3032ec7mr47154006d6.28.1744824988856; Wed, 16 Apr 2025 10:36:28 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:a61d]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f0dea07c50sm118289886d6.77.2025.04.16.10.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 10:36:28 -0700 (PDT) From: Tamir Duberstein Date: Wed, 16 Apr 2025 13:36:08 -0400 Subject: [PATCH v9 4/6] rust: enable `clippy::as_underscore` lint Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ptr-as-ptr-v9-4-18ec29b1b1f3@gmail.com> References: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> In-Reply-To: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Nicolas Schier Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.63.0, Clippy introduced the `as_underscore` lint [1]: > The conversion might include lossy conversion or a dangerous cast that > might go undetected due to the type being inferred. > > The lint is allowed by default as using `_` is less wordy than always > specifying the type. Always specifying the type is especially helpful in function call contexts where the inferred type may change at a distance. Specifying the type also allows Clippy to spot more cases of `useless_conversion`. The primary downside is the need to specify the type in trivial getters. There are 4 such functions: 3 have become slightly less ergonomic, 1 was revealed to be a `useless_conversion`. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#as_underscore [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/kernel/block/mq/operations.rs | 2 +- rust/kernel/block/mq/request.rs | 2 +- rust/kernel/device_id.rs | 2 +- rust/kernel/devres.rs | 15 ++++++++------- rust/kernel/dma.rs | 2 +- rust/kernel/error.rs | 2 +- rust/kernel/io.rs | 18 +++++++++--------- rust/kernel/miscdevice.rs | 2 +- rust/kernel/of.rs | 6 +++--- rust/kernel/pci.rs | 9 ++++++--- rust/kernel/str.rs | 8 ++++---- rust/kernel/workqueue.rs | 2 +- 13 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 04a5246171f9..57080a64913f 100644 --- a/Makefile +++ b/Makefile @@ -475,6 +475,7 @@ export rust_common_flags := --edition=2021 \ -Wunreachable_pub \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ + -Wclippy::as_underscore \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \ diff --git a/rust/kernel/block/mq/operations.rs b/rust/kernel/block/mq/operations.rs index 864ff379dc91..d18ef55490da 100644 --- a/rust/kernel/block/mq/operations.rs +++ b/rust/kernel/block/mq/operations.rs @@ -101,7 +101,7 @@ impl OperationsVTable { if let Err(e) = ret { e.to_blk_status() } else { - bindings::BLK_STS_OK as _ + bindings::BLK_STS_OK as u8 } } diff --git a/rust/kernel/block/mq/request.rs b/rust/kernel/block/mq/request.rs index af5c9ac94f36..22697104bf8c 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -125,7 +125,7 @@ pub fn end_ok(this: ARef) -> Result<(), ARef> { // success of the call to `try_set_end` guarantees that there are no // `ARef`s pointing to this request. Therefore it is safe to hand it // back to the block layer. - unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK_STS_OK as _) }; + unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK_STS_OK as u8) }; Ok(()) } diff --git a/rust/kernel/device_id.rs b/rust/kernel/device_id.rs index e5859217a579..4063f09d76d9 100644 --- a/rust/kernel/device_id.rs +++ b/rust/kernel/device_id.rs @@ -82,7 +82,7 @@ impl IdArray { unsafe { raw_ids[i] .as_mut_ptr() - .byte_offset(T::DRIVER_DATA_OFFSET as _) + .byte_add(T::DRIVER_DATA_OFFSET) .cast::() .write(i); } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index f7e8f5f53622..70d12014e476 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -45,7 +45,7 @@ struct DevresInner { /// # Example /// /// ```no_run -/// # use kernel::{bindings, c_str, device::Device, devres::Devres, io::{Io, IoRaw}}; +/// # use kernel::{bindings, c_str, device::Device, devres::Devres, ffi::c_void, io::{Io, IoRaw}}; /// # use core::ops::Deref; /// /// // See also [`pci::Bar`] for a real example. @@ -59,19 +59,19 @@ struct DevresInner { /// unsafe fn new(paddr: usize) -> Result{ /// // SAFETY: By the safety requirements of this function [`paddr`, `paddr` + `SIZE`) is /// // valid for `ioremap`. -/// let addr = unsafe { bindings::ioremap(paddr as _, SIZE as _) }; +/// let addr = unsafe { bindings::ioremap(paddr as bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl Drop for IoMem { /// fn drop(&mut self) { /// // SAFETY: `self.0.addr()` is guaranteed to be properly mapped by `Self::new`. -/// unsafe { bindings::iounmap(self.0.addr() as _); }; +/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); }; /// } /// } /// @@ -115,8 +115,9 @@ fn new(dev: &Device, data: T, flags: Flags) -> Result>> { // SAFETY: `devm_add_action` guarantees to call `Self::devres_callback` once `dev` is // detached. - let ret = - unsafe { bindings::devm_add_action(dev.as_raw(), Some(inner.callback), data as _) }; + let ret = unsafe { + bindings::devm_add_action(dev.as_raw(), Some(inner.callback), data.cast_mut().cast()) + }; if ret != 0 { // SAFETY: We just created another reference to `inner` in order to pass it to @@ -130,7 +131,7 @@ fn new(dev: &Device, data: T, flags: Flags) -> Result>> { } fn as_ptr(&self) -> *const Self { - self as _ + self } fn remove_action(this: &Arc) { diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index 43ecf3c2e860..851a6339aa90 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -38,7 +38,7 @@ impl Attrs { /// Get the raw representation of this attribute. pub(crate) fn as_raw(self) -> crate::ffi::c_ulong { - self.0 as _ + self.0 as crate::ffi::c_ulong } /// Check whether `flags` is contained in `self`. diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index afcb00cb6a75..fd7a8b759437 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -153,7 +153,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { /// Returns the error encoded as a pointer. pub fn to_ptr(self) -> *mut T { // SAFETY: `self.0` is a valid error due to its invariant. - unsafe { bindings::ERR_PTR(self.0.get() as _).cast() } + unsafe { bindings::ERR_PTR(self.0.get() as isize).cast() } } /// Returns a string representing the error, if one exists. diff --git a/rust/kernel/io.rs b/rust/kernel/io.rs index 72d80a6f131e..c08de4121637 100644 --- a/rust/kernel/io.rs +++ b/rust/kernel/io.rs @@ -5,7 +5,7 @@ //! C header: [`include/asm-generic/io.h`](srctree/include/asm-generic/io.h) use crate::error::{code::EINVAL, Result}; -use crate::{bindings, build_assert}; +use crate::{bindings, build_assert, ffi::c_void}; /// Raw representation of an MMIO region. /// @@ -56,7 +56,7 @@ pub fn maxsize(&self) -> usize { /// # Examples /// /// ```no_run -/// # use kernel::{bindings, io::{Io, IoRaw}}; +/// # use kernel::{bindings, ffi::c_void, io::{Io, IoRaw}}; /// # use core::ops::Deref; /// /// // See also [`pci::Bar`] for a real example. @@ -70,19 +70,19 @@ pub fn maxsize(&self) -> usize { /// unsafe fn new(paddr: usize) -> Result{ /// // SAFETY: By the safety requirements of this function [`paddr`, `paddr` + `SIZE`) is /// // valid for `ioremap`. -/// let addr = unsafe { bindings::ioremap(paddr as _, SIZE as _) }; +/// let addr = unsafe { bindings::ioremap(paddr as bindings::phys_addr_t, SIZE) }; /// if addr.is_null() { /// return Err(ENOMEM); /// } /// -/// Ok(IoMem(IoRaw::new(addr as _, SIZE)?)) +/// Ok(IoMem(IoRaw::new(addr as usize, SIZE)?)) /// } /// } /// /// impl Drop for IoMem { /// fn drop(&mut self) { /// // SAFETY: `self.0.addr()` is guaranteed to be properly mapped by `Self::new`. -/// unsafe { bindings::iounmap(self.0.addr() as _); }; +/// unsafe { bindings::iounmap(self.0.addr() as *mut c_void); }; /// } /// } /// @@ -119,7 +119,7 @@ pub fn $name(&self, offset: usize) -> $type_name { let addr = self.io_addr_assert::<$type_name>(offset); // SAFETY: By the type invariant `addr` is a valid address for MMIO operations. - unsafe { bindings::$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(()) } }; diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index fa9ecc42602a..6f9a7f97b7e5 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -33,7 +33,7 @@ impl MiscDeviceOptions { pub const fn into_raw(self) -> bindings::miscdevice { // SAFETY: All zeros is valid for this C type. let mut result: bindings::miscdevice = unsafe { MaybeUninit::zeroed().assume_init() }; - result.minor = bindings::MISC_DYNAMIC_MINOR as _; + result.minor = bindings::MISC_DYNAMIC_MINOR as i32; result.name = self.name.as_char_ptr(); result.fops = MiscdeviceVTable::::build(); result diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs index 04f2d8ef29cb..40d1bd13682c 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -22,7 +22,7 @@ unsafe impl RawDeviceId for DeviceId { const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::of_device_id, data); fn index(&self) -> usize { - self.0.data as _ + self.0.data as usize } } @@ -34,10 +34,10 @@ pub const fn new(compatible: &'static CStr) -> Self { // SAFETY: FFI type is valid to be zero-initialized. let mut of: bindings::of_device_id = unsafe { core::mem::zeroed() }; - // TODO: Use `clone_from_slice` once the corresponding types do match. + // TODO: Use `copy_from_slice` once stabilized for `const`. let mut i = 0; while i < src.len() { - of.compatible[i] = src[i] as _; + of.compatible[i] = src[i]; i += 1; } diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 391b4f070b1c..7efbbe5f8f59 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -169,7 +169,7 @@ unsafe impl RawDeviceId for DeviceId { const DRIVER_DATA_OFFSET: usize = core::mem::offset_of!(bindings::pci_device_id, driver_data); fn index(&self) -> usize { - self.0.driver_data as _ + self.0.driver_data } } @@ -204,7 +204,10 @@ macro_rules! pci_device_table { /// MODULE_PCI_TABLE, /// ::IdInfo, /// [ -/// (pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, bindings::PCI_ANY_ID as _), ()) +/// ( +/// pci::DeviceId::from_id(bindings::PCI_VENDOR_ID_REDHAT, bindings::PCI_ANY_ID as u32), +/// (), +/// ) /// ] /// ); /// @@ -327,7 +330,7 @@ unsafe fn do_release(pdev: &Device, ioptr: usize, num: i32) { // `ioptr` is valid by the safety requirements. // `num` is valid by the safety requirements. unsafe { - bindings::pci_iounmap(pdev.as_raw(), ioptr as _); + bindings::pci_iounmap(pdev.as_raw(), ioptr as *mut kernel::ffi::c_void); bindings::pci_release_region(pdev.as_raw(), num); } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 02863c40c21b..40034f77fc2f 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -738,9 +738,9 @@ fn new() -> Self { pub(crate) unsafe fn from_ptrs(pos: *mut u8, end: *mut u8) -> Self { // INVARIANT: The safety requirements guarantee the type invariants. Self { - beg: pos as _, - pos: pos as _, - end: end as _, + beg: pos as usize, + pos: pos as usize, + end: end as usize, } } @@ -765,7 +765,7 @@ pub(crate) unsafe fn from_buffer(buf: *mut u8, len: usize) -> Self { /// /// N.B. It may point to invalid memory. pub(crate) fn pos(&self) -> *mut u8 { - self.pos as _ + self.pos as *mut u8 } /// Returns the number of bytes written to the formatter. diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index 223fe5e8ed82..7d3a6e586a1d 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -198,7 +198,7 @@ pub fn enqueue(&self, w: W) -> W::EnqueueOutput unsafe { w.__enqueue(move |work_ptr| { bindings::queue_work_on( - bindings::wq_misc_consts_WORK_CPU_UNBOUND as _, + bindings::wq_misc_consts_WORK_CPU_UNBOUND as i32, queue_ptr, work_ptr, ) From patchwork Wed Apr 16 17:36:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14054330 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAC26221F08; Wed, 16 Apr 2025 17:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824994; cv=none; b=umNasb2+6vHzi/7fy/HaB/ggZlQHRjUxBHEMoKtKvyOlSN3YRMTUjqxfjkjhLFQmxysRwyitF4ogF8KkTDZusYXjKNBE+2Gu0/El1/QOGjkk1CJlRUqtHtcgykgYgbULGrMGRFARZR94SY29G6nZlKLTK1mAtplOSHppmOb2c18= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824994; c=relaxed/simple; bh=VseNrgxZWUIHk+y/wsE5kJZL6CjEpX2Ee6VESV720T0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e8xky3506iKtipP6eJfUU2/ZHjzvOek4Me3zm03uSnHJ6m6O8hLFbN4MI1djTb9GSKQDTdUpLgdi1mW31YOqSqq3/4j84EkubTqG5ExY0iBB3uIhDWvXbk3ZvC6VBE4ilLDNUgQgvax158ElY3I1LuC3RbJaY/OblU+Q0VOGqpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FCcsR6RU; arc=none smtp.client-ip=209.85.219.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FCcsR6RU" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6eeb7589db4so79034466d6.1; Wed, 16 Apr 2025 10:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744824991; x=1745429791; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=s7TG+vcDltz8CEBipYAMc1RYMUDRIBQnjPX3T3cax8U=; b=FCcsR6RUJnOtHjPF0+gL7G50b4B9OQGY5BMMjzBbUIORHNQJnjKsAb2Sa0X/zK8H4/ tDhOBfXub3AmZUbO1hrCLg4EtgMohDryn1JrKJjqpRV49hvjaDdiXYBVhY9zApuvH164 eYi/QMfizIllVIK9eTUm2lfSc2aa6GhHyvDBiQ1BIMFMR8OshWF1yOf8nU+Hbz7eu2Ad hKROYS2a6zMtsnMnxo9fV2hvKMkgRPD/7FqdMfnUejhPpgwQ7foZWswimxq65L9jCqiC wFOa449mjfl/Ju/7WS7Xy3d7OexI+Oi1S7JOTfsAwkYkcdHVBzc+acuUF9huLRYpfza9 9qBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744824991; x=1745429791; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s7TG+vcDltz8CEBipYAMc1RYMUDRIBQnjPX3T3cax8U=; b=geH/LJMgHcdD19UltfxiNCWjxvYIEdWM2dkGi73pbMnr+lMrX4bsaMP8KTH+9R9ino zb9/mS5Zu9vWO7X6N0HVZPuWUSqRlKz5UcjnUEQohAF2uG+npP3bi50lFkuDy9w/jLvQ V36Rr6M79L9WtIgKtG6mt8WP4NpSPjNlEa7dnmZApb8NT6QO0Svxt+hhHU90iJB1oE85 vj9NTa4igA49h+zYLbQ/P0qu28MtqgW8oYVaH7W1N4sN4cVyenn1WwcJBo9BVRQTO8xM +dOMlBEZK7iLUMLNsnTki1LQJNNhvgFLLPHl4wllvccLQdl03YESTFVHSSlwDkEGkKXE HMHw== X-Forwarded-Encrypted: i=1; AJvYcCU9cFI3HE4YpJ0def76TkZ3gzXqlOG+YnEKvonpwvI6q2hcK5TzJhpQexGeCzU+A8gJCPenUtIjMij+y+Y=@vger.kernel.org, AJvYcCV5dU/XCE8K/LFfGjyjqBELIS4OEIdrbPEP6uix6IEN+b+ePvzsFdU2nPWqEFE8ZdwhsVCcb0KeByX8NX1D1n6t@vger.kernel.org, AJvYcCVVSvrtK4Jwkw1Xgifd3oZnfuW42Q4ss6zPoqD67TavFaZ9hzKAEJSuieBC8dPKh+1bdSJUKx+Uhq1K@vger.kernel.org, AJvYcCVqlOUbCU5G8bdHeGu50/gyrNOFcumEzeQIzG0LhY1RQvYB1hJrrd9vxTrW2y5e7WQ/L/rsMIdoJec1LrK0@vger.kernel.org, AJvYcCW9ZwcDH2p/dz8OLO8UrRAXAdjNn9Sov0xPSThBwCFuza53AhODWZKRYwjTilrJJqDHf1bJmHZDJJwO@vger.kernel.org, AJvYcCXT/S5QgwLoF0UxzED8LAaReLEETFlCt3FyhNuvYjxuzvXsb43X10xBIGjjrbSEM59H/S8wEzJv@vger.kernel.org, AJvYcCXdhJc0u0gwrvQ2vXj5poWdynvWFlvlNVOP2cFmwkCYSC0ABUHEyTQzBAYFr/6TfCAU49e5wrqsJDbVV2uegdY=@vger.kernel.org X-Gm-Message-State: AOJu0YxWrQz0gphhdtAL5YbJEmzAX53HdkpwKvsAzAU2tq4o9kkdQwC/ wlHNfzWmo7dMcd5JbHbv+nbp0aQBfZoxHUmmwnLhekxGM42RRKgx X-Gm-Gg: ASbGncuTT6zSbuAxh7FLsCYC0JJIsiW2HPTJPYg84a8cVp0BkNsUqE2i8SCX1jEFzh1 9pCnhweZSvj2M/+a8Nzl3wnZuDjEw3uUa5ixu5UYVxokCG2k9h7WPrd2YiYdLI3atSwcmQuvKv2 js1HP6Gx+OR0tDN4xT0s7wNcGkgjWYhiJUZODswbTY0sg8uq+gzBAVK84+XchUPVUq+T4prfXUV ChBMpA9g4AGq81URHFraj/+6XkjouFyBjoHZyRziSmtXda3KirKpTqURzUaMnklkfzATdzf70XB FcJmIr5Q199dLaCKHcSVNiQFmkzxDy7xVX9cWZLq7mkCs5joP4upXmrUU4fg1h0dnQKlBjpwq56 N2EakQsUUnhcbOxwv0NuMFs2CptyRbHsHh9D/prYKOZH+ X-Google-Smtp-Source: AGHT+IH+8prI3dnFdzQpvutGIEPNlRoSRgzV8L97yizn7cZYwB5PUjJ/dUipbXxo0463QbPVMzCyTQ== X-Received: by 2002:ad4:5b83:0:b0:6ed:122c:7da7 with SMTP id 6a1803df08f44-6f2b2f22f49mr31627676d6.5.1744824990638; Wed, 16 Apr 2025 10:36:30 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:a61d]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f0dea07c50sm118289886d6.77.2025.04.16.10.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 10:36:30 -0700 (PDT) From: Tamir Duberstein Date: Wed, 16 Apr 2025 13:36:09 -0400 Subject: [PATCH v9 5/6] rust: enable `clippy::cast_lossless` lint Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ptr-as-ptr-v9-5-18ec29b1b1f3@gmail.com> References: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> In-Reply-To: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Nicolas Schier Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Before Rust 1.29.0, Clippy introduced the `cast_lossless` lint [1]: > Rust’s `as` keyword will perform many kinds of conversions, including > silently lossy conversions. Conversion functions such as `i32::from` > will only perform lossless conversions. Using the conversion functions > prevents conversions from becoming silently lossy if the input types > ever change, and makes it clear for people reading the code that the > conversion is lossless. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#cast_lossless [1] Suggested-by: Benno Lossin Link: https://lore.kernel.org/all/D8ORTXSUTKGL.1KOJAGBM8F8TN@proton.me/ Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + drivers/gpu/drm/drm_panic_qr.rs | 2 +- rust/bindings/lib.rs | 1 + rust/kernel/net/phy.rs | 4 ++-- rust/uapi/lib.rs | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 57080a64913f..eb5a942241a2 100644 --- a/Makefile +++ b/Makefile @@ -476,6 +476,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::all \ -Wclippy::as_ptr_cast_mut \ -Wclippy::as_underscore \ + -Wclippy::cast_lossless \ -Wclippy::ignored_unit_patterns \ -Wclippy::mut_mut \ -Wclippy::needless_bitwise_bool \ diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs index f2a99681b998..d28e8f199d11 100644 --- a/drivers/gpu/drm/drm_panic_qr.rs +++ b/drivers/gpu/drm/drm_panic_qr.rs @@ -386,7 +386,7 @@ fn next(&mut self) -> Option { match self.segment { Segment::Binary(data) => { if self.offset < data.len() { - let byte = data[self.offset] as u16; + let byte = data[self.offset].into(); self.offset += 1; Some((byte, 8)) } else { diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index 0486a32ed314..b105a0d899cc 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -25,6 +25,7 @@ )] #[allow(dead_code)] +#[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] mod bindings_raw { diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index a59469c785e3..abc58b4d1bf4 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -142,7 +142,7 @@ pub fn is_autoneg_enabled(&self) -> bool { // SAFETY: The struct invariant ensures that we may access // this field without additional synchronization. let bit_field = unsafe { &(*self.0.get())._bitfield_1 }; - bit_field.get(13, 1) == bindings::AUTONEG_ENABLE as u64 + bit_field.get(13, 1) == bindings::AUTONEG_ENABLE.into() } /// Gets the current auto-negotiation state. @@ -426,7 +426,7 @@ impl Adapter { // where we hold `phy_device->lock`, so the accessors on // `Device` are okay to call. let dev = unsafe { Device::from_raw(phydev) }; - T::match_phy_device(dev) as i32 + T::match_phy_device(dev).into() } /// # Safety diff --git a/rust/uapi/lib.rs b/rust/uapi/lib.rs index f03b7aead35a..d5dab4dfabec 100644 --- a/rust/uapi/lib.rs +++ b/rust/uapi/lib.rs @@ -14,6 +14,7 @@ #![cfg_attr(test, allow(unsafe_op_in_unsafe_fn))] #![allow( clippy::all, + clippy::cast_lossless, clippy::ptr_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, From patchwork Wed Apr 16 17:36:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 14054331 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B5C92222B4; Wed, 16 Apr 2025 17:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824996; cv=none; b=SuIgGaoz+xD6sifHu8mKSQuS7lgKqHmrzjEEoRCEkK3SIq+Kin7LEMIeHb0VGPCzsVud4DclPQJ7iF7M33p7q2EnQS4MLTw3CjhKcVL2T6qu4USVokTpfLkgWw1yW8O9JQmavlb18TbDIpCqDOgNF7Cl76I2TEEAd82r3KSxSV4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744824996; c=relaxed/simple; bh=ZH+gJvR96pmCzXAlh2JcvTx8DVnyLHw0hcOEVuzlq8o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DRSBW6hVFCmTj11mQS9b39fxiqOQLChYPnzXbr+n/9PF/0ieNss5GoRtSdEOryd77PAcCwu+ZlHQoNS9DVvgln56Lf0PfYqSdImaPUPyXy+AnydTdO+F30E7m2rFEwyt+Frz9gvgzyTmZW8js85cu182p7lCt8rhOaZznQoj/O4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ax1DPGIf; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ax1DPGIf" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6e8f6970326so66739896d6.0; Wed, 16 Apr 2025 10:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744824993; x=1745429793; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=70V/ZNK+rmYoFvMHiW/74+os3nIm0NWF0rbd6T5wy5s=; b=Ax1DPGIfIQdnoLU0j75qLc4Id8+HmwqNHsDWHLIigxPVmceAQC7f9S+ALiV/4KKdP/ kxtWN/WZ3J37g1y5DGh9dCbPaqwe7agiMWJjvaDOYepE5NTfOW9ppugDCiVbyeJ8Tbwb 8dyvLBXfe54SCRBZfp/WD3EM+hOJ0HCprSNSUbo/XryF5gFYJ8qV/V7SRkkb7Ul4ZiHU c7SkoNIy2u9Q24yNKZ0Zi4Gc+QysVFlAYwMTKjS/AqGS+dXxewsphln6mVCQswf3T+Wl +P82/fwLbDf3Ch+q9eyB17qqvl6oYPhu5P/hdCJdN+jh9p/VW9xL0Kj98jRtXX1muRnd Frsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744824993; x=1745429793; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=70V/ZNK+rmYoFvMHiW/74+os3nIm0NWF0rbd6T5wy5s=; b=T98Cjj/N2md0nsG2V59uccekdzDU7ddPCAIq15i+wAWSy7lnDlfuos1zKSH/VlB1g+ rZh0+2zkiOyjS31/9bE9OfwRpFymau6/XBicKIjek3lVUeFLS2+tGy8rZX7hHz+xR5qq 5BQiG8YDdfXWD9VQaPP+v5vA3FpGkH9gDLNw274/fjmMhaU5aI73jM0LkwjBESXaSNwO NW7mNoBrV/reJEgtsxpecbbIAxixC5o/wqBA+rX+VxEvhe7a+fU1VvBZ8JsIJBR7uf3W a2fayrHwuE0frY4CNi5C1zXQ6NSMIyQgQ3SCXf+XTzzJkK9PNbsVEvLoK5CpNL4WLX4q yUSA== X-Forwarded-Encrypted: i=1; AJvYcCUDYrnm7umEmNs0uuGOmfh7Nsy2nZ/dGYnehEvjLujeBmRVNgiOrsavCZ4ufr6P8+bIHWeke/6tcF27NJFNfZ8=@vger.kernel.org, AJvYcCV89yW+KcRkwNwqYu9Ge7zr8jFzSaFAQf7WKrvg1EBAaNCYE4Y2pNil4nXLdaGGb1iwsSXDIfFiNR5q@vger.kernel.org, AJvYcCVP68yHc1FVB/wj1z40zKgh4/B1DipGgxEOEFY61g9EIuQgCA1Bpnttm9DBOagaYMlaTJAJEaNtC56Q5vWbY7pr@vger.kernel.org, AJvYcCVsVhGyBx3oQ3Szy7Y+IKcqs3A2kA2/J4A9tvXB4IlGJ6E7xD6VrBH/nq/TbQM2ZbwLB/wWj0PMFP8C@vger.kernel.org, AJvYcCWBGoyVeZ4WSY7pOyjFzL8aRF+KKArnlzhzG1Es984GIL/0LTpBKnJ6aR1AVEgpAYviGjqX78CU@vger.kernel.org, AJvYcCWhyX5XqhYqslnFv8JhyYPrvqrGKiTLABv+4GDZMecF9p+LQyQiNZf/MqDpbySnGjsOnB7KPs8ruMui1lvr@vger.kernel.org, AJvYcCXPbefFQ+OO5sIrsvepf9pPfoS8Ies4qy9fgXimEUFkYJuBvSvqkLZJxsTIojVzVvIIDcHVJqt8YKlQv3g=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+/KBYl7Du75xhS+ciPG6D27jGrkagOWjghwnnMOgjSsOqVWQQ ZkmZV5sSZ01GaXVjvQQ+FdzRSUejGMXuzOL/wt6vzNpOhpeWig3Z X-Gm-Gg: ASbGncvqy7301Tisuh0FcH1yOwtd86n4lGpmieoAHcrErbm9Y0Vo84ss7bhUfm/GvkL 1ekrpj5XgjGWoHNVRagJrhNA0UxV7nvv9Mr1lVNLBqUbcfcorps7dY/sJUTAtXI9PvBfqWDwoXy KyQ6qDHPdVe4puuZj7mOCZJSh1rIMYvicW0wsXmXn0hDuwlJoqcC7gtbHDC5ph439jZFjIjE9Ah 2cZqgjU6G3GHxn9f42ve2yQaala9Nw6U458y7cJ/797erR8OiYSJUOSuUcuEvnkywF4o4lR3y// lTfQLiAe0/ACv4C3dM3KQ6f0iDm/M2Ss20f1b2VbAbtFf0HazYE0XA6/7nazS1LI0s8WXopA0OG 3tmSR4rdyLcmWh7A8+fjjcJngcF2zXsRyQmyaNErPU1DX X-Google-Smtp-Source: AGHT+IHoff5UaNKwwImuHNe3ew0+XBOuxETDH2IiJSCOUP4kTLnxRtQBJcnt2KWDVXSB29dyM1PQUA== X-Received: by 2002:a05:6214:411b:b0:6f2:a457:19a with SMTP id 6a1803df08f44-6f2b2f8bf34mr40614196d6.25.1744824993112; Wed, 16 Apr 2025 10:36:33 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2620:10d:c091:600::1:a61d]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f0dea07c50sm118289886d6.77.2025.04.16.10.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 10:36:32 -0700 (PDT) From: Tamir Duberstein Date: Wed, 16 Apr 2025 13:36:10 -0400 Subject: [PATCH v9 6/6] rust: enable `clippy::ref_as_ptr` lint Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250416-ptr-as-ptr-v9-6-18ec29b1b1f3@gmail.com> References: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> In-Reply-To: <20250416-ptr-as-ptr-v9-0-18ec29b1b1f3@gmail.com> To: Masahiro Yamada , Nathan Chancellor , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Greg Kroah-Hartman , "Rafael J. Wysocki" , Brendan Higgins , David Gow , Rae Moar , Bjorn Helgaas , Luis Chamberlain , Russ Weight , Rob Herring , Saravana Kannan , Abdiel Janulgue , Daniel Almeida , Robin Murphy , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Nicolas Schier , Frederic Weisbecker , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , Nicolas Schier Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-pci@vger.kernel.org, linux-block@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev In Rust 1.78.0, Clippy introduced the `ref_as_ptr` lint [1]: > Using `as` casts may result in silently changing mutability or type. While this doesn't eliminate unchecked `as` conversions, it makes such conversions easier to scrutinize. It also has the slight benefit of removing a degree of freedom on which to bikeshed. Thus apply the changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ref_as_ptr [1] Suggested-by: Benno Lossin Link: https://lore.kernel.org/all/D8PGG7NTWB6U.3SS3A5LN4XWMN@proton.me/ Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein Reviewed-by: Boqun Feng --- Makefile | 1 + rust/bindings/lib.rs | 1 + 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 + 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index eb5a942241a2..2a16e02f26db 100644 --- a/Makefile +++ b/Makefile @@ -485,6 +485,7 @@ export rust_common_flags := --edition=2021 \ -Wclippy::no_mangle_with_rust_abi \ -Wclippy::ptr_as_ptr \ -Wclippy::ptr_cast_constness \ + -Wclippy::ref_as_ptr \ -Wclippy::undocumented_unsafe_blocks \ -Wclippy::unnecessary_safety_comment \ -Wclippy::unnecessary_safety_doc \ diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs index b105a0d899cc..2b69016070c6 100644 --- a/rust/bindings/lib.rs +++ b/rust/bindings/lib.rs @@ -27,6 +27,7 @@ #[allow(dead_code)] #[allow(clippy::cast_lossless)] #[allow(clippy::ptr_as_ptr)] +#[allow(clippy::ref_as_ptr)] #[allow(clippy::undocumented_unsafe_blocks)] mod bindings_raw { // Manual definition for blocklisted types. diff --git a/rust/kernel/device_id.rs b/rust/kernel/device_id.rs index 4063f09d76d9..74b5db81231f 100644 --- a/rust/kernel/device_id.rs +++ b/rust/kernel/device_id.rs @@ -136,7 +136,7 @@ impl IdTable for IdArray { fn as_ptr(&self) -> *const T::RawType { // This cannot be `self.ids.as_ptr()`, as the return pointer must have correct provenance // to access the sentinel. - (self as *const Self).cast() + core::ptr::from_ref(self).cast() } fn id(&self, index: usize) -> &T::RawType { diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs index 791f493ada10..c9a86beacb65 100644 --- a/rust/kernel/fs/file.rs +++ b/rust/kernel/fs/file.rs @@ -364,7 +364,7 @@ fn deref(&self) -> &LocalFile { // // By the type invariants, there are no `fdget_pos` calls that did not take the // `f_pos_lock` mutex. - unsafe { LocalFile::from_raw_file((self as *const Self).cast()) } + unsafe { LocalFile::from_raw_file(core::ptr::from_ref(self).cast()) } } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 40034f77fc2f..ca173ae3282d 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -29,7 +29,7 @@ pub const fn is_empty(&self) -> bool { #[inline] pub const fn from_bytes(bytes: &[u8]) -> &Self { // SAFETY: `BStr` is transparent to `[u8]`. - unsafe { &*(bytes as *const [u8] as *const BStr) } + unsafe { &*(core::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 *(bytes as *mut [u8] as *mut CStr) } + unsafe { &mut *(core::ptr::from_mut(bytes) as *mut CStr) } } /// Returns a C pointer to the string. diff --git a/rust/kernel/uaccess.rs b/rust/kernel/uaccess.rs index 80a9782b1c6e..5f8e1e7babb3 100644 --- a/rust/kernel/uaccess.rs +++ b/rust/kernel/uaccess.rs @@ -242,7 +242,7 @@ pub fn read_raw(&mut self, out: &mut [MaybeUninit]) -> Result { pub fn read_slice(&mut self, out: &mut [u8]) -> Result { // SAFETY: The types are compatible and `read_raw` doesn't write uninitialized bytes to // `out`. - let out = unsafe { &mut *(out as *mut [u8] as *mut [MaybeUninit]) }; + let out = unsafe { &mut *(core::ptr::from_mut(out) as *mut [MaybeUninit]) }; self.read_raw(out) } @@ -357,7 +357,7 @@ pub fn write(&mut self, value: &T) -> Result { let res = unsafe { bindings::_copy_to_user( self.ptr as *mut c_void, - (value as *const T).cast::(), + core::ptr::from_ref(value).cast::(), len, ) }; diff --git a/rust/uapi/lib.rs b/rust/uapi/lib.rs index d5dab4dfabec..6230ba48201d 100644 --- a/rust/uapi/lib.rs +++ b/rust/uapi/lib.rs @@ -16,6 +16,7 @@ clippy::all, clippy::cast_lossless, clippy::ptr_as_ptr, + clippy::ref_as_ptr, clippy::undocumented_unsafe_blocks, dead_code, missing_docs,