From patchwork Sun Feb 2 12:20:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 13956502 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.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 051D11D88BF; Sun, 2 Feb 2025 12:20:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498862; cv=none; b=H0c2U00FSsiM4LPPAT7/nmQtENPLiT0b9dH/MAb8j4yVo100RtTgxe/kbV3MlUgLl5iYZFe2UnNd00PWVlTPFz3x4woCC+YClAG1+8neyiGYGgeWT9gLZ1upHmQA0Cc19zdJcr81xDqdzbPxJbjpXwKDBEF/SsEHPLmtPHMuLto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738498862; c=relaxed/simple; bh=PhHQItICWXuIg6fvhEnV1tl4/7GZ7OAQhLK8n00WFLY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bFfl7QALyXndHLr8vnUd7nOqXslM5rSFxigQvT7fzidH5oCNYawKIGO4u2In9EnxH6M608USpic/DH9Pd8UJerA0NKueUJ5sAASt2NNgCmSp1IqBMhrmtU1xGrhhnv1JOh4Anc2vlJb+C+Rd4kXfn1jye/lD1weGFMBzduzkspA= 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=i/DEwvdm; arc=none smtp.client-ip=209.85.160.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="i/DEwvdm" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4679eacf2c5so31979231cf.0; Sun, 02 Feb 2025 04:20:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738498859; x=1739103659; 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=+iDAJXMmYM90FFecEvdtPN6EQd1bt2bRs+UInsqj0Fg=; b=i/DEwvdmWZYdJ7Ppht/HeAewSKGxxJAkB9rpa9za4Staun94iEr2OL+QV4jiPKjzvR LJzVp/uis79z6LWZEXFmUAqJ8zw2rGuU2kzvyM7HfMF2EoC96QPqMuPtd4+NDZZybS2N jmk7UwyQDcHwwgWivFK0NV9vFPDE8Is3JIWgmbJi+rfjxgj+878JgxT9vY4+nAiP9Fi4 NqrareGa5qUlsH3u29vuPbBtXWyXJrFVX/Qzdz7d0xcpj1a0gS+4KjLtUBzFTY+Ru0tN 2tHbDln80/vgSZeDD22FELDIjnryk5u4H7QWf7tnLTrFxdf0cmhe+py4BlQqupzw7ixM hE9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738498859; x=1739103659; 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=+iDAJXMmYM90FFecEvdtPN6EQd1bt2bRs+UInsqj0Fg=; b=V9gwKzGZbrXiXnmtXjNSHnASM1bWDkITKNYX1tBLwbVWLyUgcv3EXEJbJSyBoPLXml Zr+++OLva7u7B6m/iU/zEP75SyDfnVicf/wkL2RjGx81EPr+/xRugwdkYvSBLd1lYOQn Kvne3ybyqAehqSCyN0Ymitc3ecvTXm5ATJvLPJX9ZAlCPNuJWMBqvk8qmHjpFa4reigi /1cUagYdXFgnRrVfHQ9U54HE9A5OXKHqkTok+pJpDus72l5lT9L2y7FOSS6A9WPyjm30 /fzV16+weg2vuUWcGExJm6Ss67KQIeJ35v7XNOf0JzD82+p7ADPlnHknlrpTA0bWfQ+w ovVg== X-Forwarded-Encrypted: i=1; AJvYcCX2XvAE9KvX6CTCSQ+Imw43TPfT3zWOeWtiA2UYAX7fiH83IycQXGyaxshUBB9LYQtzV1nDulEj2GzlySQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzZ8gA5ul60aCfLqzHMR27WK/OX43tkNiTOG9SoNVjs0FchRGGj bpz/QhmHkcQTRMXtB+jVpqUUN/BqYpGjImSRWAZ7n/bRQ3JgTMpC X-Gm-Gg: ASbGncs/1fBQmbLzJbH0+HUSMFsIM3YOMC0kVa+6GwNmVknc6kuSm9EjSqy54WAYlgb q5u5pGvDcW+/OdIi8Q5l1Zxgnw5n3uQDKt5FGdz4sHFAcRqJnIFAs9fPEjIUTyCE/Co/LDOAIUJ DsySf3t/+q4fka1Wp/BKYaZEj7TP5KlqXOiyBTlcWQ2VeHCiP+NOKKkQnX4Lem80gfCwB1rjP01 amoJu/tkfS1Ta2x2IAvrN5+En9qNyCPO35EL3v5BUgVRdXEccs3Dr4sQznxdRBuna9vq49i/t42 dIe2csCAGbQj3XVafF7LfgI06CiZrXotw2woSZ4= X-Google-Smtp-Source: AGHT+IHnHG8Ymcs6mI05GBRBFrUZzgR9jwY5CS/PiRTnYH7tklfS4ZgIW9SwUKIcH9OXrjbOnuIlmQ== X-Received: by 2002:ac8:58cb:0:b0:467:622d:896c with SMTP id d75a77b69052e-46fd0bbdb19mr269344111cf.46.1738498858538; Sun, 02 Feb 2025 04:20:58 -0800 (PST) Received: from tamird-mac.local ([2600:4041:5be7:7c00:f07f:fb14:288d:6f1e]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46fdf1728efsm37700331cf.62.2025.02.02.04.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 04:20:57 -0800 (PST) From: Tamir Duberstein Date: Sun, 02 Feb 2025 07:20:47 -0500 Subject: [PATCH v6 2/4] rust: replace `CStr` with `core::ffi::CStr` Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250202-cstr-core-v6-2-8469cd6d29fd@gmail.com> References: <20250202-cstr-core-v6-0-8469cd6d29fd@gmail.com> In-Reply-To: <20250202-cstr-core-v6-0-8469cd6d29fd@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev `std::ffi::CStr` was moved to `core::ffi::CStr` in Rust 1.64. Replace `kernel::str::CStr` with `core::ffi::CStr` now that we can. `kernel::str::CStr::{from,as}_char_ptr` live on as free functions in `kernel::str` to paper over the difference between `core::ffi::c_char` and `kernel::ffi::char`; see the code comment on the latter type for details. C-String literals were added in Rust 1.77. Opportunistically replace instances of `kernel::c_str!` with C-String literals where other code changes were already necessary; the rest will be done in a later commit. Signed-off-by: Tamir Duberstein --- drivers/gpu/drm/drm_panic_qr.rs | 2 +- rust/kernel/device.rs | 5 +- rust/kernel/error.rs | 4 +- rust/kernel/firmware.rs | 2 +- rust/kernel/kunit.rs | 4 +- rust/kernel/miscdevice.rs | 2 +- rust/kernel/net/phy.rs | 2 +- rust/kernel/prelude.rs | 5 +- rust/kernel/seq_file.rs | 4 +- rust/kernel/str.rs | 449 ++++++---------------------------------- rust/kernel/sync/condvar.rs | 2 +- rust/kernel/sync/lock.rs | 2 +- rust/kernel/sync/lock/global.rs | 2 +- rust/kernel/workqueue.rs | 2 +- 14 files changed, 88 insertions(+), 399 deletions(-) diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs index bcf248f69252..ef294017888e 100644 --- a/drivers/gpu/drm/drm_panic_qr.rs +++ b/drivers/gpu/drm/drm_panic_qr.rs @@ -958,7 +958,7 @@ fn draw_all(&mut self, data: impl Iterator) { } else { // SAFETY: The caller ensures that `url` is a valid pointer to a // nul-terminated string. - let url_cstr: &CStr = unsafe { CStr::from_char_ptr(url) }; + let url_cstr: &CStr = unsafe { kernel::str::from_char_ptr(url) }; let segments = &[ &Segment::Binary(url_cstr.as_bytes()), &Segment::Numeric(&data_slice[0..data_len]), diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index d5e6a19ff6b7..f97c409aaba9 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -10,9 +10,6 @@ }; use core::{fmt, ptr}; -#[cfg(CONFIG_PRINTK)] -use crate::c_str; - /// A reference-counted device. /// /// This structure represents the Rust abstraction for a C `struct device`. This implementation @@ -175,7 +172,7 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) { bindings::_dev_printk( klevel as *const _ as *const crate::ffi::c_char, self.as_raw(), - c_str!("%pA").as_char_ptr(), + crate::str::as_char_ptr(c"%pA"), &msg as *const _ as *const crate::ffi::c_void, ) }; diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index f6ecf09cb65f..51c5e0f0a0bc 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -164,7 +164,7 @@ pub fn name(&self) -> Option<&'static CStr> { None } else { // SAFETY: The string returned by `errname` is static and `NUL`-terminated. - Some(unsafe { CStr::from_char_ptr(ptr) }) + Some(unsafe { crate::str::from_char_ptr(ptr) }) } } @@ -187,7 +187,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { Some(name) => f .debug_tuple( // SAFETY: These strings are ASCII-only. - unsafe { core::str::from_utf8_unchecked(name) }, + unsafe { core::str::from_utf8_unchecked(name.to_bytes()) }, ) .finish(), } diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index c5162fdc95ff..e75db4d825ce 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -61,7 +61,7 @@ fn request_internal(name: &CStr, dev: &Device, func: FwFunc) -> Result { // 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 as _, crate::str::as_char_ptr(name), dev.as_raw()) }; if ret != 0 { return Err(Error::from_errno(ret)); } diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 630b947c708c..9f40ea744fc2 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -101,12 +101,12 @@ unsafe impl Sync for Location {} unsafe impl Sync for UnaryAssert {} static LOCATION: Location = Location($crate::bindings::kunit_loc { - file: FILE.as_char_ptr(), + file: $crate::str::as_char_ptr(FILE), line: LINE, }); static ASSERTION: UnaryAssert = UnaryAssert($crate::bindings::kunit_unary_assert { assert: $crate::bindings::kunit_assert {}, - condition: CONDITION.as_char_ptr(), + condition: $crate::str::as_char_ptr(CONDITION), expected_true: true, }); diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index b3a6cc50b240..2dd20e981e9b 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -31,7 +31,7 @@ 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.name = self.name.as_char_ptr(); + result.name = crate::str::as_char_ptr(self.name); result.fops = create_vtable::(); result } diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index d7da29f95e43..9e410de3c3a3 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -504,7 +504,7 @@ unsafe impl Sync for DriverVTable {} pub const fn create_phy_driver() -> DriverVTable { // INVARIANT: All the fields of `struct phy_driver` are initialized properly. DriverVTable(Opaque::new(bindings::phy_driver { - name: T::NAME.as_char_ptr().cast_mut(), + name: crate::str::as_char_ptr(T::NAME), flags: T::FLAGS, phy_id: T::PHY_DEVICE_ID.id, phy_id_mask: T::PHY_DEVICE_ID.mask_as_int(), diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs index dde2e0649790..96e7029c27da 100644 --- a/rust/kernel/prelude.rs +++ b/rust/kernel/prelude.rs @@ -34,7 +34,10 @@ pub use super::error::{code::*, Error, Result}; -pub use super::{str::CStr, ThisModule}; +pub use super::{ + str::{CStr, CStrExt as _}, + ThisModule, +}; pub use super::init::{InPlaceInit, InPlaceWrite, Init, PinInit}; diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 04947c672979..bb3c49fd4ef3 100644 --- a/rust/kernel/seq_file.rs +++ b/rust/kernel/seq_file.rs @@ -4,7 +4,7 @@ //! //! C header: [`include/linux/seq_file.h`](srctree/include/linux/seq_file.h) -use crate::{bindings, c_str, types::NotThreadSafe, types::Opaque}; +use crate::{bindings, types::NotThreadSafe, types::Opaque}; /// A utility for generating the contents of a seq file. #[repr(transparent)] @@ -35,7 +35,7 @@ pub fn call_printf(&self, args: core::fmt::Arguments<'_>) { unsafe { bindings::seq_printf( self.inner.get(), - c_str!("%pA").as_char_ptr(), + crate::str::as_char_ptr(c"%pA"), &args as *const _ as *const crate::ffi::c_void, ); } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 53450c956a6a..2b63cfaaa981 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -4,7 +4,7 @@ use crate::alloc::{flags::*, AllocError, KVec}; use core::fmt::{self, Write}; -use core::ops::{self, Deref, DerefMut, Index}; +use core::ops::{Deref, DerefMut}; use crate::error::{code::*, Error}; @@ -45,11 +45,11 @@ pub const fn from_bytes(bytes: &[u8]) -> &Self { /// # use kernel::{fmt, b_str, str::CString}; /// let ascii = b_str!("Hello, BStr!"); /// let s = CString::try_from_fmt(fmt!("{}", ascii.display()))?; - /// assert_eq!(s.as_bytes(), "Hello, BStr!".as_bytes()); + /// assert_eq!(s.to_bytes(), "Hello, BStr!".as_bytes()); /// /// let non_ascii = b_str!("