From patchwork Mon Feb 3 11:50:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 13957329 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 61CD7204095; Mon, 3 Feb 2025 11:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738583444; cv=none; b=aoEWnsVkKSYr08MS2mfmLwbtqUf8/KyJ1oSQ4unLaHlqCRnNPKY4xzetqn3hH5L1SXoJEG2qyWx7d0HXev/v1n76ARYuOa6+ySC5/M8nsV+ymLyJZxvK5jGoG+MUsCVrd7iWHl4HL5rG64V5NJeakvJ6LLqoKgySxoVfZq70TwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738583444; c=relaxed/simple; bh=gnEvj0qvIvmU2oVDiZardE2SbQD4dkrDcUwohMuTduo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=buvcsjca7ENj/HomH33Dm7HArLUsTKlGqsTt35lGtfBXf3pDfZhKsmBPzfmuNBUFvV9graNtnmCo/wZjDnhVCXX1s19qMG93KMCLEFz+c1SaX93k5p8hR0qGYmh76OaB/KXZfO/OFdzx/wHLY6JEF/V0CNj3O9WIC14zrGMti/g= 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=Z6bGQwD4; arc=none smtp.client-ip=209.85.222.181 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="Z6bGQwD4" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7b6f53c12adso374890385a.1; Mon, 03 Feb 2025 03:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738583440; x=1739188240; 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=zeVAzPKfSNYNKB2nHDfHMxYheyBSx+D996etKjt1JVQ=; b=Z6bGQwD4yYGR/XVUVYiMeyRiPzd7ZtwO9b8LzrlRT6PmWx0UIwC3VkDjgO5uoAwt6P e30EYH/ScbiOgg4JdUUjStbyeelmNznQMrzcwXDFa+e6bUN6fItd0ERBl6/NVx9cyJBp UR944xfj37zfWvglLxhnnfjmbsjaIRNEdakTesFqYzdZX2UZ2SsDltNgo2VVPIlkGDBF MkmGsz4rX/SPYHr8xyJKiEHvIYblEuqQAZyovKhtR9rjrObAVYG7P+W6gdtCkwIUsA6E uVnpQoddF2xRaygMfZaE8JrSIZgn7ZKTcFM2QzvBMgUPimsf/+Wr0iicC2cHWNr/Apqx +dFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738583440; x=1739188240; 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=zeVAzPKfSNYNKB2nHDfHMxYheyBSx+D996etKjt1JVQ=; b=wlRP3A5jf1BKbrAYlKuJ15iOG+57SAgY5nV30HN/15alUGirgHi/x2Pbernyr03OKj qZnLXxJ4jBN9rLa6FtSYLoMxFMsBoFtO+iHl+04RWp7NkM1WRIBlyozd14QTsNxeHLry QtjDk9FP5mH6/BGCdEMTzNnIcWUTknfI9cMG6VNVATStyywvU7eVSLd5zpZ9v5tC2V3P XnoctXFHuO9D8kOyq0DYN+bRShXrIctj9F35Al5qSP4MVyi/M11RRygrN6mrjlTNSFr1 Avm8KI5oo/cobXquhIMQEtQus2UOwWbDTkmmLjK1iY42ZubOzPDLBHNijsviAqsmy4+i Zy9g== X-Forwarded-Encrypted: i=1; AJvYcCW9ATcOUrMCWg6OO2Yu8eu2ll4p7Z+bxopOedZbT7gpHWy47yOwQ8UABS0k/koaXrvjlcTQ5cnsXJ9tHEU=@vger.kernel.org X-Gm-Message-State: AOJu0YyT6i6i14YGttCxUvNNJAQuwP9DtzEqeBcm7ABqJrXrL+cknVVR Dd+leFoBbX2yUJlxiETYswqoRLXFPJhF2FUo4qS0bYIhNQrpxWypscnl3+BYhxc= X-Gm-Gg: ASbGncsVp0x/xmdaFqS1poqBsgxN0GKGgLxjSKnr3MfdUQmVg44i696B2d3ivoyMU9/ qksZHzLed2qwv1DJpqAVsRuYcHSXdSZN6Ky0anI9RIWt1yzAcKrHwd1y8TFQqS/u6GhRJ3ZAgL+ SdXBslGXvKbIdJNLIWchKai8amFuW6HVRoQW85jKmQOeH60Nw4Ln67hdOOdrlM8q2LH+zG0aiJj tyNc6C9v58/ojQM6eK4xpdMxO2+KEK1ZrUDYIqp7XriavBkyjWPPxXt2SMau2/cFLs3hyDptXMb O1Q1MJvkzWeBJKbGLVcn6pUdXfr7N7DKvotPGlw= X-Google-Smtp-Source: AGHT+IGjxkNZaKOPFBlc0Eh8Bl3tpbQ1Xc6fXP9vpb/ptnR6D+Erxeb9ysj0AJUth/lUePYUk1PhUw== X-Received: by 2002:a0c:aa5b:0:b0:6e2:49d0:6897 with SMTP id 6a1803df08f44-6e249d06ae0mr184977116d6.24.1738583439835; Mon, 03 Feb 2025 03:50:39 -0800 (PST) Received: from tamird-mac.local ([2600:4041:5be7:7c00:f07f:fb14:288d:6f1e]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e254835641sm49537626d6.62.2025.02.03.03.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 03:50:38 -0800 (PST) From: Tamir Duberstein Date: Mon, 03 Feb 2025 06:50:32 -0500 Subject: [PATCH v8 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: <20250203-cstr-core-v8-2-cb3f26e78686@gmail.com> References: <20250203-cstr-core-v8-0-cb3f26e78686@gmail.com> In-Reply-To: <20250203-cstr-core-v8-0-cb3f26e78686@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. 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 --- rust/kernel/device.rs | 4 +- rust/kernel/error.rs | 4 +- rust/kernel/kunit.rs | 4 +- rust/kernel/miscdevice.rs | 2 +- rust/kernel/net/phy.rs | 2 +- rust/kernel/of.rs | 2 +- rust/kernel/prelude.rs | 5 +- rust/kernel/seq_file.rs | 4 +- rust/kernel/str.rs | 407 +++++++++++----------------------------- rust/kernel/sync/condvar.rs | 2 +- rust/kernel/sync/lock.rs | 2 +- rust/kernel/sync/lock/global.rs | 2 +- 12 files changed, 126 insertions(+), 314 deletions(-) diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index db2d9658ba47..df4bfa5f51ea 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -12,7 +12,7 @@ use core::{fmt, ptr}; #[cfg(CONFIG_PRINTK)] -use crate::c_str; +use crate::str::CStrExt as _; /// A reference-counted device. /// @@ -176,7 +176,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(), + c"%pA".as_char_ptr(), &msg as *const _ as *const crate::ffi::c_void, ) }; diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index f6ecf09cb65f..cff9204d9dd6 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -163,6 +163,8 @@ pub fn name(&self) -> Option<&'static CStr> { if ptr.is_null() { None } else { + use crate::str::CStrExt as _; + // SAFETY: The string returned by `errname` is static and `NUL`-terminated. Some(unsafe { CStr::from_char_ptr(ptr) }) } @@ -187,7 +189,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/kunit.rs b/rust/kernel/kunit.rs index 630b947c708c..d858757aeace 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_in_const_context(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_in_const_context(CONDITION), expected_true: true, }); diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index e14433b2ab9d..78c150270080 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -34,7 +34,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_in_const_context(self.name); result.fops = create_vtable::(); result } diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index bb654a28dab3..73df0f55f94e 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_in_const_context(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/of.rs b/rust/kernel/of.rs index 04f2d8ef29cb..12ea65df46de 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -29,7 +29,7 @@ fn index(&self) -> usize { impl DeviceId { /// Create a new device id from an OF 'compatible' string. pub const fn new(compatible: &'static CStr) -> Self { - let src = compatible.as_bytes_with_nul(); + let src = compatible.to_bytes_with_nul(); // Replace with `bindings::of_device_id::default()` once stabilized for `const`. // SAFETY: FFI type is valid to be zero-initialized. let mut of: bindings::of_device_id = unsafe { core::mem::zeroed() }; 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..073a38e6991f 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, str::CStrExt as _, 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(), + c"%pA".as_char_ptr(), &args as *const _ as *const crate::ffi::c_void, ); } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index c273f1367607..13dd2f6cc572 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!("