From patchwork Wed Apr 9 14:47:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 879943 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 22DA0267F4F; Wed, 9 Apr 2025 14:47:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210050; cv=none; b=GQZn4yUHjB36BzLPH9itTrcjA8uauYJ4ngIdsQpD34nWh3nkkaod0dY6IS9G22p4NET5PAFs89xGP0QopPp0u7G8VxnAuIS4uB2PxsrCelPpWjT1EBn0XMJ3YNKowmpHNuBshHri9uzFDv4WfrXzMIgv5+JK6Hmikh8pvs6jn5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210050; c=relaxed/simple; bh=DIdDYsq7p8XvxN7SPSt40q8AzijxdHIyXQggWjANvkI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tGtXAErw48IezFKZ80uM3lz1SYagB9Ij8azPtENqDl8hdVFuTLCoJqnBDaOPp3NyuOG1Fr8nfDec7EOOyDFLaN479szQLO88WH8HRbfpcj+qkERqSW0Pc6+Pr9fo8r+hb51iExjjLQ806fQ+EFPYdaVajSxFf9OhkA9lcjc0BZs= 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=BSg39PgP; arc=none smtp.client-ip=209.85.160.172 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="BSg39PgP" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-47664364628so8774421cf.1; Wed, 09 Apr 2025 07:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744210047; x=1744814847; 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=SB6Ad23IpdPLeltlEP/m+DTJFq61S3PYh1xXfCE8f3U=; b=BSg39PgPDXeNJK8LMhbPdd3yk6m1kSdP4dUAWITE+j1RSN8hjIRkbia5/L/wxADgzB TxZuR1hU8c69OZ98SLZykijfSjn752nYiMRdZP0hSt+oCZ5W9ewcXzcP6vTQNtvtguFX yNTHu3otd4kjneSp0CoTv375/TSY29bhDRCnoVXP2fyAt9iuOoAdFheBpS6VKcMaJxGH 6VKjNVqw4ufSZwpG5HoBEXIKPHmfRAzmDV5V0jeSY7CU4cageVNpOKPiMu8uVpMo/uRV WQS2oyL+/MnCY7j6ou6vyW7Oip3fhofvgdn2bRTpJPSg5lbIvmG2xGJ/wWfVq6iBI8Eh HY1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210047; x=1744814847; 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=SB6Ad23IpdPLeltlEP/m+DTJFq61S3PYh1xXfCE8f3U=; b=DDnSp9c5gtZDZk7m9yHbOEn5cSJk3aPj84++6f+bdJMG3avQ1QsTd+1CXAnE8bwyxj uxMMR8guVpcZ92RgAbKbbHJI8CDgubQLZ3Fm5m31QjQHAI1UZn37L0UOEfZAS0HPN+t3 ZFppRs/iD921/Mk4ZOLvHSgICwO7xQNsv5D4lV4FUXf0ffQltPpFXk4Q/LxX4a0ySvEd KPhEfX7v0HuBNKDjNf3dTH6rkt4v98Uw4yDpGHDOFoe7ILzCiOQvXSO/vUwukkNOclDJ F7KtKJY2Fftry48ccDTSlF9snOkYep1SpotahH448wEbz4+SNBFG6yeaeXFYWFlSeJSS R18w== X-Forwarded-Encrypted: i=1; AJvYcCUCcRoL95KJkwD3IoKminkNVgb/qiWp1EXauqattDkdyU+cQn/FGFJzfKeSFDm9wU071Bp9VnORWOIx@vger.kernel.org, AJvYcCV22P2EQ1sGYugsOHTUGTLv7ar9K0eeDwyodclcAzRb2Flzq5Cpxr/14vY8jZyCZ/PDs6X2PyDoENDdHaM=@vger.kernel.org, AJvYcCVcO59bAyZoUqsBX4hVHtot28i4P2PZNx+6ZIrAG7VwcTWTUjwPCOKn3+L6bW/EQtxUBc6ipY6+nYZj6j8cWHc=@vger.kernel.org, AJvYcCVfUVnw+2cym7QlcgFj+7tt/RtQ6NJrzFtwaWkueW7/9GrKAUaS40Bhk4prTcxM/BYTumz0lc/pAgWZ@vger.kernel.org, AJvYcCVkLCYuUpK+KccAKPjPOnXXqFF8FhElZVtpoZkz7RGLlB82e1mtCDFrn9My4coYmB3iKc8LXI9l2gFJmsZP+RYj@vger.kernel.org, AJvYcCVnp1F8bOSgHZ/6sS5ZQqHfzf4lDZXmt0QnF6Oy8lPpNOoAys7WlS95pS0r4JILrNN6c8MANVnP9srp0AAQ@vger.kernel.org, AJvYcCWisU8KgzsxtOr8U9hM0RtueHUUgOjGzfTukiG++qgu4GuckGkKHcl2Ct8ZCdD/AXQnJvLDD86N@vger.kernel.org X-Gm-Message-State: AOJu0YzmmrNu6ZOmLKi1l0zJ16hN5uq+Q/3gJTPecOlGdeQ67NqS9mWD ezRCNf77UPt5eadRC9Os7dXbh3a47P5RGZsIWWsHD2JIR3uwITGE X-Gm-Gg: ASbGncssLmb6HLgJLnOLxdWEFmCVDaIg4jY/IB7d6EJVjWsxrsnD96GOVidA69XuQSO v5TnDU05XzRTXDXUx70E9UTILjCpnIewKN7hJCU3/kO7y+2FNKzUIOTDM6S1TdHmC1jO3psXHkh OzNduT26ssj2UhwE7hGOwPGYz9HbgmhSznI0wjeTqNlNDWxlOT+ODQG0GHCPx9FR1FgUglA9dpz tKuCfqlqsRm71hqkCauUdML3STNzv0ezeookxYYDJabWyIMuqBar2qHAzp3WvMu3/bqV2G/iahy rCvKJcDcSNmC/nYsO6QmhVTxyFZWQDomJb4mkKqzB6oBn/34bWkrfa3gv8GwGrZfMaEhIEjf+7u dbXrHzeBMHShoXm9KI8I8OoB+b4Dmu/2l1pcDrHlnsMg9 X-Google-Smtp-Source: AGHT+IEVfwLb/wYfkAC64suAmd6ofxiNFym0tkTg/OokAiEwxYbC0nkgryJrohbGldXCMe3FAukUHA== X-Received: by 2002:ac8:5e12:0:b0:479:1a0:3448 with SMTP id d75a77b69052e-47953ea88bfmr113698651cf.10.1744210046581; Wed, 09 Apr 2025 07:47: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:3298]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47964eb9a8fsm8024461cf.49.2025.04.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:47:26 -0700 (PDT) From: Tamir Duberstein Date: Wed, 09 Apr 2025 10:47:18 -0400 Subject: [PATCH v8 1/6] rust: enable `clippy::ptr_as_ptr` lint Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250409-ptr-as-ptr-v8-1-3738061534ef@gmail.com> References: <20250409-ptr-as-ptr-v8-0-3738061534ef@gmail.com> In-Reply-To: <20250409-ptr-as-ptr-v8-0-3738061534ef@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 `let x: *const _ = &x;` and `.cast()` or `.cast::()` according to the previous rules. The intermediate `let` binding is required because `(x as *const _).cast::()` results in inference failure. - Native literal C strings are replaced with `c_str!().as_char_ptr()`. - `*mut *mut T as _` is replaced with `let *mut *const T = (*mut *mut T)`.cast();` since pointer to pointer can be confusing. Apply these changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_as_ptr [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/alloc/allocator_test.rs | 2 +- rust/kernel/alloc/kvec.rs | 4 ++-- rust/kernel/device.rs | 5 +++-- rust/kernel/devres.rs | 2 +- rust/kernel/dma.rs | 4 ++-- rust/kernel/error.rs | 2 +- rust/kernel/firmware.rs | 3 ++- rust/kernel/fs/file.rs | 2 +- rust/kernel/kunit.rs | 15 +++++++-------- rust/kernel/list/impl_list_item_mod.rs | 2 +- rust/kernel/pci.rs | 2 +- rust/kernel/platform.rs | 4 +++- rust/kernel/print.rs | 11 +++++------ rust/kernel/seq_file.rs | 3 ++- rust/kernel/str.rs | 2 +- rust/kernel/sync/poll.rs | 2 +- rust/kernel/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, 44 insertions(+), 38 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..e77d74d18c1c 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -168,16 +168,17 @@ pub fn pr_dbg(&self, args: fmt::Arguments<'_>) { /// `KERN_*`constants, for example, `KERN_CRIT`, `KERN_ALERT`, etc. #[cfg_attr(not(CONFIG_PRINTK), allow(unused_variables))] unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) { + let msg: *const _ = &msg; // SAFETY: `klevel` is null-terminated and one of the kernel constants. `self.as_raw` // is valid because `self` is valid. The "%pA" format string expects a pointer to // `fmt::Arguments`, which is what we're passing as the last argument. #[cfg(CONFIG_PRINTK)] unsafe { bindings::_dev_printk( - klevel as *const _ as *const crate::ffi::c_char, + klevel.as_ptr().cast::(), self.as_raw(), c_str!("%pA").as_char_ptr(), - &msg as *const _ as *const crate::ffi::c_void, + msg.cast::(), ) }; } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 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..83d15cfcda84 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -8,19 +8,20 @@ use core::{ffi::c_void, fmt}; +#[cfg(CONFIG_PRINTK)] +use crate::c_str; + /// Prints a KUnit error-level message. /// /// Public but hidden since it should only be used from KUnit generated code. #[doc(hidden)] pub fn err(args: fmt::Arguments<'_>) { + let args: *const _ = &args; // SAFETY: The format string is null-terminated and the `%pA` specifier matches the argument we // are passing. #[cfg(CONFIG_PRINTK)] unsafe { - bindings::_printk( - c"\x013%pA".as_ptr() as _, - &args as *const _ as *const c_void, - ); + bindings::_printk(c_str!("\x013%pA").as_char_ptr(), args.cast::()); } } @@ -29,14 +30,12 @@ pub fn err(args: fmt::Arguments<'_>) { /// Public but hidden since it should only be used from KUnit generated code. #[doc(hidden)] pub fn info(args: fmt::Arguments<'_>) { + let args: *const _ = &args; // SAFETY: The format string is null-terminated and the `%pA` specifier matches the argument we // are passing. #[cfg(CONFIG_PRINTK)] unsafe { - bindings::_printk( - c"\x016%pA".as_ptr() as _, - &args as *const _ as *const c_void, - ); + bindings::_printk(c_str!("\x016%pA").as_char_ptr(), args.cast::()); } } diff --git a/rust/kernel/list/impl_list_item_mod.rs b/rust/kernel/list/impl_list_item_mod.rs index a0438537cee1..1f9498c1458f 100644 --- a/rust/kernel/list/impl_list_item_mod.rs +++ b/rust/kernel/list/impl_list_item_mod.rs @@ -34,7 +34,7 @@ pub unsafe trait HasListLinks { unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut ListLinks { // SAFETY: The caller promises that the pointer is valid. The implementer promises that the // `OFFSET` constant is correct. - unsafe { (ptr as *mut u8).add(Self::OFFSET) as *mut ListLinks } + unsafe { ptr.cast::().add(Self::OFFSET).cast() } } } diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 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..8ae57d2cd36c 100644 --- a/rust/kernel/print.rs +++ b/rust/kernel/print.rs @@ -25,7 +25,7 @@ // SAFETY: The C contract guarantees that `buf` is valid if it's less than `end`. let mut w = unsafe { RawFormatter::from_ptrs(buf.cast(), end.cast()) }; // SAFETY: TODO. - let _ = w.write_fmt(unsafe { *(ptr as *const fmt::Arguments<'_>) }); + let _ = w.write_fmt(unsafe { *ptr.cast::>() }); w.pos().cast() } @@ -102,6 +102,7 @@ pub unsafe fn call_printk( module_name: &[u8], args: fmt::Arguments<'_>, ) { + let args: *const _ = &args; // `_printk` does not seem to fail in any path. #[cfg(CONFIG_PRINTK)] // SAFETY: TODO. @@ -109,7 +110,7 @@ pub unsafe fn call_printk( bindings::_printk( format_string.as_ptr(), module_name.as_ptr(), - &args as *const _ as *const c_void, + args.cast::(), ); } } @@ -122,15 +123,13 @@ pub unsafe fn call_printk( #[doc(hidden)] #[cfg_attr(not(CONFIG_PRINTK), allow(unused_variables))] pub fn call_printk_cont(args: fmt::Arguments<'_>) { + let args: *const _ = &args; // `_printk` does not seem to fail in any path. // // SAFETY: The format string is fixed. #[cfg(CONFIG_PRINTK)] unsafe { - bindings::_printk( - format_strings::CONT.as_ptr(), - &args as *const _ as *const c_void, - ); + bindings::_printk(format_strings::CONT.as_ptr(), args.cast::()); } } diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 7a9403eb6e5b..6afab0544b8d 100644 --- a/rust/kernel/seq_file.rs +++ b/rust/kernel/seq_file.rs @@ -32,12 +32,13 @@ pub unsafe fn from_raw<'a>(ptr: *mut bindings::seq_file) -> &'a SeqFile { /// Used by the [`seq_print`] macro. #[inline] pub fn call_printf(&self, args: core::fmt::Arguments<'_>) { + let args: *const _ = &args; // SAFETY: Passing a void pointer to `Arguments` is valid for `%pA`. unsafe { bindings::seq_printf( self.inner.get(), c_str!("%pA").as_char_ptr(), - &args as *const _ as *const crate::ffi::c_void, + args.cast::(), ); } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 878111cb77bc..02863c40c21b 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -237,7 +237,7 @@ pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Self { // to a `NUL`-terminated C string. let len = unsafe { bindings::strlen(ptr) } + 1; // SAFETY: Lifetime guaranteed by the safety precondition. - let bytes = unsafe { core::slice::from_raw_parts(ptr as _, len) }; + let bytes = unsafe { core::slice::from_raw_parts(ptr.cast(), len) }; // SAFETY: As `len` is returned by `strlen`, `bytes` does not contain interior `NUL`. // As we have added 1 to `len`, the last byte is known to be `NUL`. unsafe { Self::from_bytes_with_nul_unchecked(bytes) } diff --git a/rust/kernel/sync/poll.rs b/rust/kernel/sync/poll.rs index 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 9 14:47:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 879478 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 E241E268C42; Wed, 9 Apr 2025 14:47:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210052; cv=none; b=LXmRtZhkbH4Ycj5WEkITAA2Hh89+CTBrkpt+txpp+C3hy7OBVQpm0OiJ5JbYfGacqhNthta1TZm8QVPU8MeF1kxgZ+7PaPQEc+rUWcvPMb64bE1ARw/hgxAy9k4lfrUcC0a/xkCSXfxG0BV3sTSdUi5GKdPn4vwwNRD4S7qvZIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210052; c=relaxed/simple; bh=1lm55BiOT/FFvcYCcYH0ZcTmx31jiv2NnT0cdCpTpcU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rt+AO2hvlP1GWJsUk0xRuNrNG0NbDEeCBjS7cbP8OnX7wZjQHDjrSXWUPLg6ACIWVetgzLf3V93T38ckrma8fRtWYkB5xsTXiLBhjHyUlhSvGWvipUaSa20iEAcWSd5G9gDkQ7aK0cHeWsE6/Q1Yqa5qrkZyjooTam/QL8Fjia8= 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=lyrYV/h0; arc=none smtp.client-ip=209.85.222.169 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="lyrYV/h0" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7c54b651310so914530885a.0; Wed, 09 Apr 2025 07:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744210048; x=1744814848; 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=bUwLdZwmh+cy9A2SbSrrWRD9Fgt6AUa5s7mHmX38m6c=; b=lyrYV/h0cdMkEQIy/rhxFy/b7OvNTFt5gXb1a1lcPKN/QjyTgCh/gkzW+nFu9QUqlW VpJEdGOn4AxSFdI36RlYR5ID7w4Hz8ONGJuCUVk371d/x6ow4yJ/QQm5LmhPe7P9OFGL 1ArymWA3SsacRfkaSMcAcLGLAUAuvh5xMI8MPgr2XsLWyMwahzxxKymWYl3HnIn6Fpn3 AXl+DfkhWh33UhS5XzvHZl6lT1TS7eMZXMqOxexpUxora7+147bh/8aZQI5qAmTooRsp ne7gPwsOplL5LjKos3NoyPF3y2il6ZipIr1htPRuvCUKKn7ZOt8qIXdeM+kxaC9VrYDd F/hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210048; x=1744814848; 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=bUwLdZwmh+cy9A2SbSrrWRD9Fgt6AUa5s7mHmX38m6c=; b=AhnOf06T05scboCMiImYbUNvOtTAakGLsPFs/ZHvBwzncqIDLQuuIlGHkVhgT6PK/k 7addzrynkfJWK8BrstCJeYaK2P5n3KvSTvceVEPcy5XZbygNM8dMPhAJLwLTj1mEX79Q eWuUmSDh1gxXg4ThHOAiYqfNYIadZ1CyRZUGlu8xJnnMRqrebyDh2Po9gcdv5IaTCCUq s1WCZRvpZEHEFOLyThXAgdgurWJZjKJjmIGVef/LBWNjuOviKB8P3P5gB7dsDtz0t7dx I/3pZClGbs6NlPMV4I/jLyjFJmwm4w2l/ZslRBT1/cMwc8W0J3yo/gqLMg9k/xM5mIsj 39VQ== X-Forwarded-Encrypted: i=1; AJvYcCUVdwfucnZ6FWx3n8Yjfkt6yJpl7mYrhrBSvTONshrrJlr1tr2E3OOoKn5Kw09TjmWhB61NEf6MIlRf@vger.kernel.org, AJvYcCUenLIRgIbEOv4PYwti+GWVP1Lr/arFigulryxfM2zDGSrGqLa5sgdz6tdlZytZ6ZH+Yio+kmfZJm5GDzha@vger.kernel.org, AJvYcCUs6Wd52PjLRQv05yj7ji6rgFt/TExqhdyVvHFu3INf1YfWsojn3TRQA1GM+AReTRIPs7gchzB/2LK7@vger.kernel.org, AJvYcCV74j409QOye9/+aYKpsA/KrkQkgjqfS8ZXSnmSCpURLX9FX0ePMu8tblCO2Od+i6x1/9wrpi+9TEGl12NsfVR+@vger.kernel.org, AJvYcCWq7KwKyj6BTLNbtmZn4YbLy5Jw+UtH1Op3PqW496c2eLtQjXi24dDqqgRpSOH9h+UhFa7ocI/n/PTl68E=@vger.kernel.org, AJvYcCXfsLCP7Qglw8R5IxKx6OY2EbeN+i3plNDN4tNOq81/JKyEFT28OejwEBAxX5jhiDYWJ/Arv0dbi0M4y7yUsjs=@vger.kernel.org, AJvYcCXrZKq7LHK3HWmXy5hMpfVcNAN+p1HwghBm2u39vHvgUmgvbfDgiFJJQxQk36TffqdpE8tmKnd9@vger.kernel.org X-Gm-Message-State: AOJu0Yy+tQo2bxJJOSyyL5s7xYjQpuMhxkjj1HKGL1r6zm34C4sjGw6e vagLcAXBgO9elbBmexoTo5t7AHWNL9KJm72Yu/2lO9w8pm9jHYzGmP/sstEs X-Gm-Gg: ASbGncsVa86mazO4KAmuJpYMJv9/EPhDT9LN8y+8K0AC5Mcl2XrDAZbbNsEsBJXgzK6 dooT685R6gt4EOlIaX+hVgLH80Ir2pA9G9FVP/51CjW1UtP7Sr8FaF0tgkZaCwXw9s5rvcv5x7C Bep7eVGpjtO0qoTofu9ollYswiMAgdWAdiMNK6jb0DNnIXtfgIO4lp1UQGdN03xJYk6k7QK/rYG 2YYNYnCI65ALUcyNZDgVmYpmIuS5f+PIvLNnyJbtRJRBptKvNRxy2wOCPA0lHUaZNz71lE2LGpz GPLI/1UIPgE2YSlI9XpbY3OGRbgAOCwFos25x0tpQBA6EC7lpeHF/LwQzwreTeJNyeIFZydDD8z voOXDx4ubomfJkq8OLwrCw6A6QF3O/CCfPlt4v9Ual8cA X-Google-Smtp-Source: AGHT+IEtpm2maEl8wOrCcK7U+9nPKjcEayy9yuyC9vnFfyrE2QXcE2b1Bx+rFHLvmbOyvjQvRgGi/A== X-Received: by 2002:a05:620a:280d:b0:7c5:5d4b:e63b with SMTP id af79cd13be357-7c79de91e5fmr351879785a.38.1744210048520; Wed, 09 Apr 2025 07:47: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:3298]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47964eb9a8fsm8024461cf.49.2025.04.09.07.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:47:27 -0700 (PDT) From: Tamir Duberstein Date: Wed, 09 Apr 2025 10:47:19 -0400 Subject: [PATCH v8 2/6] rust: enable `clippy::ptr_cast_constness` lint Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250409-ptr-as-ptr-v8-2-3738061534ef@gmail.com> References: <20250409-ptr-as-ptr-v8-0-3738061534ef@gmail.com> In-Reply-To: <20250409-ptr-as-ptr-v8-0-3738061534ef@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 a reference-to-pointer coercion + `(*const Self).cast()`. Apply these changes and enable the lint -- no functional change intended. Link: https://rust-lang.github.io/rust-clippy/master/index.html#ptr_cast_constness [1] Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/kernel/block/mq/request.rs | 5 +++-- rust/kernel/dma.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 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..c9f8046af65c 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -69,7 +69,7 @@ pub(crate) unsafe fn aref_from_raw(ptr: *mut bindings::request) -> ARef { // INVARIANT: By the safety requirements of this function, invariants are upheld. // SAFETY: By the safety requirement of this function, we own a // reference count that we can pass to `ARef`. - unsafe { ARef::from_raw(NonNull::new_unchecked(ptr as *const Self as *mut Self)) } + unsafe { ARef::from_raw(NonNull::new_unchecked(ptr.cast())) } } /// Notify the block layer that a request is going to be processed now. @@ -151,11 +151,12 @@ pub(crate) unsafe fn wrapper_ptr(this: *mut Self) -> NonNull /// Return a reference to the [`RequestDataWrapper`] stored in the private /// area of the request structure. pub(crate) fn wrapper_ref(&self) -> &RequestDataWrapper { + let this: *const _ = self; // SAFETY: By type invariant, `self.0` is a valid allocation. Further, // the private data associated with this request is initialized and // valid. The existence of `&self` guarantees that the private data is // valid as a shared reference. - unsafe { Self::wrapper_ptr(self as *const Self as *mut Self).as_ref() } + unsafe { Self::wrapper_ptr(this.cast_mut()).as_ref() } } } diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs index f395d1a6fe48..43ecf3c2e860 100644 --- a/rust/kernel/dma.rs +++ b/rust/kernel/dma.rs @@ -186,7 +186,7 @@ pub fn alloc_attrs( dev: dev.into(), dma_handle, count, - cpu_addr: ret.cast(), + cpu_addr: ret.cast::(), dma_attrs, }) } From patchwork Wed Apr 9 14:47:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 879942 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 BA5492690D1; Wed, 9 Apr 2025 14:47:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210053; cv=none; b=AaaV1455ZjcXQDkNK8Y7x56yoVIlO0vl55/YXJPAQNNn3KtjPupdl7ZrM4wggOf77yd61iroJ5n//Ws/SkEnV8j+tvuaF5n3gtHAK1KfOPANBwfhkUEEIyf4kIbwONS0IO87ewSF1t5uBdV0EDfxDvQnI7m0uhHrLldnUp+TgE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210053; c=relaxed/simple; bh=aDDrOps01d2tlLzt3LaJGP74NrXJiZ8HlX3eJ61yYi0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DRm+GKuCqXVErcwGAo4ueQZShu+7bzVucCQa4vtDK9pw9dC/CVKdGCaz+AiiUR/A9xS/avG10EK/l0UnSi2AHO1GzgNdDHUd4v0RXA4XJL0W30E775oYE2JIYoqvfaHxDBiG08Y462nCCHjBbp70Zl9KsbNgFNQwS83W3YxY7M0= 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=FaO85uWI; arc=none smtp.client-ip=209.85.160.172 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="FaO85uWI" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-4774193fdffso98324041cf.1; Wed, 09 Apr 2025 07:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744210050; x=1744814850; 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=FaO85uWIfWP4u97GnxOZF2Ju9mQHwORGZ+xdCfz7av4Sn475m4LqIub4ruT57vpPOO 7IcQOLIJfPz/RjsXFDefr6rCh8PhifA9ozlF0i7W7GGjXVYySw1wz9J0d/F1ZGE6QCgd KMO9d5wdn18Q31c8fLTQno5/K7PgXLkcIx8q8i3tKboXhVmsNwRTV45jgbRO43xNk972 Zq5bVXfH/vLm8SpGL9D4iomQ9XXM7QywA8af2aENUz+/VKqCme8lxt2IP+E058QhxpRw xMbCuOrWoGfUerpXtQcyn8kJzXTCOce1lqWn/e0IzBR7uQ0CLEEirHy/bNwTNVpVRvKh ZWTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210050; x=1744814850; 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=QDKcG9n/NzXPATqJK3lLFKpY3NKbY3dKb6SuAfrnjpRNk9MQW/DVtBeX/7EKJxg22N nLcd95yjDvxRfJtkZqroLFYzdJMAniF6SND+ImfCPLfrNYHbuLL9CMcnNNOedB/C6et6 ayXBsiVGKrHe9In/6Gs9PXC8SiSNjrd0/ZOMPzbVlMhWnKPqZSPC7/f8Z4YTBWSk6gJe 7onYOOX6JDCXremPu7o1XV4heEaH9NmZjgckjYIZxclzuF6LtvrCpjJoFxueWBZ/8eq9 mVg3Gy/rsaT9UXCpkd4QDQ9U3scZarBGZRbIMj3W05pCf5IqVrn0i4Ob/FL6CdMkasLk IdGw== X-Forwarded-Encrypted: i=1; AJvYcCV1naJSn+PDXv7hQLs6zxsO96ImauGQrCprEHs0Wgh2EH3Pa722cyTP5Kfbn3ekCTxvURsJY81B13ayN3gLl0bd@vger.kernel.org, AJvYcCV4r47+i4wQ8Dupd9dXgD1fsApwCdUYHag6hfsaMvSIqnbV7KxzNGFFPOZqOkFh2MxrL0ZeNO5X9Jhq@vger.kernel.org, AJvYcCVJYXqUSbvsTAfdCjl/6Ky7Y7ckft58sqrauWupJqCmhpxkn7KjL0xiGh4656eQ7/a/ARklWlwr@vger.kernel.org, AJvYcCWWETjtgDfS3PNCKZVUzMpkUumZYYuuWvcBK+ifDsB5a+Gi1I8ebqCyBy944OItT2yITmUiK2bHklCzggJUCGo=@vger.kernel.org, AJvYcCWWVv6xb55T4t2rKVyiFK7QsUYFWdEZkcDcADeB6Kx6gnSFPKN2SZ1aEOhFaP54JAxfRRTBYZmG1lfGYUz7@vger.kernel.org, AJvYcCX1rRNDtW+Pxafm4BUle3C48FnlV3DDQIOzkY+XsQ9JUWPKZ6/Df4Uf+7tI+sLy8O3mWo7TSDvRVebD@vger.kernel.org, AJvYcCXNnMx6nr5JFp+I4Smy9QoFTFjvYXdq5cLxlyn7ffYwbPbwDeLiOqM7ItXa7XLeboDdFSxrWi16ZEbn2Q4=@vger.kernel.org X-Gm-Message-State: AOJu0YwnizJ7So2VXMy1OdH6KEpQuZwtlhxlpBqwMUJgOvWzEq0H+KmU b4eivOTsDr6K45Dt4HeuqDezTiHcDxxoCE1UUyQw0RiWSn9kA8F9 X-Gm-Gg: ASbGncsaAYCBp97GGBV5yBxCRw7WvWSwLYYtV1agD6EzyxWXRtz0bWj3ErzF9PFrx4d 7KK50PIs4cCkw/LS/dNXzMploNUnT1NvF6FrcPwVCveDfZvzna6e+qM38xOfNPOOYoIto17aoYw u+gjNkUIBvMZRCik0N8j/p/BQTN2KEHripQngY/dIbCL7vvRGYQAXnKhyGEoDabNqpZX34LPWna 5vOQ8XTNZC+AnrZJLOo17/eonQoHo4HmIBuVNtdMCrNqL4X+Omg2QfRxf5XJdTouZ2gRwIHrGO9 bGCoMpl4ElSuY15HgkCgUCEVjDL+sc9zsPRxylLSXzyl34Z8DDYKiZ0X5tWL/w1gCmPZFKCFom3 Qyp4cYTT1Y07Bdhi6RZw1gAXuR3m39siDGp1G2eTPSiuI X-Google-Smtp-Source: AGHT+IH9LWDhCYt3RFzLjRakH45YjPiReCb3dS1+Uu22JX78lQZJIGgZ5/arLIqBQVHKNepy2RpTnw== X-Received: by 2002:a05:622a:1116:b0:477:1ee1:23d9 with SMTP id d75a77b69052e-479600a3fe5mr42498781cf.20.1744210050275; Wed, 09 Apr 2025 07:47: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:3298]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47964eb9a8fsm8024461cf.49.2025.04.09.07.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:47:29 -0700 (PDT) From: Tamir Duberstein Date: Wed, 09 Apr 2025 10:47:20 -0400 Subject: [PATCH v8 3/6] rust: enable `clippy::as_ptr_cast_mut` lint Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250409-ptr-as-ptr-v8-3-3738061534ef@gmail.com> References: <20250409-ptr-as-ptr-v8-0-3738061534ef@gmail.com> In-Reply-To: <20250409-ptr-as-ptr-v8-0-3738061534ef@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 --- 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 9 14:47:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 879477 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (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 8B32D269AF5; Wed, 9 Apr 2025 14:47:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210056; cv=none; b=m10YCyPM3PEnhPpJzOYQ7SD0V+MchiEBAfIP/HKY4jFZBlAJ36b/i8fcKQwqEekapty5400szeQ0BevWrxyo9v6uQfMv3lnKAyoX2u7FUhLaNCRcDnd26X/W/D/QYS1vVaSZ5b7tvL6/rjpauaTw6Ofy2PbTIOmC1aiHKaib2gE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210056; c=relaxed/simple; bh=5UmLEVObapEnvipAfSyAuaBvNO6RN4ZH2PMv3QOMuP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IzmKN1RGJfbBxc9QBFtNaWqyPdSO7f/pN1gfuxuN6hRPrdPlOvfQaHdVz+tBRpuEtrcekb9Zpi7snhqinoH+zw2dxHvgtfembTY40VHY8wqO98kuicUk2dRehXONk2uIW7NEam8S59ylMevnT3xQ5l5WwCSOoJ0Iuuyyqx3rujU= 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=hJ9GBh0A; arc=none smtp.client-ip=209.85.160.173 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="hJ9GBh0A" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-4768f90bf36so62469381cf.0; Wed, 09 Apr 2025 07:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744210052; x=1744814852; 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=h4UPBdd5SJXFrhjmgY68FJk5v3e9Xn2t23RkFbhT7Aw=; b=hJ9GBh0Avn1v/pC9GQvftmumn5embPfOPZza/g7F1QOkSb9+j9A4VNvNg11IiHW8Ky JtckqErk4EkGSAUzqFgSh1gpSqByX2rmTV9eEIDXhMk46aHt5cEDdiFo/79MRv4bLWgy RAhRIBKiK2GtzF4oSfM6xGSsFOSomo0dX64GO2SkFD9Fsb45ur7IsdX3154mXXQZYZjv nN6x2lbQh+Z3VVFOLu6xeWN1LCVEh6jByPwOyGfyFybRkrELYR7YlKUSaLvmP9vpRNdg STbqiRV/Lcvy+tvAsE2+4fxmAKWIFEROFggvaXGVKdeyKdWwwTJq3qIogr6K82S47J7q /nyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210052; x=1744814852; 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=h4UPBdd5SJXFrhjmgY68FJk5v3e9Xn2t23RkFbhT7Aw=; b=mgwaUvu4MDC17Wr65W1BzO1EugpM0aZgH5rfBReZNPjBQ2XMOkjFT2M/0DlE506eth d+4m4TE3cX5apttJbFEQQG1RxrQXPv4n6HWlOJpKsTfY9O8ckMNSdWVleF8CjmNAJCpK nIzXi85JD0GRTRCTZfgijvohrDQLnzvcLly9w2Iu0E/61MedIPM/Yhd6aMYyfNQPmcCw u67/fL9wUNedQofkMtsdgkNKHN3KC1VHqW4Q0Kp4L18gCZy7OI0FEKTQH5YLV9aPobTj d/bL3d1/m2Lmhg99XeESerwrOC+nuqYt08CBWMGKsm22A6FTNCNORRm9C18GKml7tId7 YHuw== X-Forwarded-Encrypted: i=1; AJvYcCUPfz4kgsJExc72SDfSy6WGPGWDi0SrBGqZS8UgFjbNTTGmIq5M63BtUQ4b4qIRGIjsKe9K37K+kD8y@vger.kernel.org, AJvYcCUhCjKTnjh2yVTk4wvQ7j05kM0z+166vAfPFrD82CikaGVh11EjHFRg0mBpvVXS9DsZi7kpctMQ@vger.kernel.org, AJvYcCV02gkBbFZjKTTdBgKJgRL/juCW7OaaOUKXdpQEg+NvEqR1moOEUIZ+dbXwzDWiOjJZy2W/veT7cBu03MddZrM=@vger.kernel.org, AJvYcCWLIbXgo3x/b9XRr3xq6dhlF+8/HXP+uGnWf5dYo/NgnY6ERgQaScO6kMezNIVMun1mBiL9r4M67CaD2sZU@vger.kernel.org, AJvYcCWVPR3OsZFKPjEQulXITsKmOxBMbX8WNwM6t7ZYGxEDYdHg1hWhHFqteBgVcrahsxEKQeTXX9be8VRf6Ig=@vger.kernel.org, AJvYcCWgclncYSasry8X9gxSIGJBo/x63H0J4fauolEYrr84M18C8RnWxUPVnfkr1Gu0Xdl4yIoXvh6DgqP8@vger.kernel.org, AJvYcCXtnxvsavRUoInc7BIT/H5rIGh28LB/rQS9pqsn1Zeo4rvr8sZEK6fDXdCaVvRuYX5fBYeNW6uQrV+qRhVnZ2MT@vger.kernel.org X-Gm-Message-State: AOJu0Yxhdmc872eZPcYpVSDFmb5qEGFlJDqW47dAP9OHtBuYuwoJQ2L+ vxX1QHab59YTUVo2nAtqXnFnz8w/cHv3ONzA2VbOkd1aZ8zVENzw X-Gm-Gg: ASbGncvVDLix9QOQ2AN1ihy/WO3STSuhYtQgRzGHDEEe7ZedfacwUl2JKr6ee39VSuw AylfY/+SQEvWeA7yJb4RXy0HWOfW9dv+vGX6EoDSAj0Isp48ZzHAjaIGlheBJoKyQJ23rDdwfoS CP0OSaG7AUFStxXvDobflpaEOyXIzbp50mB5HhNo0g2aGytpgV1EUT3uIxtzCf4bDuXWJdyklzU 7/g1tqka0VcvWeBB2I2UcZPCAET4CRfAUFUpWZFBmD7X7bmQcBzMw2EPIUyNCOfOKe6MsSibbus HVxujmeWiNyYwOprZ8oQDBN+o7R8T7dHYMnhx6fb9Q+ia6/jTTDqcSMMSKGuojZcnlexZfiKZoQ uVp1OLfc3S85BAr2M3QYJ1htfo1GWgSWKKgX7/NhwulrK X-Google-Smtp-Source: AGHT+IHYKO7pvQNcSqmFLErafer3Zu2+iSrCqMO0EiGXQZCf4IjjwADj+gDflwMqdkbewLvTvuX/Yg== X-Received: by 2002:ac8:7f42:0:b0:476:b73c:4ad2 with SMTP id d75a77b69052e-47960079dcbmr27062361cf.9.1744210052013; Wed, 09 Apr 2025 07:47:32 -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:3298]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47964eb9a8fsm8024461cf.49.2025.04.09.07.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:47:31 -0700 (PDT) From: Tamir Duberstein Date: Wed, 09 Apr 2025 10:47:21 -0400 Subject: [PATCH v8 4/6] rust: enable `clippy::as_underscore` lint Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250409-ptr-as-ptr-v8-4-3738061534ef@gmail.com> References: <20250409-ptr-as-ptr-v8-0-3738061534ef@gmail.com> In-Reply-To: <20250409-ptr-as-ptr-v8-0-3738061534ef@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 c9f8046af65c..807a72de6455 100644 --- a/rust/kernel/block/mq/request.rs +++ b/rust/kernel/block/mq/request.rs @@ -125,7 +125,7 @@ pub fn end_ok(this: ARef) -> Result<(), ARef> { // success of the call to `try_set_end` guarantees that there are no // `ARef`s pointing to this request. Therefore it is safe to hand it // back to the block layer. - unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK_STS_OK as _) }; + unsafe { bindings::blk_mq_end_request(request_ptr, bindings::BLK_STS_OK as u8) }; Ok(()) } diff --git a/rust/kernel/device_id.rs b/rust/kernel/device_id.rs index e5859217a579..4063f09d76d9 100644 --- a/rust/kernel/device_id.rs +++ b/rust/kernel/device_id.rs @@ -82,7 +82,7 @@ impl IdArray { unsafe { raw_ids[i] .as_mut_ptr() - .byte_offset(T::DRIVER_DATA_OFFSET as _) + .byte_add(T::DRIVER_DATA_OFFSET) .cast::() .write(i); } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 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 9 14:47:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 879941 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 ED00526A0D3; Wed, 9 Apr 2025 14:47:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210057; cv=none; b=Q1UI/WkOn7sBnRpI+SR3/Dt4yPmul2y9pSipvs2C9FYnrISsT8FqceMdPHpQuPl+tKFYPpJqh/wOfaCcDMp/kPJdLuKLAM3u0Ex25iAXAdA8iyiHeeCMm0GBZOX1VHZQawPFDzHFFLQxmzONqq2+28k/CKpX6Y63uAIKjhP0HgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210057; c=relaxed/simple; bh=VseNrgxZWUIHk+y/wsE5kJZL6CjEpX2Ee6VESV720T0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lkMOwsGY3Kn3I6wilL1gwdxr1WyJLTUbTUWIJUO/gHLtaU6IZDgaSGoae6m3lXgWW9c7uRiU4RuruHqTgXeV+1lzHB+RZ7IHbLlepElsg8COaHNVKVRSWLE6sO4uooeafYxC1Y4Wgi/SM959H20Wt2oEMeYqHmw3GhABY1VRbEo= 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=C2OBrX9E; arc=none smtp.client-ip=209.85.160.182 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="C2OBrX9E" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-4769f3e19a9so46342981cf.0; Wed, 09 Apr 2025 07:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744210055; x=1744814855; 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=C2OBrX9E6EO0F6uGC1tB3gyVuymDSeSjaWG+MT5ROHkIjXT2lZCloc7UChOJlUM7MO vqfgdmSXjZWzF0ZdiGvAqgDnbPHHxvNfFmjCTpDjKk68eccjmeHzF07S6mgHA/067UZ2 zuSkA41KjrmlgOk7ikITFD5/LZhHkReEeL4j1IYXLOUqJ67brvEno+LleX5vCDvRmRHM lEwMlIiTbuDWx2CfemJ4zdOspmKjl3oeODOI3j40SHu5GYL0n12XXBY/G2qmKD1lN99v WW6JDPh28IllQ20EE353GXGGV7Q+/CL8PadmmGOnN6KBPK35SnSBiV8LRWoWejRy3l9S BAnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210055; x=1744814855; 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=Iqh1pwxAeo27RoI89N66XHpd8cflHvXdEdSFjPWlfA4Au2OywatR6lHplUkO17+nLA Lbz3647mLVqj4G+99lLK2gAgvpvZt0zNJvS+XP60uTPSedqEamhW0+ZQo0w4Yd274Yia OlxvZMYIpBMpaGocUYIzYeenw9zYo0i1MoziFD1s/lAQpj3Ccvm6X6S7E9sDgLZLBda8 XafVZDozEzmAttbcpohIxdUWBNJTamgM1qWXo3062xpRYVs2F8/+wKLxHier6Bt52eEQ 1zepmjGYiDNHwzyH/NO0Vq30VN6LqiMW14qoqcas/K9E4pDyEfxDMyeMLWtYUYeEMweA YS/g== X-Forwarded-Encrypted: i=1; AJvYcCUKYbN96w7U3Ct9T5ZYGJ8vXHKeSdcqirvLnH/iDEfHWs8korhLAaRjgWMW/HwM74l4WZjH65uxzqlxDzJI@vger.kernel.org, AJvYcCVLn8FVwUYC1ukypdYTbHSIT34lR3ZSsjfkIFDqkVsN4hYzVIi6DKhy6sgEL8bvYOnG7C/sVpExjTmd@vger.kernel.org, AJvYcCVlKzu6gvRzt5FwXvntOkqlrjvvQ7QTphdRHtsjV7AB12+iyr2VzSuDhOZKjzgvueJiP+vLoKtDnHWPynfSHsU=@vger.kernel.org, AJvYcCXMBUZn660QuBgiFT3knM5kw6y4PQ3ldPnOECH3i2BTW3+452/SHPZ/a46x/UELAwr5jAP1j62jhTxEBVY=@vger.kernel.org, AJvYcCXWuq+zt8WFc4UvZFy9xZbmy5GvPJ0n0R6q0i0NhgSzdnhj3eXK8GcUgfuX26zcs7+Ug/OhnqJ9v0OV@vger.kernel.org, AJvYcCXesBr02d8n7ri2Gp+aSIRY27PEmn+cchQJbQudLDaD550GLZ0U2Xj/lr9lx2+GHmM4nD00i4DGfuxtNB5hrafw@vger.kernel.org, AJvYcCXy3TCAddtPMRxwmwrdYJ+MBPJpF/6tmDyA0hMBwuNefTQK7uWU3YNQLWwkdreH/YFqzpX5Kp37@vger.kernel.org X-Gm-Message-State: AOJu0Yw5HM9eyBj0VpxAO2v+xEeWlwI8Ss7uE625hRgvAqzMuPAm8PCR wss/CTVUvUUSTPqqPbRz93D/6CxPe5xb21Ji8+dPvOi1ewBOIei7vmg3au83 X-Gm-Gg: ASbGncsgPsdX7dSlBTCtYyKuUdYqL79v8AfC23EXmcojw6zXRGgfeuGxuy4Idwt2J7o q5W/OclVJr0rAOG4JasyuCHJGD93jcitCRx0Jm4lKjBDQy3eaD68GAgQsaAUPdN1oSQPsfFRgiY X/HFpAu3OhjNj2YhTKW8Wds50qj767fngUy8SWOv9NxcBhaTCboq2K0WkuR72071CQrV4QSNjdI pn7t80uMXvBuW7V81z2QsJm+MYoyo5UxWWmNUglTxLsNF7xbOv61d2W64nhN5yFkQisHw/0nws+ cl6HchMjEoHSbou8HPzgLR3ZKFCWuyMnG+iYyXJroRxLnszl3QNcX0kSshpA+YX05mVARkjo2NP QNBezAFSDm6Hqez+mr1gZjWRS8HesRL/h1kPWmrpKnTuP X-Google-Smtp-Source: AGHT+IFjhdP44pb3CStlgR2qF4sOpfTRrfshVqxXF0+mnIO0RFcA4QHnh6zvrwC0E40Xwzs6eqjRtQ== X-Received: by 2002:ac8:7f10:0:b0:477:6e6a:7cfe with SMTP id d75a77b69052e-4795f1e2b9emr40301301cf.0.1744210054669; Wed, 09 Apr 2025 07:47:34 -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:3298]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47964eb9a8fsm8024461cf.49.2025.04.09.07.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:47:33 -0700 (PDT) From: Tamir Duberstein Date: Wed, 09 Apr 2025 10:47:22 -0400 Subject: [PATCH v8 5/6] rust: enable `clippy::cast_lossless` lint Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250409-ptr-as-ptr-v8-5-3738061534ef@gmail.com> References: <20250409-ptr-as-ptr-v8-0-3738061534ef@gmail.com> In-Reply-To: <20250409-ptr-as-ptr-v8-0-3738061534ef@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 9 14:47:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 879476 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 D3F5826AAAA; Wed, 9 Apr 2025 14:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210059; cv=none; b=EBAcIsM5xLPoiBWheGAK7QzsANHtE2u+0eqO4PLm8m+KzCU+sueimEToQfI8kLFNqsadiN3xQL/XrvCGXb8ME8e9kEA7huslrLEFYLAY/M0leKYJoL2aopBQQ/v1VBQ/TuV8/tXp1SWGZRBec3qW3FcIuhY1ybd4+NfFJAlw1zE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744210059; c=relaxed/simple; bh=QE1XMyiEfHKVDVPNBt1oL3c+f45lsJThYSxbdchE9vs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sBrJ5chdJrHchYPgfKTtI3/NUgZ3aXRGxbpuTrYBtdGPDzetym8wvpFLQ91Zi02MuSJKC4zkKX67yndaawm5N0gBytUHs47JjJVza+djasOZHIigTiOtqo8/R52YDvO6yaewbaP/RBqKQeDkOB8y7Ll0VMuD8EmRqs+bee3aUWA= 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=HSDS/mD1; arc=none smtp.client-ip=209.85.160.179 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="HSDS/mD1" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-47692b9d059so34572601cf.3; Wed, 09 Apr 2025 07:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744210057; x=1744814857; 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=zdDH+qr7UBoA/lgIB3GeZraE2OIbymXMH9TLc56aCLg=; b=HSDS/mD1UAWmMkEy56VKtH6IZlmEu3N1tpbANV1fMKomEa7hCa/k9RPxPc50f1sGp1 rKtB+XqxN7yDZq+zAieJzce7Yils7OZXreBNm57obtFlOkW1c2vapeeM1ln0SIPMybkf kkwLeFucI2TTL9MHR0fVmFOeYsxPZVOeQtrFv/ir7f14y993mcRr2WfGXVuHlyPQmozK bLWPIveM7osq3XVSYM/+eyqxjtzhy8I4QfbFqudOH1rSrRW30pF26s+PLqvjhparreRX +bsQkqVVjQfAXKCPC1Eshx7n5uJ8XxqhKf7rZSrTTAcTcOumhn+/n4bZ0A7svPiRQTKa yZ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744210057; x=1744814857; 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=zdDH+qr7UBoA/lgIB3GeZraE2OIbymXMH9TLc56aCLg=; b=byfChugHBH+XCoMlWIe0sZRrct55p1iZh8z1ktn50iUS9dLUTMvkbOaBegz8CFXpSZ ZUlnebzOsvBFDkEARVwj20bd+RU+e0FyMB60oeXt73RStW1FfJhqKpjIK7e87/MG8o1n mw3I90yxDwCW0gNAI7qZgQWdYAz24ylGZui+pBM7xR3nVFtx44SPyscoAU3jQN7KATbt 9rNVB6f8T+lYmLBHBWIjX7w+wOPT2180ZCVt9/XaO2KZooDv/jRXZmSG9LjYcicHODyF HKnF/7CZhaZRK+lOXg/7hhsnJAGQwG3BDs3CaGt2ygm3lOlh8cvnqc4+eADtAqZWSZRi QbuA== X-Forwarded-Encrypted: i=1; AJvYcCUz1B/yAh79EZQKTxppzR1B4Jqje8NTdm1p0abRbLOyfOSKWDatrL/mIxvorGgjRz3Ej0AZQJUp@vger.kernel.org, AJvYcCV44OyIVay3X/EdS1xcNTw/fgOU6qerGZosN1Toxo4VyZ5GDyKh8yTkRAz2+bOjCP7jfPQDdb9ZG86UKJtPLvo=@vger.kernel.org, AJvYcCVgQo1JuazwgIT9BFRCaOAG6yd/ZXoBo9GxxCz1Hud1Zd1u8HYvoh3120DtYZextM2BqzfPyH9RoOWVTDz3@vger.kernel.org, AJvYcCVhLdEAijLfauEdht0YfXXbsIZ2IS9vu4Xc8S408aqqQ8vpzK/4Uw1z4mJVS8ttaA074hMP9Z9ntEhEo++/tIIT@vger.kernel.org, AJvYcCW15GNwYgkaBMjeOwVWXLmYgVHzZXxX0UG4806cAzXanUriT/ZzLmV+jzGAL9i4DTnnKCH49UA/Huq6@vger.kernel.org, AJvYcCWXRSCCFwdmLNjaJUuzvbL/yor5WyJJ6W8X2uFOqFpG20x5/JojI1X3hxnaBDeKFtL+4HAPoLotnkrU@vger.kernel.org, AJvYcCWrFe51eZBIRrR2QuDStsiOeDvc22IGEQDwXijI07BooNu0AqbzZTB+Lp7babMEA8q4Q+vDVOt5xDurnKk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8l48HZqOkMe9PtVH6yJdQsMviuZY489GXfygrLs1G8c2NjKfy LIvUl+3ez6IeSpu480TZ+qsoJC8QnIJCZLbQF1Y8cHNeY272G0nc X-Gm-Gg: ASbGnctK9kWguV3sj3vhVtTxmSiT/grLrh5uCi+FsPlpIXbHH9MJ7CEmkIieaUd8Wk6 u0l1++Fp5n6Dx66bxomZo8gB3h4FM5DjdX9tovYB/dg0qk1CfhjeOXhDFDIrIUQ+TdXtsKFEq1I zA1corVD5wZPkV9xHOzcHAmguPxwiM1YyxvWLoIaAtX4zlWaat5whWmu5OmOvoEL/TT8q1gsclo HaMivfd7DT/QNaZkgeP7X0RyMSKzXHKoYaXkAQB/vHx2fbGzFSaoAceRV1s1dIUpOfeJp4/AmSu bgYbUarjCGZ2Eys5qocddkY0Kqgu66WFxFj4SC469Dvu7ixP9/IBu9Mcujz59VFgXhvyuYz1+uD 1um5Lv0fmeZ8bM7g/tJHTjdPAgZudlHRbZDjjRB86oTbtBsDzY4klvw0= X-Google-Smtp-Source: AGHT+IFr7umJxKzgzhGh/oy0Dih4g5haX41vEbYRI8F+ERkJbmGl9jimDDp7gEjubuafDokQiSZEmA== X-Received: by 2002:ac8:7d4c:0:b0:476:8cad:72d7 with SMTP id d75a77b69052e-4796007888bmr32351221cf.8.1744210056456; Wed, 09 Apr 2025 07:47:36 -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:3298]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-47964eb9a8fsm8024461cf.49.2025.04.09.07.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:47:35 -0700 (PDT) From: Tamir Duberstein Date: Wed, 09 Apr 2025 10:47:23 -0400 Subject: [PATCH v8 6/6] rust: enable `clippy::ref_as_ptr` lint Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250409-ptr-as-ptr-v8-6-3738061534ef@gmail.com> References: <20250409-ptr-as-ptr-v8-0-3738061534ef@gmail.com> In-Reply-To: <20250409-ptr-as-ptr-v8-0-3738061534ef@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/ Signed-off-by: Tamir Duberstein --- Makefile | 1 + rust/bindings/lib.rs | 1 + rust/kernel/device_id.rs | 3 ++- rust/kernel/fs/file.rs | 3 ++- rust/kernel/str.rs | 6 ++++-- rust/kernel/uaccess.rs | 10 ++++------ rust/uapi/lib.rs | 1 + 7 files changed, 15 insertions(+), 10 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..37cc03d1df4c 100644 --- a/rust/kernel/device_id.rs +++ b/rust/kernel/device_id.rs @@ -136,7 +136,8 @@ impl IdTable for IdArray { fn as_ptr(&self) -> *const T::RawType { // This cannot be `self.ids.as_ptr()`, as the return pointer must have correct provenance // to access the sentinel. - (self as *const Self).cast() + let this: *const Self = self; + this.cast() } fn id(&self, index: usize) -> &T::RawType { diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs index 791f493ada10..559a4bfa123f 100644 --- a/rust/kernel/fs/file.rs +++ b/rust/kernel/fs/file.rs @@ -359,12 +359,13 @@ impl core::ops::Deref for File { type Target = LocalFile; #[inline] fn deref(&self) -> &LocalFile { + let this: *const Self = self; // SAFETY: The caller provides a `&File`, and since it is a reference, it must point at a // valid file for the desired duration. // // By the type invariants, there are no `fdget_pos` calls that did not take the // `f_pos_lock` mutex. - unsafe { LocalFile::from_raw_file((self as *const Self).cast()) } + unsafe { LocalFile::from_raw_file(this.cast()) } } } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 40034f77fc2f..75b4a18c67c4 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -28,8 +28,9 @@ pub const fn is_empty(&self) -> bool { /// Creates a [`BStr`] from a `[u8]`. #[inline] pub const fn from_bytes(bytes: &[u8]) -> &Self { + let bytes: *const [u8] = bytes; // SAFETY: `BStr` is transparent to `[u8]`. - unsafe { &*(bytes as *const [u8] as *const BStr) } + unsafe { &*(bytes as *const BStr) } } /// Strip a prefix from `self`. Delegates to [`slice::strip_prefix`]. @@ -289,8 +290,9 @@ pub const fn from_bytes_with_nul(bytes: &[u8]) -> Result<&Self, CStrConvertError /// `NUL` byte (or the string will be truncated). #[inline] pub unsafe fn from_bytes_with_nul_unchecked_mut(bytes: &mut [u8]) -> &mut CStr { + let bytes: *mut [u8] = bytes; // SAFETY: Properties of `bytes` guaranteed by the safety precondition. - unsafe { &mut *(bytes as *mut [u8] as *mut CStr) } + unsafe { &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..7a6fc78fc314 100644 --- a/rust/kernel/uaccess.rs +++ b/rust/kernel/uaccess.rs @@ -240,9 +240,10 @@ pub fn read_raw(&mut self, out: &mut [MaybeUninit]) -> Result { /// Fails with [`EFAULT`] if the read happens on a bad address, or if the read goes out of /// bounds of this [`UserSliceReader`]. This call may modify `out` even if it returns an error. pub fn read_slice(&mut self, out: &mut [u8]) -> Result { + let out: *mut [u8] = out; // 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 *(out as *mut [MaybeUninit]) }; self.read_raw(out) } @@ -348,6 +349,7 @@ pub fn write(&mut self, value: &T) -> Result { if len > self.length { return Err(EFAULT); } + let value: *const T = value; // SAFETY: The reference points to a value of type `T`, so it is valid for reading // `size_of::()` bytes. // @@ -355,11 +357,7 @@ pub fn write(&mut self, value: &T) -> Result { // kernel pointer. This mirrors the logic on the C side that skips the check when the length // is a compile-time constant. let res = unsafe { - bindings::_copy_to_user( - self.ptr as *mut c_void, - (value as *const T).cast::(), - len, - ) + bindings::_copy_to_user(self.ptr as *mut c_void, value.cast::(), len) }; if res != 0 { return Err(EFAULT); 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,