From nobody Mon Feb 9 05:58:39 2026 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.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 6EBED14A0BC; Sun, 2 Feb 2025 16:31:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738513893; cv=none; b=ibXO7LoOIOUJzDcKIp9rQUQhQOnFDuR3frJzOXdl52nT2gsqFS+cvzLlfwwQFKr9zsz5qQ88cmsDwvHqsAp2RFE76qp5+q9rSqGqJ40CHVdjO/PIFQSNvkX2+S6ygiZ9jrUpHPkHZw0wKGF7uMu1mv0GzpPIqr1h6wCIHNDt72g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738513893; c=relaxed/simple; bh=eORAKQVLowETgizLa4/np6sYZbSCzYW5ILAB+ErjH1o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mYfvjMqOVNkfqXGJqkYLTNUQTmxkCyMArUxX+6e47Yc1GWWoD8TDnQundR7hJApGQLPrGh7Fcjp66j0u/sCLKCvie5rh74UgEKaKdZJiRAGhq5MNaDLDLbbKk0GYoXB4IIteNP6Zlk5+j5XzVnobz7DMgBNCJv3Xd9vGSdaBYlk= 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=LVgRGhNE; arc=none smtp.client-ip=209.85.222.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="LVgRGhNE" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7b6e9586b82so326548085a.1; Sun, 02 Feb 2025 08:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738513890; x=1739118690; 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=NNPwVnOFpCLxp1yviLIHuAXCLL7HWNGaSzEhnwzmXGQ=; b=LVgRGhNEhHu+ziMZ5wiZQRA54tn61Oj/e3f86Q1EOURGxycIXCrqREuxXR+0QmO3xZ K5MBC9yeg8u0Vs234ZNTqj1z1ZIBqbNGrAapa1J6CGrb7NXRmWttk9206qumW9uujoIw UAY8ajtph4Z/cv1qZ9uTKBTDZQyQpl0h2CKRQNFJ18W/C8zqRsv2LbfFLGDh2L/LCj1I alUeUf/L5rmq9Wy2sXAtBJYg5xtAkc7oZhMIqKXsdhRct7lcLZ+D6zYkdNSLfMRDRSRI 5vi5tzn6arw8L1dRXZV2pLBboke1fl2tJ6e2zCVzqTzojBvHRP4Xv1Km56ZwBaZmm66a 5eAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738513890; x=1739118690; 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=NNPwVnOFpCLxp1yviLIHuAXCLL7HWNGaSzEhnwzmXGQ=; b=wSZrukGJIhy84A+xNxx1Hv9NHJ2GK3XiKyJ7wOD0K1xPfVZY1Y2xttivzWbLig+Ie6 EKBxj6M3Ul6koovZ7ZFFoSVTDHUIbbNGccySJuVrNKh4yesr8drA66YTxZWyUKuIeM/2 UWkraq4R59LPMkO+Gd5BUPTldA6B9O2lwjHKK6vcnFMKkTsR8+yw79cOFoksrLUEAhWx nPn22cw+Lywx5aEck8h0E/mZzMgfe8QsvAh2QAjXcbaQmIx9euJe8NNpGBtKdGJKpY3H IC77cZpWZ/qH72aBN8vt/uqO9smr332qRqDcBtL9HZ95jXJsts1edCiTOLypNZYN96vM DG2A== X-Forwarded-Encrypted: i=1; AJvYcCX62X0BaPOhVUem4I4akYUuN+PxAvG5q/N0kHcJrvIerjOdhoahGibyXw3r+Z1z4B3/UKJaa2JkDXkVtsM=@vger.kernel.org X-Gm-Message-State: AOJu0YyvXNWE5rg8Uqv+PGa8AAx0Ztgi3qUUoZ4VGYVrb2D2D6M3SeoV 4PiTezhQdEwIKUUW4ceD/a0xzLXkgBDvX12wmjBlRrLPDTeY5hKs X-Gm-Gg: ASbGncvBRSX2BbWSfVPCKHv9xwtF+Tvs3ZLSzKbJU/7EwZY0YhAu6UqopatLupAU0Ig TszfzLsZ8eaJiTF0YO/Fllsv/iTiFBSqa4zo9iZxsVNi+60KI7vDlpynGMTNQZ9ge3uvB55ckzg jAuXXSzzFTQFCyidc6DoJ/KUWpeokRxWJgRkoj7FWNAqJFQuq5KEPFd3h3sOGeFAZgvi7xODv6v CqgA9gsbYyZRlYzbHYUu/qo8Z0QZOYlIsCvmRJpx9E2rCKugFlcN4t64jd/iCCDnbZF2MMdywWJ j02NXRIGOgDMPsPydK0xupKriJ5vCHKuN6i5rFo= X-Google-Smtp-Source: AGHT+IEes9eO+bJuPS3zvGHvmJfTHUSdf4XUV5B/BFGf41lmM9FcZHrhiLL5OSOlyBkrzjvJwrNnzg== X-Received: by 2002:a05:620a:6081:b0:7b6:f1be:4f68 with SMTP id af79cd13be357-7bffcda57femr2959387485a.46.1738513890150; Sun, 02 Feb 2025 08:31:30 -0800 (PST) Received: from tamird-mac.local ([2600:4041:5be7:7c00:f07f:fb14:288d:6f1e]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c00a8bb957sm421307485a.14.2025.02.02.08.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 08:31:28 -0800 (PST) From: Tamir Duberstein Date: Sun, 02 Feb 2025 11:31:18 -0500 Subject: [PATCH v7 1/4] rust: move BStr,CStr Display impls behind method Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250202-cstr-core-v7-1-da1802520438@gmail.com> References: <20250202-cstr-core-v7-0-da1802520438@gmail.com> In-Reply-To: <20250202-cstr-core-v7-0-da1802520438@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 There are two reasons for doing this: - Moving the Display impl behind a display method matches the style used in the standard library for printing non-Unicode data. - The standard library's core::ffi::CStr doesn't implement Display; moving Display to a helper struct is a necessary step toward using it. Signed-off-by: Tamir Duberstein --- rust/kernel/kunit.rs | 9 ++-- rust/kernel/str.rs | 121 +++++++++++++++++++++++++++++++++++------------= ---- 2 files changed, 90 insertions(+), 40 deletions(-) diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 824da0e9738a..630b947c708c 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -56,6 +56,7 @@ macro_rules! kunit_assert { break 'out; } =20 + static NAME: &'static $crate::str::CStr =3D $crate::c_str!($na= me); static FILE: &'static $crate::str::CStr =3D $crate::c_str!($fi= le); static LINE: i32 =3D core::line!() as i32 - $diff; static CONDITION: &'static $crate::str::CStr =3D $crate::c_str= !(stringify!($condition)); @@ -71,11 +72,13 @@ macro_rules! kunit_assert { // // This mimics KUnit's failed assertion format. $crate::kunit::err(format_args!( - " # {}: ASSERTION FAILED at {FILE}:{LINE}\n", - $name + " # {NAME}: ASSERTION FAILED at {FILE}:{LINE}\n", + NAME =3D NAME.display(), + FILE =3D FILE.display(), )); $crate::kunit::err(format_args!( - " Expected {CONDITION} to be true, but is false\n" + " Expected {CONDITION} to be true, but is false\n", + CONDITION =3D CONDITION.display(), )); $crate::kunit::err(format_args!( " Failure not reported to KUnit since this is a non= -KUnit task\n" diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 28e2201604d6..c273f1367607 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -31,29 +31,77 @@ pub const fn from_bytes(bytes: &[u8]) -> &Self { // SAFETY: `BStr` is transparent to `[u8]`. unsafe { &*(bytes as *const [u8] as *const BStr) } } -} =20 -impl fmt::Display for BStr { - /// Formats printable ASCII characters, escaping the rest. + /// Returns an object that implements [`Display`] for safely printing = a [`BStr`] that may + /// contain non-Unicode data. If you would like an implementation whic= h escapes the [`BStr`] + /// please use [`Debug`] instead. + /// + /// [`Display`]: fmt::Display + /// [`Debug`]: fmt::Debug + /// + /// # Examples /// /// ``` - /// # use kernel::{fmt, b_str, str::{BStr, CString}}; + /// # use kernel::{fmt, b_str, str::CString}; /// let ascii =3D b_str!("Hello, BStr!"); - /// let s =3D CString::try_from_fmt(fmt!("{}", ascii))?; + /// let s =3D CString::try_from_fmt(fmt!("{}", ascii.display()))?; /// assert_eq!(s.as_bytes(), "Hello, BStr!".as_bytes()); /// /// let non_ascii =3D b_str!("=F0=9F=A6=80"); - /// let s =3D CString::try_from_fmt(fmt!("{}", non_ascii))?; + /// let s =3D CString::try_from_fmt(fmt!("{}", non_ascii.display()))?; /// assert_eq!(s.as_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` + #[inline] + pub fn display(&self) -> Display<'_> { + Display { + inner: self, + escape_common: true, + } + } +} + +/// Helper struct for safely printing a [`BStr`] with [`fmt!`] and `{}`. +/// +/// A [`BStr`] might contain non-Unicode data. This `struct` implements th= e [`Display`] trait in a +/// way that mitigates that. It is created by the [`display`](BStr::displa= y) method on [`BStr`]. +/// +/// If you would like an implementation which escapes the string please us= e [`Debug`] instead. +/// +/// # Examples +/// +/// ``` +/// # use kernel::{fmt, b_str, str::CString}; +/// let ascii =3D b_str!("Hello, BStr!"); +/// let s =3D CString::try_from_fmt(fmt!("{}", ascii.display()))?; +/// assert_eq!(s.as_bytes(), "Hello, BStr!".as_bytes()); +/// +/// let non_ascii =3D b_str!("=F0=9F=A6=80"); +/// let s =3D CString::try_from_fmt(fmt!("{}", non_ascii.display()))?; +/// assert_eq!(s.as_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); +/// # Ok::<(), kernel::error::Error>(()) +/// ``` +/// +/// [`fmt!`]: crate::fmt +/// [`Debug`]: fmt::Debug +/// [`Display`]: fmt::Display +pub struct Display<'a> { + inner: &'a BStr, + escape_common: bool, +} + +impl fmt::Display for Display<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - for &b in &self.0 { + let Self { + inner: BStr(b), + escape_common, + } =3D self; + for &b in b { match b { // Common escape codes. - b'\t' =3D> f.write_str("\\t")?, - b'\n' =3D> f.write_str("\\n")?, - b'\r' =3D> f.write_str("\\r")?, + b'\t' if *escape_common =3D> f.write_str("\\t")?, + b'\n' if *escape_common =3D> f.write_str("\\n")?, + b'\r' if *escape_common =3D> f.write_str("\\r")?, // Printable characters. 0x20..=3D0x7e =3D> f.write_char(b as char)?, _ =3D> write!(f, "\\x{:02x}", b)?, @@ -68,7 +116,7 @@ impl fmt::Debug for BStr { /// escaping the rest. /// /// ``` - /// # use kernel::{fmt, b_str, str::{BStr, CString}}; + /// # use kernel::{fmt, b_str, str::CString}; /// // Embedded double quotes are escaped. /// let ascii =3D b_str!("Hello, \"BStr\"!"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", ascii))?; @@ -376,35 +424,35 @@ pub fn to_ascii_uppercase(&self) -> Result { =20 Ok(s) } -} =20 -impl fmt::Display for CStr { - /// Formats printable ASCII characters, escaping the rest. + /// Returns an object that implements [`Display`] for safely printing = a [`CStr`] that may + /// contain non-Unicode data. If you would like an implementation whic= h escapes the [`CStr`] + /// please use [`Debug`] instead. + /// + /// [`Display`]: fmt::Display + /// [`Debug`]: fmt::Debug + /// + /// # Examples /// /// ``` /// # use kernel::c_str; /// # use kernel::fmt; - /// # use kernel::str::CStr; /// # use kernel::str::CString; /// let penguin =3D c_str!("=F0=9F=90=A7"); - /// let s =3D CString::try_from_fmt(fmt!("{}", penguin))?; + /// let s =3D CString::try_from_fmt(fmt!("{}", penguin.display()))?; /// assert_eq!(s.as_bytes_with_nul(), "\\xf0\\x9f\\x90\\xa7\0".as_byte= s()); /// /// let ascii =3D c_str!("so \"cool\""); - /// let s =3D CString::try_from_fmt(fmt!("{}", ascii))?; + /// let s =3D CString::try_from_fmt(fmt!("{}", ascii.display()))?; /// assert_eq!(s.as_bytes_with_nul(), "so \"cool\"\0".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - for &c in self.as_bytes() { - if (0x20..0x7f).contains(&c) { - // Printable character. - f.write_char(c as char)?; - } else { - write!(f, "\\x{:02x}", c)?; - } + #[inline] + pub fn display(&self) -> Display<'_> { + Display { + inner: self, + escape_common: false, } - Ok(()) } } =20 @@ -414,7 +462,6 @@ impl fmt::Debug for CStr { /// ``` /// # use kernel::c_str; /// # use kernel::fmt; - /// # use kernel::str::CStr; /// # use kernel::str::CString; /// let penguin =3D c_str!("=F0=9F=90=A7"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", penguin))?; @@ -595,13 +642,13 @@ fn test_cstr_as_str_unchecked() { #[test] fn test_cstr_display() { let hello_world =3D CStr::from_bytes_with_nul(b"hello, world!\0").= unwrap(); - assert_eq!(format!("{}", hello_world), "hello, world!"); + assert_eq!(format!("{}", hello_world.display()), "hello, world!"); let non_printables =3D CStr::from_bytes_with_nul(b"\x01\x09\x0a\0"= ).unwrap(); - assert_eq!(format!("{}", non_printables), "\\x01\\x09\\x0a"); + assert_eq!(format!("{}", non_printables.display()), "\\x01\\x09\\x= 0a"); let non_ascii =3D CStr::from_bytes_with_nul(b"d\xe9j\xe0 vu\0").un= wrap(); - assert_eq!(format!("{}", non_ascii), "d\\xe9j\\xe0 vu"); + assert_eq!(format!("{}", non_ascii.display()), "d\\xe9j\\xe0 vu"); let good_bytes =3D CStr::from_bytes_with_nul(b"\xf0\x9f\xa6\x80\0"= ).unwrap(); - assert_eq!(format!("{}", good_bytes), "\\xf0\\x9f\\xa6\\x80"); + assert_eq!(format!("{}", good_bytes.display()), "\\xf0\\x9f\\xa6\\= x80"); } =20 #[test] @@ -612,7 +659,7 @@ fn test_cstr_display_all_bytes() { bytes[i as usize] =3D i.wrapping_add(1); } let cstr =3D CStr::from_bytes_with_nul(&bytes).unwrap(); - assert_eq!(format!("{}", cstr), ALL_ASCII_CHARS); + assert_eq!(format!("{}", cstr.display()), ALL_ASCII_CHARS); } =20 #[test] @@ -630,15 +677,15 @@ fn test_cstr_debug() { #[test] fn test_bstr_display() { let hello_world =3D BStr::from_bytes(b"hello, world!"); - assert_eq!(format!("{}", hello_world), "hello, world!"); + assert_eq!(format!("{}", hello_world.display()), "hello, world!"); let escapes =3D BStr::from_bytes(b"_\t_\n_\r_\\_\'_\"_"); - assert_eq!(format!("{}", escapes), "_\\t_\\n_\\r_\\_'_\"_"); + assert_eq!(format!("{}", escapes.display()), "_\\t_\\n_\\r_\\_'_\"= _"); let others =3D BStr::from_bytes(b"\x01"); - assert_eq!(format!("{}", others), "\\x01"); + assert_eq!(format!("{}", others.display()), "\\x01"); let non_ascii =3D BStr::from_bytes(b"d\xe9j\xe0 vu"); - assert_eq!(format!("{}", non_ascii), "d\\xe9j\\xe0 vu"); + assert_eq!(format!("{}", non_ascii.display()), "d\\xe9j\\xe0 vu"); let good_bytes =3D BStr::from_bytes(b"\xf0\x9f\xa6\x80"); - assert_eq!(format!("{}", good_bytes), "\\xf0\\x9f\\xa6\\x80"); + assert_eq!(format!("{}", good_bytes.display()), "\\xf0\\x9f\\xa6\\= x80"); } =20 #[test] --=20 2.48.1 From nobody Mon Feb 9 05:58:39 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DDBF10E0; Sun, 2 Feb 2025 16:39:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738514363; cv=none; b=emssu05Cn2WjauuzQEdgeBYN3B58L6wpD8rMwiV+GWg+kgkFzBhrMty3WQP2CGDO6V3LBTqmtK411KjOi3zw//tYEVnOzFe74T00X/X4JKV/jVq39VrNKIHHxRo86Xo68jI0TBj/+xohjNQp/tQADopDhZWa/okb94LshR/dScs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738514363; c=relaxed/simple; bh=eOh2rpdDyjrO4tsEi/ljquHrLIfisg7RinqcV+HVncs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TQIPyxc2w/WiVyMUIrdpyg9taFXHi2v2IDlX1ZmlXMKvH2SnLDmvSCI4XLpjKWtcvhUim5aelKJFoVFAT4t+VPaJ2gcCdt8/FM6esElx25tLx2li5ZmpqEiyzyFfcghHF3vRH0T0WiV1GO5SwomoN6ZC90ogzDvBZJUtyjIRCpI= 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=EGJcON4F; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EGJcON4F" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2f441904a42so6128009a91.1; Sun, 02 Feb 2025 08:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738514360; x=1739119160; 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=Asgf1xelIrx+SrLj7fQhqz+2lJCzsMJqTI2bB/U+95g=; b=EGJcON4FXAbrIlBatVJZHl8ugX0c+CLRjA/90zpdNUa7gpCMvaRejgzf/L933JnSnw UGADNE2MHKw2JWacEKZP7S97a/2QVvf3ufHqJBMjevuVxVC+bo25f4fQiEpTv7pDM6p2 SdZ+S6yNyiITkr+EJUf3sZDM5HmS20KyKhnZLhBqzuMIe5bKHJIB9mv2/8DIQ0XW5V6k IK0g/SnB2bkv+BxaOpcwtqfP8+e3+9iTx+M6v2v6WtNQj9dqxDR7GKB5wWP8UcpXcwDe NR1zyxNYyk4dmbdi4DO9vlD6WBAVglK7pam+DEuARkWrnaR79WDo+FFaWex7NPvqngb/ VU2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738514360; x=1739119160; 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=Asgf1xelIrx+SrLj7fQhqz+2lJCzsMJqTI2bB/U+95g=; b=Dfcl8pYmesgYdJZr4qlj4AGWL7B7yR+GLppkD0L5lk/1uUfKF5bC9R0mst+ISVDDoq E58vpdTAIfkyZMTEl8ANlpFPf7dqP0ov3o2tso2FPcg1L7QGyHnCA/2sAjIZuBHk5Xql ALGD/zjJKfZTcSNa7gOmtTJHahiqlEkXWx38A16UtToNta6bN1R18xSrntOG1DbG8LCN h5wwIL/EjAEoRr1EbQTW1bmfbLULWEtEg07EYt8U1bK7FPVcmGAmFgcMAsAVeKeUB6cx fGZbwR7uzUsYxuvOt0Z2y/ghv9UXPC9VrTdoIb33eRBw8iYx1dgPtAN+FDNUlw4blP1Q Hhtw== X-Forwarded-Encrypted: i=1; AJvYcCVjIbLLS10tvqSI3C0Z6xjNXBJWQNzumbeZtJQQCbMAZd8XC6AZcnjK8HqaV0ejOOJHh1Hls5m9D/s6Cmw=@vger.kernel.org X-Gm-Message-State: AOJu0YzpBwlO/j6ffmBx+vnl3EkF2qCccyroTl2oecSjgrJikp3tzBPd 0O65bn245tSWfYFVnFFdoROCXU8eJjhGOxgzvi4wnJoxWVUlhsz4YJOxs8oVgZA= X-Gm-Gg: ASbGncupsLCUNwx5NyxwADFKEjTRoYBTNGB3zcdsaXBCpxNIxkHOHkGDjALfHzWnaRv LM4cUnCg4mwiOjU05Q2PkXWde2snO2WWrvlSyVvqCBXsvBWEFCtymle7dJ5WKMNcQwoqXknLN9r 927W8OKzP5DKCPXRImZuiHZiGambkQki6fvRfNHsJJ6wGVu5Wq9N5x3YqeBx9tNV2dfsV2LCnNX MMZcZ2p/wkw91Jw6FxUNzL9ucSGBL62mF+LtJYTD/HPFKHNP0o9mG4UQ4dGTIkddjDaET2l2zH6 LC8P0w6HoMyZGMPFkWL7IWSRZzJFIpu++QqiQT4= X-Google-Smtp-Source: AGHT+IFxtgkcG/S32dK4vtrKshUXTNx0djiHQHVyEy9QEer1Jg+04U2o3oFmWOE1ClXqY57TU12v2w== X-Received: by 2002:a05:620a:258b:b0:7b6:dac1:cb73 with SMTP id af79cd13be357-7bffcda901cmr2986013385a.56.1738513891738; Sun, 02 Feb 2025 08:31:31 -0800 (PST) Received: from tamird-mac.local ([2600:4041:5be7:7c00:f07f:fb14:288d:6f1e]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c00a8bb957sm421307485a.14.2025.02.02.08.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 08:31:30 -0800 (PST) From: Tamir Duberstein Date: Sun, 02 Feb 2025 11:31:19 -0500 Subject: [PATCH v7 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250202-cstr-core-v7-2-da1802520438@gmail.com> References: <20250202-cstr-core-v7-0-da1802520438@gmail.com> In-Reply-To: <20250202-cstr-core-v7-0-da1802520438@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 | 12 +- 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/of.rs | 2 +- rust/kernel/pci.rs | 8 +- rust/kernel/platform.rs | 2 +- rust/kernel/prelude.rs | 5 +- rust/kernel/seq_file.rs | 4 +- rust/kernel/str.rs | 446 ++++++++++--------------------------= ---- rust/kernel/sync/condvar.rs | 2 +- rust/kernel/sync/lock.rs | 2 +- rust/kernel/sync/lock/global.rs | 2 +- rust/kernel/workqueue.rs | 2 +- 17 files changed, 138 insertions(+), 365 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 =3D unsafe { CStr::from_char_ptr(url) }; + let url_cstr: &CStr =3D unsafe { kernel::str::from_char_ptr(url) }; let segments =3D &[ &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 db2d9658ba47..9554921368c0 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -11,9 +11,6 @@ }; use core::{fmt, ptr}; =20 -#[cfg(CONFIG_PRINTK)] -use crate::c_str; - /// A reference-counted device. /// /// This structure represents the Rust abstraction for a C `struct device`= . This implementation @@ -176,7 +173,7 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Argume= nts<'_>) { 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, ) }; @@ -185,7 +182,12 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Argum= ents<'_>) { /// Checks if property is present or not. pub fn property_present(&self, name: &CStr) -> bool { // SAFETY: By the invariant of `CStr`, `name` is null-terminated. - unsafe { bindings::device_property_present(self.as_raw().cast_cons= t(), name.as_char_ptr()) } + unsafe { + bindings::device_property_present( + self.as_raw().cast_const(), + crate::str::as_char_ptr(name), + ) + } } } =20 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) }) } } =20 @@ -187,7 +187,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Resul= t { Some(name) =3D> 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: FwFu= nc) -> Result { =20 // SAFETY: `pfw` is a valid pointer to a NULL initialized `binding= s::firmware` pointer. // `name` and `dev` are valid as by their type invariants. - let ret =3D unsafe { func.0(pfw as _, name.as_char_ptr(), dev.as_r= aw()) }; + let ret =3D unsafe { func.0(pfw as _, crate::str::as_char_ptr(name= ), dev.as_raw()) }; if ret !=3D 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 {} =20 static LOCATION: Location =3D Location($crate::bindings::kunit= _loc { - file: FILE.as_char_ptr(), + file: $crate::str::as_char_ptr(FILE), line: LINE, }); static ASSERTION: UnaryAssert =3D 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, }); =20 diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index e14433b2ab9d..65f70ff61eb3 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -34,7 +34,7 @@ pub const fn into_raw(self) -> bindings::m= iscdevice { // SAFETY: All zeros is valid for this C type. let mut result: bindings::miscdevice =3D unsafe { MaybeUninit::zer= oed().assume_init() }; result.minor =3D bindings::MISC_DYNAMIC_MINOR as _; - result.name =3D self.name.as_char_ptr(); + result.name =3D crate::str::as_char_ptr(self.name); result.fops =3D create_vtable::(); result } diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index bb654a28dab3..c60205606aee 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 pr= operly. 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/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 =3D compatible.as_bytes_with_nul(); + let src =3D compatible.to_bytes_with_nul(); // Replace with `bindings::of_device_id::default()` once stabilize= d for `const`. // SAFETY: FFI type is valid to be zero-initialized. let mut of: bindings::of_device_id =3D unsafe { core::mem::zeroed(= ) }; diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 4c98b5b9aa1e..af36ddac80ff 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -35,7 +35,7 @@ unsafe fn register( ) -> Result { // SAFETY: It's safe to set the fields of `struct pci_driver` on i= nitialization. unsafe { - (*pdrv.get()).name =3D name.as_char_ptr(); + (*pdrv.get()).name =3D crate::str::as_char_ptr(name); (*pdrv.get()).probe =3D Some(Self::probe_callback); (*pdrv.get()).remove =3D Some(Self::remove_callback); (*pdrv.get()).id_table =3D T::ID_TABLE.as_ptr(); @@ -43,7 +43,7 @@ unsafe fn register( =20 // SAFETY: `pdrv` is guaranteed to be a valid `RegType`. to_result(unsafe { - bindings::__pci_register_driver(pdrv.get(), module.0, name.as_= char_ptr()) + bindings::__pci_register_driver(pdrv.get(), module.0, crate::s= tr::as_char_ptr(name)) }) } =20 @@ -275,7 +275,9 @@ fn new(pdev: Device, num: u32, name: &CStr) -> Result { // `pdev` is valid by the invariants of `Device`. // `num` is checked for validity by a previous call to `Device::re= source_len`. // `name` is always valid. - let ret =3D unsafe { bindings::pci_request_region(pdev.as_raw(), n= um, name.as_char_ptr()) }; + let ret =3D unsafe { + bindings::pci_request_region(pdev.as_raw(), num, crate::str::a= s_char_ptr(name)) + }; if ret !=3D 0 { return Err(EBUSY); } diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 50e6b0421813..d1752a978af4 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -36,7 +36,7 @@ unsafe fn register( =20 // SAFETY: It's safe to set the fields of `struct platform_driver`= on initialization. unsafe { - (*pdrv.get()).driver.name =3D name.as_char_ptr(); + (*pdrv.get()).driver.name =3D crate::str::as_char_ptr(name); (*pdrv.get()).probe =3D Some(Self::probe_callback); (*pdrv.get()).remove =3D Some(Self::remove_callback); (*pdrv.get()).driver.of_match_table =3D of_table; 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 @@ =20 pub use super::error::{code::*, Error, Result}; =20 -pub use super::{str::CStr, ThisModule}; +pub use super::{ + str::{CStr, CStrExt as _}, + ThisModule, +}; =20 pub use super::init::{InPlaceInit, InPlaceWrite, Init, PinInit}; =20 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) =20 -use crate::{bindings, c_str, types::NotThreadSafe, types::Opaque}; +use crate::{bindings, types::NotThreadSafe, types::Opaque}; =20 /// 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 c273f1367607..0c4189a478b4 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -4,7 +4,7 @@ =20 use crate::alloc::{flags::*, AllocError, KVec}; use core::fmt::{self, Write}; -use core::ops::{self, Deref, DerefMut, Index}; +use core::ops::{Deref, DerefMut}; =20 use crate::error::{code::*, Error}; =20 @@ -45,11 +45,11 @@ pub const fn from_bytes(bytes: &[u8]) -> &Self { /// # use kernel::{fmt, b_str, str::CString}; /// let ascii =3D b_str!("Hello, BStr!"); /// let s =3D 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 =3D b_str!("=F0=9F=A6=80"); /// let s =3D CString::try_from_fmt(fmt!("{}", non_ascii.display()))?; - /// assert_eq!(s.as_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); + /// assert_eq!(s.to_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` #[inline] @@ -74,11 +74,11 @@ pub fn display(&self) -> Display<'_> { /// # use kernel::{fmt, b_str, str::CString}; /// let ascii =3D b_str!("Hello, BStr!"); /// let s =3D 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 =3D b_str!("=F0=9F=A6=80"); /// let s =3D CString::try_from_fmt(fmt!("{}", non_ascii.display()))?; -/// assert_eq!(s.as_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); +/// assert_eq!(s.to_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` /// @@ -120,11 +120,11 @@ impl fmt::Debug for BStr { /// // Embedded double quotes are escaped. /// let ascii =3D b_str!("Hello, \"BStr\"!"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", ascii))?; - /// assert_eq!(s.as_bytes(), "\"Hello, \\\"BStr\\\"!\"".as_bytes()); + /// assert_eq!(s.to_bytes(), "\"Hello, \\\"BStr\\\"!\"".as_bytes()); /// /// let non_ascii =3D b_str!("=F0=9F=98=BA"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", non_ascii))?; - /// assert_eq!(s.as_bytes(), "\"\\xf0\\x9f\\x98\\xba\"".as_bytes()); + /// assert_eq!(s.to_bytes(), "\"\\xf0\\x9f\\x98\\xba\"".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -177,190 +177,36 @@ macro_rules! b_str { }}; } =20 -/// Possible errors when using conversion functions in [`CStr`]. -#[derive(Debug, Clone, Copy)] -pub enum CStrConvertError { - /// Supplied bytes contain an interior `NUL`. - InteriorNul, +pub use core::ffi::CStr; =20 - /// Supplied bytes are not terminated by `NUL`. - NotNulTerminated, +/// Wraps a raw C string with a safe C string wrapper. +/// +/// # Safety +/// +/// `ptr` must be a valid pointer to a `NUL`-terminated C string, and it m= ust +/// last at least `'a`. When `CStr` is alive, the memory pointed by `ptr` +/// must not be mutated. +// This function exists to paper over the fact that `CStr::from_ptr` takes= a `*const +// core::ffi::c_char` rather than a `*const crate::ffi::c_char`. +#[inline] +pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a CSt= r { + // SAFETY: The safety preconditions are the same as for `CStr::from_pt= r`. + unsafe { CStr::from_ptr(ptr.cast()) } } =20 -impl From for Error { - #[inline] - fn from(_: CStrConvertError) -> Error { - EINVAL - } +/// Returns a C pointer to the string. +// This function exists to paper over the fact that `CStr::as_ptr` returns= a `*const +// core::ffi::c_char` rather than a `*const crate::ffi::c_char`. It is a f= ree function rather than a +// method on an extension trait because: +// +// - error[E0379]: functions in trait impls cannot be declared const +#[inline] +pub const fn as_char_ptr(c_str: &CStr) -> *const crate::ffi::c_char { + c_str.as_ptr().cast() } =20 -/// A string that is guaranteed to have exactly one `NUL` byte, which is a= t the -/// end. -/// -/// Used for interoperability with kernel APIs that take C strings. -#[repr(transparent)] -pub struct CStr([u8]); - -impl CStr { - /// Returns the length of this string excluding `NUL`. - #[inline] - pub const fn len(&self) -> usize { - self.len_with_nul() - 1 - } - - /// Returns the length of this string with `NUL`. - #[inline] - pub const fn len_with_nul(&self) -> usize { - if self.0.is_empty() { - // SAFETY: This is one of the invariant of `CStr`. - // We add a `unreachable_unchecked` here to hint the optimizer= that - // the value returned from this function is non-zero. - unsafe { core::hint::unreachable_unchecked() }; - } - self.0.len() - } - - /// Returns `true` if the string only includes `NUL`. - #[inline] - pub const fn is_empty(&self) -> bool { - self.len() =3D=3D 0 - } - - /// Wraps a raw C string pointer. - /// - /// # Safety - /// - /// `ptr` must be a valid pointer to a `NUL`-terminated C string, and = it must - /// last at least `'a`. When `CStr` is alive, the memory pointed by `p= tr` - /// must not be mutated. - #[inline] - pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a= Self { - // SAFETY: The safety precondition guarantees `ptr` is a valid poi= nter - // to a `NUL`-terminated C string. - let len =3D unsafe { bindings::strlen(ptr) } + 1; - // SAFETY: Lifetime guaranteed by the safety precondition. - let bytes =3D unsafe { core::slice::from_raw_parts(ptr as _, len) = }; - // SAFETY: As `len` is returned by `strlen`, `bytes` does not cont= ain 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) } - } - - /// Creates a [`CStr`] from a `[u8]`. - /// - /// The provided slice must be `NUL`-terminated, does not contain any - /// interior `NUL` bytes. - pub const fn from_bytes_with_nul(bytes: &[u8]) -> Result<&Self, CStrCo= nvertError> { - if bytes.is_empty() { - return Err(CStrConvertError::NotNulTerminated); - } - if bytes[bytes.len() - 1] !=3D 0 { - return Err(CStrConvertError::NotNulTerminated); - } - let mut i =3D 0; - // `i + 1 < bytes.len()` allows LLVM to optimize away bounds check= ing, - // while it couldn't optimize away bounds checks for `i < bytes.le= n() - 1`. - while i + 1 < bytes.len() { - if bytes[i] =3D=3D 0 { - return Err(CStrConvertError::InteriorNul); - } - i +=3D 1; - } - // SAFETY: We just checked that all properties hold. - Ok(unsafe { Self::from_bytes_with_nul_unchecked(bytes) }) - } - - /// Creates a [`CStr`] from a `[u8]` without performing any additional - /// checks. - /// - /// # Safety - /// - /// `bytes` *must* end with a `NUL` byte, and should only have a single - /// `NUL` byte (or the string will be truncated). - #[inline] - pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CS= tr { - // SAFETY: Properties of `bytes` guaranteed by the safety precondi= tion. - unsafe { core::mem::transmute(bytes) } - } - - /// Creates a mutable [`CStr`] from a `[u8]` without performing any - /// additional checks. - /// - /// # Safety - /// - /// `bytes` *must* end with a `NUL` byte, and should only have a single - /// `NUL` byte (or the string will be truncated). - #[inline] - pub unsafe fn from_bytes_with_nul_unchecked_mut(bytes: &mut [u8]) -> &= mut CStr { - // SAFETY: Properties of `bytes` guaranteed by the safety precondi= tion. - unsafe { &mut *(bytes as *mut [u8] as *mut CStr) } - } - - /// Returns a C pointer to the string. - #[inline] - pub const fn as_char_ptr(&self) -> *const crate::ffi::c_char { - self.0.as_ptr() - } - - /// Convert the string to a byte slice without the trailing `NUL` byte. - #[inline] - pub fn as_bytes(&self) -> &[u8] { - &self.0[..self.len()] - } - - /// Convert the string to a byte slice containing the trailing `NUL` b= yte. - #[inline] - pub const fn as_bytes_with_nul(&self) -> &[u8] { - &self.0 - } - - /// Yields a [`&str`] slice if the [`CStr`] contains valid UTF-8. - /// - /// If the contents of the [`CStr`] are valid UTF-8 data, this - /// function will return the corresponding [`&str`] slice. Otherwise, - /// it will return an error with details of where UTF-8 validation fai= led. - /// - /// # Examples - /// - /// ``` - /// # use kernel::str::CStr; - /// let cstr =3D CStr::from_bytes_with_nul(b"foo\0")?; - /// assert_eq!(cstr.to_str(), Ok("foo")); - /// # Ok::<(), kernel::error::Error>(()) - /// ``` - #[inline] - pub fn to_str(&self) -> Result<&str, core::str::Utf8Error> { - core::str::from_utf8(self.as_bytes()) - } - - /// Unsafely convert this [`CStr`] into a [`&str`], without checking f= or - /// valid UTF-8. - /// - /// # Safety - /// - /// The contents must be valid UTF-8. - /// - /// # Examples - /// - /// ``` - /// # use kernel::c_str; - /// # use kernel::str::CStr; - /// let bar =3D c_str!("=E3=83=84"); - /// // SAFETY: String literals are guaranteed to be valid UTF-8 - /// // by the Rust compiler. - /// assert_eq!(unsafe { bar.as_str_unchecked() }, "=E3=83=84"); - /// ``` - #[inline] - pub unsafe fn as_str_unchecked(&self) -> &str { - // SAFETY: TODO. - unsafe { core::str::from_utf8_unchecked(self.as_bytes()) } - } - - /// Convert this [`CStr`] into a [`CString`] by allocating memory and - /// copying over the string data. - pub fn to_cstring(&self) -> Result { - CString::try_from(self) - } - +/// Extensions to [`CStr`]. +pub trait CStrExt { /// Converts this [`CStr`] to its ASCII lower case equivalent in-place. /// /// ASCII letters 'A' to 'Z' are mapped to 'a' to 'z', @@ -370,11 +216,7 @@ pub fn to_cstring(&self) -> Result { /// [`to_ascii_lowercase()`]. /// /// [`to_ascii_lowercase()`]: #method.to_ascii_lowercase - pub fn make_ascii_lowercase(&mut self) { - // INVARIANT: This doesn't introduce or remove NUL bytes in the C - // string. - self.0.make_ascii_lowercase(); - } + fn make_ascii_lowercase(&mut self); =20 /// Converts this [`CStr`] to its ASCII upper case equivalent in-place. /// @@ -385,11 +227,7 @@ pub fn make_ascii_lowercase(&mut self) { /// [`to_ascii_uppercase()`]. /// /// [`to_ascii_uppercase()`]: #method.to_ascii_uppercase - pub fn make_ascii_uppercase(&mut self) { - // INVARIANT: This doesn't introduce or remove NUL bytes in the C - // string. - self.0.make_ascii_uppercase(); - } + fn make_ascii_uppercase(&mut self); =20 /// Returns a copy of this [`CString`] where each character is mapped = to its /// ASCII lower case equivalent. @@ -400,13 +238,7 @@ pub fn make_ascii_uppercase(&mut self) { /// To lowercase the value in-place, use [`make_ascii_lowercase`]. /// /// [`make_ascii_lowercase`]: str::make_ascii_lowercase - pub fn to_ascii_lowercase(&self) -> Result { - let mut s =3D self.to_cstring()?; - - s.make_ascii_lowercase(); - - Ok(s) - } + fn to_ascii_lowercase(&self) -> Result; =20 /// Returns a copy of this [`CString`] where each character is mapped = to its /// ASCII upper case equivalent. @@ -417,13 +249,7 @@ pub fn to_ascii_lowercase(&self) -> Result { /// To uppercase the value in-place, use [`make_ascii_uppercase`]. /// /// [`make_ascii_uppercase`]: str::make_ascii_uppercase - pub fn to_ascii_uppercase(&self) -> Result { - let mut s =3D self.to_cstring()?; - - s.make_ascii_uppercase(); - - Ok(s) - } + fn to_ascii_uppercase(&self) -> Result; =20 /// Returns an object that implements [`Display`] for safely printing = a [`CStr`] that may /// contain non-Unicode data. If you would like an implementation whic= h escapes the [`CStr`] @@ -440,116 +266,65 @@ pub fn to_ascii_uppercase(&self) -> Result { /// # use kernel::str::CString; /// let penguin =3D c_str!("=F0=9F=90=A7"); /// let s =3D CString::try_from_fmt(fmt!("{}", penguin.display()))?; - /// assert_eq!(s.as_bytes_with_nul(), "\\xf0\\x9f\\x90\\xa7\0".as_byte= s()); + /// assert_eq!(s.to_bytes_with_nul(), "\\xf0\\x9f\\x90\\xa7\0".as_byte= s()); /// /// let ascii =3D c_str!("so \"cool\""); /// let s =3D CString::try_from_fmt(fmt!("{}", ascii.display()))?; - /// assert_eq!(s.as_bytes_with_nul(), "so \"cool\"\0".as_bytes()); + /// assert_eq!(s.to_bytes_with_nul(), "so \"cool\"\0".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` + fn display(&self) -> Display<'_>; +} + +/// Converts a mutable C string to a mutable byte slice. +/// +/// # Safety +/// +/// The caller must ensure that the slice ends in a NUL byte and contains = no other NUL bytes before +/// the borrow ends and the underlying [`CStr`] is used. +unsafe fn to_bytes_mut(s: &mut CStr) -> &mut [u8] { + // SAFETY: the cast from `&CStr` to `&[u8]` is safe since `CStr` has t= he same layout as `&[u8]` + // (this is technically not guaranteed, but we rely on it here). The p= ointer dereference is + // safe since it comes from a mutable reference which is guaranteed to= be valid for writes. + unsafe { &mut *(s as *mut CStr as *mut [u8]) } +} + +impl CStrExt for CStr { + fn make_ascii_lowercase(&mut self) { + // SAFETY: This doesn't introduce or remove NUL bytes in the C str= ing. + unsafe { to_bytes_mut(self) }.make_ascii_lowercase(); + } + + fn make_ascii_uppercase(&mut self) { + // SAFETY: This doesn't introduce or remove NUL bytes in the C str= ing. + unsafe { to_bytes_mut(self) }.make_ascii_uppercase(); + } + + fn to_ascii_lowercase(&self) -> Result { + let mut s =3D CString::try_from(self)?; + + s.make_ascii_lowercase(); + + Ok(s) + } + + fn to_ascii_uppercase(&self) -> Result { + let mut s =3D CString::try_from(self)?; + + s.make_ascii_uppercase(); + + Ok(s) + } + #[inline] - pub fn display(&self) -> Display<'_> { + fn display(&self) -> Display<'_> { Display { - inner: self, + inner: BStr::from_bytes(self.to_bytes()), escape_common: false, } } } =20 -impl fmt::Debug for CStr { - /// Formats printable ASCII characters with a double quote on either e= nd, escaping the rest. - /// - /// ``` - /// # use kernel::c_str; - /// # use kernel::fmt; - /// # use kernel::str::CString; - /// let penguin =3D c_str!("=F0=9F=90=A7"); - /// let s =3D CString::try_from_fmt(fmt!("{:?}", penguin))?; - /// assert_eq!(s.as_bytes_with_nul(), "\"\\xf0\\x9f\\x90\\xa7\"\0".as_= bytes()); - /// - /// // Embedded double quotes are escaped. - /// let ascii =3D c_str!("so \"cool\""); - /// let s =3D CString::try_from_fmt(fmt!("{:?}", ascii))?; - /// assert_eq!(s.as_bytes_with_nul(), "\"so \\\"cool\\\"\"\0".as_bytes= ()); - /// # Ok::<(), kernel::error::Error>(()) - /// ``` - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.write_str("\"")?; - for &c in self.as_bytes() { - match c { - // Printable characters. - b'\"' =3D> f.write_str("\\\"")?, - 0x20..=3D0x7e =3D> f.write_char(c as char)?, - _ =3D> write!(f, "\\x{:02x}", c)?, - } - } - f.write_str("\"") - } -} - -impl AsRef for CStr { - #[inline] - fn as_ref(&self) -> &BStr { - BStr::from_bytes(self.as_bytes()) - } -} - -impl Deref for CStr { - type Target =3D BStr; - - #[inline] - fn deref(&self) -> &Self::Target { - self.as_ref() - } -} - -impl Index> for CStr { - type Output =3D CStr; - - #[inline] - fn index(&self, index: ops::RangeFrom) -> &Self::Output { - // Delegate bounds checking to slice. - // Assign to _ to mute clippy's unnecessary operation warning. - let _ =3D &self.as_bytes()[index.start..]; - // SAFETY: We just checked the bounds. - unsafe { Self::from_bytes_with_nul_unchecked(&self.0[index.start..= ]) } - } -} - -impl Index for CStr { - type Output =3D CStr; - - #[inline] - fn index(&self, _index: ops::RangeFull) -> &Self::Output { - self - } -} - -mod private { - use core::ops; - - // Marker trait for index types that can be forward to `BStr`. - pub trait CStrIndex {} - - impl CStrIndex for usize {} - impl CStrIndex for ops::Range {} - impl CStrIndex for ops::RangeInclusive {} - impl CStrIndex for ops::RangeToInclusive {} -} - -impl Index for CStr -where - Idx: private::CStrIndex, - BStr: Index, -{ - type Output =3D >::Output; - - #[inline] - fn index(&self, index: Idx) -> &Self::Output { - &self.as_ref()[index] - } -} - /// Creates a new [`CStr`] from a string literal. /// /// The string literal should not contain any `NUL` bytes. @@ -630,25 +405,15 @@ fn test_cstr_to_str_panic() { checked_cstr.to_str().unwrap(); } =20 - #[test] - fn test_cstr_as_str_unchecked() { - let good_bytes =3D b"\xf0\x9f\x90\xA7\0"; - let checked_cstr =3D CStr::from_bytes_with_nul(good_bytes).unwrap(= ); - // SAFETY: The contents come from a string literal which contains = valid UTF-8. - let unchecked_str =3D unsafe { checked_cstr.as_str_unchecked() }; - assert_eq!(unchecked_str, "=F0=9F=90=A7"); - } - #[test] fn test_cstr_display() { - let hello_world =3D CStr::from_bytes_with_nul(b"hello, world!\0").= unwrap(); - assert_eq!(format!("{}", hello_world.display()), "hello, world!"); - let non_printables =3D CStr::from_bytes_with_nul(b"\x01\x09\x0a\0"= ).unwrap(); - assert_eq!(format!("{}", non_printables.display()), "\\x01\\x09\\x= 0a"); - let non_ascii =3D CStr::from_bytes_with_nul(b"d\xe9j\xe0 vu\0").un= wrap(); - assert_eq!(format!("{}", non_ascii.display()), "d\\xe9j\\xe0 vu"); - let good_bytes =3D CStr::from_bytes_with_nul(b"\xf0\x9f\xa6\x80\0"= ).unwrap(); - assert_eq!(format!("{}", good_bytes.display()), "\\xf0\\x9f\\xa6\\= x80"); + assert_eq!(format!("{}", c"hello, world!".display()), "hello, worl= d!"); + assert_eq!(format!("{}", c"\x01\x09\x0a".display()), "\\x01\\x09\\= x0a"); + assert_eq!(format!("{}", c"d\xe9j\xe0 vu".display()), "d\\xe9j\\xe= 0 vu"); + assert_eq!( + format!("{}", c"\xf0\x9f\xa6\x80".display()), + "\\xf0\\x9f\\xa6\\x80" + ); } =20 #[test] @@ -664,14 +429,13 @@ fn test_cstr_display_all_bytes() { =20 #[test] fn test_cstr_debug() { - let hello_world =3D CStr::from_bytes_with_nul(b"hello, world!\0").= unwrap(); - assert_eq!(format!("{:?}", hello_world), "\"hello, world!\""); - let non_printables =3D CStr::from_bytes_with_nul(b"\x01\x09\x0a\0"= ).unwrap(); - assert_eq!(format!("{:?}", non_printables), "\"\\x01\\x09\\x0a\""); - let non_ascii =3D CStr::from_bytes_with_nul(b"d\xe9j\xe0 vu\0").un= wrap(); - assert_eq!(format!("{:?}", non_ascii), "\"d\\xe9j\\xe0 vu\""); - let good_bytes =3D CStr::from_bytes_with_nul(b"\xf0\x9f\xa6\x80\0"= ).unwrap(); - assert_eq!(format!("{:?}", good_bytes), "\"\\xf0\\x9f\\xa6\\x80\""= ); + assert_eq!(format!("{:?}", c"hello, world!"), "\"hello, world!\""); + assert_eq!(format!("{:?}", c"\x01\x09\x0a"), "\"\\x01\\t\\n\""); + assert_eq!(format!("{:?}", c"d\xe9j\xe0 vu"), "\"d\\xe9j\\xe0 vu\"= "); + assert_eq!( + format!("{:?}", c"\xf0\x9f\xa6\x80"), + "\"\\xf0\\x9f\\xa6\\x80\"" + ); } =20 #[test] @@ -851,14 +615,14 @@ fn write_str(&mut self, s: &str) -> fmt::Result { /// # Examples /// /// ``` -/// use kernel::{str::CString, fmt}; +/// use kernel::{fmt, str::CString}; /// /// let s =3D CString::try_from_fmt(fmt!("{}{}{}", "abc", 10, 20))?; -/// assert_eq!(s.as_bytes_with_nul(), "abc1020\0".as_bytes()); +/// assert_eq!(s.to_bytes_with_nul(), "abc1020\0".as_bytes()); /// /// let tmp =3D "testing"; /// let s =3D CString::try_from_fmt(fmt!("{tmp}{}", 123))?; -/// assert_eq!(s.as_bytes_with_nul(), "testing123\0".as_bytes()); +/// assert_eq!(s.to_bytes_with_nul(), "testing123\0".as_bytes()); /// /// // This fails because it has an embedded `NUL` byte. /// let s =3D CString::try_from_fmt(fmt!("a\0b{}", 123)); @@ -916,9 +680,11 @@ fn deref(&self) -> &Self::Target { =20 impl DerefMut for CString { fn deref_mut(&mut self) -> &mut Self::Target { - // SAFETY: A `CString` is always NUL-terminated and contains no ot= her - // NUL bytes. - unsafe { CStr::from_bytes_with_nul_unchecked_mut(self.buf.as_mut_s= lice()) } + // SAFETY: the cast from `&[u8]` to `&CStr` is safe since `CStr` h= as the same layout as + // `&[u8]` (this is technically not guaranteed, but we rely on it = here). The pointer + // dereference is safe since it comes from a mutable reference whi= ch is guaranteed to be + // valid for writes. + unsafe { &mut *(self.buf.as_mut_slice() as *mut [u8] as *mut CStr)= } } } =20 @@ -928,7 +694,7 @@ impl<'a> TryFrom<&'a CStr> for CString { fn try_from(cstr: &'a CStr) -> Result { let mut buf =3D KVec::new(); =20 - buf.extend_from_slice(cstr.as_bytes_with_nul(), GFP_KERNEL)?; + buf.extend_from_slice(cstr.to_bytes_with_nul(), GFP_KERNEL)?; =20 // INVARIANT: The `CStr` and `CString` types have the same invaria= nts for // the string data, and we copied it over without changes. diff --git a/rust/kernel/sync/condvar.rs b/rust/kernel/sync/condvar.rs index 7df565038d7d..7bf3df980433 100644 --- a/rust/kernel/sync/condvar.rs +++ b/rust/kernel/sync/condvar.rs @@ -107,7 +107,7 @@ pub fn new(name: &'static CStr, key: &'static LockClass= Key) -> impl PinInit impl PinIni // SAFETY: `slot` is valid while the closure is called and bot= h `name` and `key` have // static lifetimes so they live indefinitely. state <- Opaque::ffi_init(|slot| unsafe { - B::init(slot, name.as_char_ptr(), key.as_ptr()) + B::init(slot, crate::str::as_char_ptr(name), key.as_ptr()) }), }) } diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global= .rs index 480ee724e3cc..4c4d60a51c1f 100644 --- a/rust/kernel/sync/lock/global.rs +++ b/rust/kernel/sync/lock/global.rs @@ -69,7 +69,7 @@ pub unsafe fn init(&'static self) { unsafe { B::Backend::init( self.inner.state.get(), - B::NAME.as_char_ptr(), + crate::str::as_char_ptr(B::NAME), B::get_lock_class().as_ptr(), ) } diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index 0cd100d2aefb..1008dd2635e1 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -382,7 +382,7 @@ pub fn new(name: &'static CStr, key: &'static LockClass= Key) -> impl PinInit Date: Sun, 02 Feb 2025 11:31:20 -0500 Subject: [PATCH v7 3/4] rust: replace `kernel::c_str!` with C-Strings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250202-cstr-core-v7-3-da1802520438@gmail.com> References: <20250202-cstr-core-v7-0-da1802520438@gmail.com> In-Reply-To: <20250202-cstr-core-v7-0-da1802520438@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 C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible and rename `kernel::c_str!` to `c_str_avoid_literals` to clarify its intended use. Closes: https://github.com/Rust-for-Linux/linux/issues/1075 Signed-off-by: Tamir Duberstein --- drivers/net/phy/ax88796b_rust.rs | 7 +++---- drivers/net/phy/qt2025.rs | 5 ++--- rust/kernel/devres.rs | 2 +- rust/kernel/firmware.rs | 4 ++-- rust/kernel/kunit.rs | 7 ++++--- rust/kernel/net/phy.rs | 6 ++---- rust/kernel/platform.rs | 4 ++-- rust/kernel/str.rs | 37 +++++++++++++++++++++++---------= ---- rust/kernel/sync.rs | 4 ++-- rust/kernel/sync/lock/global.rs | 3 ++- rust/macros/module.rs | 2 +- samples/rust/rust_driver_pci.rs | 4 ++-- samples/rust/rust_driver_platform.rs | 4 ++-- samples/rust/rust_misc_device.rs | 3 +-- 14 files changed, 50 insertions(+), 42 deletions(-) diff --git a/drivers/net/phy/ax88796b_rust.rs b/drivers/net/phy/ax88796b_ru= st.rs index 8c7eb009d9fc..b07d36f45a43 100644 --- a/drivers/net/phy/ax88796b_rust.rs +++ b/drivers/net/phy/ax88796b_rust.rs @@ -5,7 +5,6 @@ //! //! C version of this driver: [`drivers/net/phy/ax88796b.c`](./ax88796b.c) use kernel::{ - c_str, net::phy::{self, reg::C22, DeviceId, Driver}, prelude::*, uapi, @@ -41,7 +40,7 @@ fn asix_soft_reset(dev: &mut phy::Device) -> Result { #[vtable] impl Driver for PhyAX88772A { const FLAGS: u32 =3D phy::flags::IS_INTERNAL; - const NAME: &'static CStr =3D c_str!("Asix Electronics AX88772A"); + const NAME: &'static CStr =3D c"Asix Electronics AX88772A"; const PHY_DEVICE_ID: DeviceId =3D DeviceId::new_with_exact_mask(0x003b= 1861); =20 // AX88772A is not working properly with some old switches (NETGEAR EN= 108TP): @@ -105,7 +104,7 @@ fn link_change_notify(dev: &mut phy::Device) { #[vtable] impl Driver for PhyAX88772C { const FLAGS: u32 =3D phy::flags::IS_INTERNAL; - const NAME: &'static CStr =3D c_str!("Asix Electronics AX88772C"); + const NAME: &'static CStr =3D c"Asix Electronics AX88772C"; const PHY_DEVICE_ID: DeviceId =3D DeviceId::new_with_exact_mask(0x003b= 1881); =20 fn suspend(dev: &mut phy::Device) -> Result { @@ -125,7 +124,7 @@ fn soft_reset(dev: &mut phy::Device) -> Result { =20 #[vtable] impl Driver for PhyAX88796B { - const NAME: &'static CStr =3D c_str!("Asix Electronics AX88796B"); + const NAME: &'static CStr =3D c"Asix Electronics AX88796B"; const PHY_DEVICE_ID: DeviceId =3D DeviceId::new_with_model_mask(0x003b= 1841); =20 fn soft_reset(dev: &mut phy::Device) -> Result { diff --git a/drivers/net/phy/qt2025.rs b/drivers/net/phy/qt2025.rs index 1ab065798175..2f4ba85a0d73 100644 --- a/drivers/net/phy/qt2025.rs +++ b/drivers/net/phy/qt2025.rs @@ -9,7 +9,6 @@ //! //! The QT2025 PHY integrates an Intel 8051 micro-controller. =20 -use kernel::c_str; use kernel::error::code; use kernel::firmware::Firmware; use kernel::net::phy::{ @@ -36,7 +35,7 @@ =20 #[vtable] impl Driver for PhyQT2025 { - const NAME: &'static CStr =3D c_str!("QT2025 10Gpbs SFP+"); + const NAME: &'static CStr =3D c"QT2025 10Gpbs SFP+"; const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exact_m= ask(0x0043a400); =20 fn probe(dev: &mut phy::Device) -> Result<()> { @@ -69,7 +68,7 @@ fn probe(dev: &mut phy::Device) -> Result<()> { // The micro-controller will start running from the boot ROM. dev.write(C45::new(Mmd::PCS, 0xe854), 0x00c0)?; =20 - let fw =3D Firmware::request(c_str!("qt2025-2.0.3.3.fw"), dev.as_r= ef())?; + let fw =3D Firmware::request(c"qt2025-2.0.3.3.fw", dev.as_ref())?; if fw.data().len() > SZ_16K + SZ_8K { return Err(code::EFBIG); } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 942376f6f3af..68af33ca2f25 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::{I= o, IoRaw}}; +/// # use kernel::{bindings, device::Device, devres::Devres, io::{Io, IoRa= w}}; /// # use core::ops::Deref; /// /// // See also [`pci::Bar`] for a real example. diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index e75db4d825ce..93e375e75ca0 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -40,13 +40,13 @@ fn request_nowarn() -> Self { /// # Examples /// /// ```no_run -/// # use kernel::{c_str, device::Device, firmware::Firmware}; +/// # use kernel::{device::Device, firmware::Firmware}; /// /// # fn no_run() -> Result<(), Error> { /// # // SAFETY: *NOT* safe, just for the example to get an `ARef`= instance /// # let dev =3D unsafe { Device::get_device(core::ptr::null_mut()) }; /// -/// let fw =3D Firmware::request(c_str!("path/to/firmware.bin"), &dev)?; +/// let fw =3D Firmware::request(c"path/to/firmware.bin", &dev)?; /// let blob =3D fw.data(); /// /// # Ok(()) diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 9f40ea744fc2..3d812edec057 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -56,10 +56,11 @@ macro_rules! kunit_assert { break 'out; } =20 - static NAME: &'static $crate::str::CStr =3D $crate::c_str!($na= me); - static FILE: &'static $crate::str::CStr =3D $crate::c_str!($fi= le); + static NAME: &'static $crate::str::CStr =3D $crate::c_str_avoi= d_literals!($name); + static FILE: &'static $crate::str::CStr =3D $crate::c_str_avoi= d_literals!($file); static LINE: i32 =3D core::line!() as i32 - $diff; - static CONDITION: &'static $crate::str::CStr =3D $crate::c_str= !(stringify!($condition)); + static CONDITION: &'static $crate::str::CStr =3D + $crate::c_str_avoid_literals!(stringify!($condition)); =20 // SAFETY: FFI call without safety requirements. let kunit_test =3D unsafe { $crate::bindings::kunit_get_curren= t_test() }; diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index c60205606aee..631a81e79a9f 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -780,7 +780,6 @@ const fn as_int(&self) -> u32 { /// /// ``` /// # mod module_phy_driver_sample { -/// use kernel::c_str; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -799,7 +798,7 @@ const fn as_int(&self) -> u32 { /// /// #[vtable] /// impl phy::Driver for PhySample { -/// const NAME: &'static CStr =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// # } @@ -808,7 +807,6 @@ const fn as_int(&self) -> u32 { /// This expands to the following code: /// /// ```ignore -/// use kernel::c_str; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -828,7 +826,7 @@ const fn as_int(&self) -> u32 { /// /// #[vtable] /// impl phy::Driver for PhySample { -/// const NAME: &'static CStr =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index d1752a978af4..f23a433b2273 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -120,7 +120,7 @@ macro_rules! module_platform_driver { /// # Example /// ///``` -/// # use kernel::{bindings, c_str, of, platform}; +/// # use kernel::{bindings, of, platform}; /// /// struct MyDriver; /// @@ -129,7 +129,7 @@ macro_rules! module_platform_driver { /// MODULE_OF_TABLE, /// ::IdInfo, /// [ -/// (of::DeviceId::new(c_str!("test,device")), ()) +/// (of::DeviceId::new(c"test,device"), ()) /// ] /// ); /// diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 0c4189a478b4..27911eaede27 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -261,14 +261,13 @@ pub trait CStrExt { /// # Examples /// /// ``` - /// # use kernel::c_str; /// # use kernel::fmt; /// # use kernel::str::CString; - /// let penguin =3D c_str!("=F0=9F=90=A7"); + /// let penguin =3D c"=F0=9F=90=A7"; /// let s =3D CString::try_from_fmt(fmt!("{}", penguin.display()))?; /// assert_eq!(s.to_bytes_with_nul(), "\\xf0\\x9f\\x90\\xa7\0".as_byte= s()); /// - /// let ascii =3D c_str!("so \"cool\""); + /// let ascii =3D c"so \"cool\""; /// let s =3D CString::try_from_fmt(fmt!("{}", ascii.display()))?; /// assert_eq!(s.to_bytes_with_nul(), "so \"cool\"\0".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) @@ -325,25 +324,37 @@ fn display(&self) -> Display<'_> { } } =20 -/// Creates a new [`CStr`] from a string literal. +/// Creates a static C string wrapper at compile time. /// -/// The string literal should not contain any `NUL` bytes. +/// Rust supports C string literals since Rust 1.77, and they should be us= ed instead of this macro +/// where possible. This macro exists to allow static *non-literal* C stri= ngs to be created at +/// compile time. This is most often used in other macros. +/// +/// # Panics +/// +/// This macro panics if the operand contains an interior `NUL` byte. /// /// # Examples /// /// ``` -/// # use kernel::c_str; +/// # use kernel::c_str_avoid_literals; /// # use kernel::str::CStr; -/// const MY_CSTR: &CStr =3D c_str!("My awesome CStr!"); +/// const MY_CSTR: &CStr =3D c_str_avoid_literals!(concat!(file!(), ":", l= ine!(), ": My CStr!")); /// ``` #[macro_export] -macro_rules! c_str { +macro_rules! c_str_avoid_literals { + // NB: we could write `($str:lit) =3D> compile_error!("use a C string = literal instead");` here but + // that would trigger when the literal is at the top of several macro = expansions. That would be + // too limiting to macro authors, so we rely on the name as a hint ins= tead. ($str:expr) =3D> {{ - const S: &str =3D concat!($str, "\0"); - const C: &$crate::str::CStr =3D match $crate::str::CStr::from_byte= s_with_nul(S.as_bytes()) { - Ok(v) =3D> v, - Err(_) =3D> panic!("string contains interior NUL"), - }; + const S: &'static str =3D concat!($str, "\0"); + const C: &'static $crate::str::CStr =3D + match $crate::str::CStr::from_bytes_with_nul(S.as_bytes()) { + Ok(v) =3D> v, + Err(core::ffi::FromBytesWithNulError { .. }) =3D> { + panic!("string contains interior NUL") + } + }; C }}; } diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs index 3498fb344dc9..f86d109b4b89 100644 --- a/rust/kernel/sync.rs +++ b/rust/kernel/sync.rs @@ -62,9 +62,9 @@ macro_rules! static_lock_class { #[macro_export] macro_rules! optional_name { () =3D> { - $crate::c_str!(::core::concat!(::core::file!(), ":", ::core::line!= ())) + $crate::c_str_avoid_literals!(::core::concat!(::core::file!(), ":"= , ::core::line!())) }; ($name:literal) =3D> { - $crate::c_str!($name) + $crate::c_str_avoid_literals!($name) }; } diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global= .rs index 4c4d60a51c1f..732dde45024b 100644 --- a/rust/kernel/sync/lock/global.rs +++ b/rust/kernel/sync/lock/global.rs @@ -266,7 +266,8 @@ macro_rules! global_lock { $pub enum $name {} =20 impl $crate::sync::lock::GlobalLockBackend for $name { - const NAME: &'static $crate::str::CStr =3D $crate::c_str!(::co= re::stringify!($name)); + const NAME: &'static $crate::str::CStr =3D + $crate::c_str_avoid_literals!(::core::stringify!($name)); type Item =3D $valuety; type Backend =3D $crate::global_lock_inner!(backend $kind); =20 diff --git a/rust/macros/module.rs b/rust/macros/module.rs index cdf94f4982df..a534fabd29d6 100644 --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -229,7 +229,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream { }}; =20 impl kernel::ModuleMetadata for {type_} {{ - const NAME: &'static kernel::str::CStr =3D kernel::c_str!(= \"{name}\"); + const NAME: &'static kernel::str::CStr =3D c\"{name}\"; }} =20 // Double nested modules, since then nobody can access the pub= lic items inside. diff --git a/samples/rust/rust_driver_pci.rs b/samples/rust/rust_driver_pci= .rs index 1fb6e44f3395..cb4a9247ff5e 100644 --- a/samples/rust/rust_driver_pci.rs +++ b/samples/rust/rust_driver_pci.rs @@ -4,7 +4,7 @@ //! //! To make this driver probe, QEMU must be run with `-device pci-testdev`. =20 -use kernel::{bindings, c_str, devres::Devres, pci, prelude::*}; +use kernel::{bindings, devres::Devres, pci, prelude::*}; =20 struct Regs; =20 @@ -73,7 +73,7 @@ fn probe(pdev: &mut pci::Device, info: &Self::IdInfo) -> = Result>> pdev.enable_device_mem()?; pdev.set_master(); =20 - let bar =3D pdev.iomap_region_sized::<{ Regs::END }>(0, c_str!("ru= st_driver_pci"))?; + let bar =3D pdev.iomap_region_sized::<{ Regs::END }>(0, c"rust_dri= ver_pci")?; =20 let drvdata =3D KBox::new( Self { diff --git a/samples/rust/rust_driver_platform.rs b/samples/rust/rust_drive= r_platform.rs index 8120609e2940..d2df2d0f8261 100644 --- a/samples/rust/rust_driver_platform.rs +++ b/samples/rust/rust_driver_platform.rs @@ -2,7 +2,7 @@ =20 //! Rust Platform driver sample. =20 -use kernel::{c_str, of, platform, prelude::*}; +use kernel::{of, platform, prelude::*}; =20 struct SampleDriver { pdev: platform::Device, @@ -14,7 +14,7 @@ struct SampleDriver { OF_TABLE, MODULE_OF_TABLE, ::IdInfo, - [(of::DeviceId::new(c_str!("test,rust-device")), Info(42))] + [(of::DeviceId::new(c"test,rust-device"), Info(42))] ); =20 impl platform::Driver for SampleDriver { diff --git a/samples/rust/rust_misc_device.rs b/samples/rust/rust_misc_devi= ce.rs index 40ad7266c225..9d85819a195b 100644 --- a/samples/rust/rust_misc_device.rs +++ b/samples/rust/rust_misc_device.rs @@ -97,7 +97,6 @@ use core::pin::Pin; =20 use kernel::{ - c_str, device::Device, fs::File, ioctl::{_IO, _IOC_SIZE, _IOR, _IOW}, @@ -132,7 +131,7 @@ fn init(_module: &'static ThisModule) -> impl PinInit { pr_info!("Initialising Rust Misc Device Sample\n"); =20 let options =3D MiscDeviceOptions { - name: c_str!("rust-misc-device"), + name: c"rust-misc-device", }; =20 try_pin_init!(Self { --=20 2.48.1 From nobody Mon Feb 9 05:58:39 2026 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 4DA0738384; Sun, 2 Feb 2025 16:31:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738513899; cv=none; b=UOrqotrbsPK7uzfzfCAO5g1FAOvVZSbnI2Uyvumyp5eOTsVNy2J/Id/Puj7MmXpIYe8f+OK5gvqVvTUYYkg5sedDEFXowJxKBLygjSHD5mvgMWGrwzKusfO4q0dQ7CCqucD9PwgwnbrafhSv3kbsDF4hFSgtDxe1lMPdRpE/joo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738513899; c=relaxed/simple; bh=LTtoW8t7ruaMhWR49XFSPGXQJ0qL8M0PLPSll13Kse8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SLkHt2PjhzGoRGUF7tMAE/xZmS9lWAdgkJtpJsJ2YYGXiXRUfK0pxHvaWZe30aNeFSRAs7TVrsedpbr6krwQCvnn7PH150ITf/ykCvQpO4iBilCh3AnOJnhfTjxVcw/W9Kkex+LUrOHKgvvvmA+VAtNtjIzNpc2uFw8UXFwsTyI= 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=bAJ34RwF; arc=none smtp.client-ip=209.85.222.171 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="bAJ34RwF" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7b6f7d7e128so434212685a.1; Sun, 02 Feb 2025 08:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738513896; x=1739118696; 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=PsmImrWlafHaiAPIjGyqD/ERJHtpy0ANUP2YmLbPZhw=; b=bAJ34RwFn0L9Uv9rtD6P/PJOy4+1Q/UFvPV+rptmHu4hHazrdVZxL+ZKudrLNpeTXW +yvM+fPukYZGiufOGM8+/qAvU5iAIHWTfeiNnB+xXAu3h6EQHUoG7MGaV2iPOVPSp0Y5 cwIY4ZLqp0vl8auXyJA4mHlHjr/rqsgGfqTbSWqsx0iqkeO0IcBqBBU5pOacjfh7ccEl dGzGPPhTLAdZ1lBHK3erK/0Jbky8upy2qf+uSCEnMHQ4nyxg1lW+IAhS4cv7MQvEWQEo +S9ESaR0W/IZb2PITR4Hx30MeH6dRcVnk18LVwT1s8fuCrwkC1H4+8y+H/nIvd9FXHCq tN/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738513896; x=1739118696; 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=PsmImrWlafHaiAPIjGyqD/ERJHtpy0ANUP2YmLbPZhw=; b=ZlLtBsmBhEprs55YClTpVcqTVRWXwfD9onkCX1SYn949OGmJMCOu/5++Z9Lug7I7AX +XM5c55iLU5UaIH97AKGaR7K3DQS4a+l2NgIEW+ynmqztaZFiRTBZ5+RL8MeziHnWzxB vQSSVQa10/M/dklcAuVZmBFrCyo4dMGZCTlR8KAW5lyOqszdmb90rIPhDW/qfRZuzrN0 JhjXVBTeKPIl93QDNWJQiNT0x/VWQM/iGxth0CQSf3eSdNgFOLUBTsFUbfuf5KadkXVF LhSqW/Z+WqslnoEoHYqAhJR3pf/80l9Un1kuZhLU7DEhKws6R4h56MSPHbXamnDOBZvL ZhMQ== X-Forwarded-Encrypted: i=1; AJvYcCUm3BBOZSecHNDOU0xReCkSLfYFsw9uvkG24qa7RPbxbuPXzcEwcEm8MwO3ygEzflkqwmVu7PTE0KpQJXk=@vger.kernel.org X-Gm-Message-State: AOJu0YxIMs0/ZvIpzniWagoxJvcSlkcq0gAL2dgdR33RCPUlzR/Q3EwB Kd5psvBnJJFaY/13c6B/NIig9PbgX2IjK4lzzuR6670H4avrY2VIJxu33Xbwayo= X-Gm-Gg: ASbGncusRMPNVqs5KXBIo8lW27QBYpzkbezaXsJJyGUdPBnpWxi2tAVAQh/Ysxvh56M wRzIX9p6PM1uCv2zlIK6BLePSy6XEXn3JBShdI2PM9Pm401EmzoO+2OvhGvR5tCYyJYOKRZ54cD ETVIWuYzt3LzNDBWqC638rFuMpWJTASSVyjkXfhJbCroMmtRjK2hSTWz6X3xjBpSQ8QH5XiHhAd 7TBFdlu3TBX90NVE9BzfJtuPtWSen34yztkgreoRhm5+bTJ+VBexxkDUwkphbTGHHwxc92KY5mN D99D6evZHtDzyHdSKAkMNl4SsuJkAiYn0y0Dbxc= X-Google-Smtp-Source: AGHT+IEfrl4Vvug7X259jX7mZnIveRxwNRAsJQ+fTMadD2aib3r062c5MP/DQ1trriRb0XjldnAGIA== X-Received: by 2002:a05:620a:24d1:b0:7a9:a356:a5dd with SMTP id af79cd13be357-7c0097b7d6bmr1959574585a.20.1738513895913; Sun, 02 Feb 2025 08:31:35 -0800 (PST) Received: from tamird-mac.local ([2600:4041:5be7:7c00:f07f:fb14:288d:6f1e]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c00a8bb957sm421307485a.14.2025.02.02.08.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 08:31:34 -0800 (PST) From: Tamir Duberstein Date: Sun, 02 Feb 2025 11:31:21 -0500 Subject: [PATCH v7 4/4] rust: remove core::ffi::CStr reexport Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250202-cstr-core-v7-4-da1802520438@gmail.com> References: <20250202-cstr-core-v7-0-da1802520438@gmail.com> In-Reply-To: <20250202-cstr-core-v7-0-da1802520438@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 Clean up references to `kernel::str::CStr`. Signed-off-by: Tamir Duberstein --- rust/kernel/device.rs | 3 +-- rust/kernel/driver.rs | 4 ++-- rust/kernel/error.rs | 6 ++---- rust/kernel/firmware.rs | 3 ++- rust/kernel/kunit.rs | 6 +++--- rust/kernel/lib.rs | 2 +- rust/kernel/miscdevice.rs | 3 +-- rust/kernel/of.rs | 4 ++-- rust/kernel/pci.rs | 3 +-- rust/kernel/platform.rs | 3 +-- rust/kernel/prelude.rs | 5 +---- rust/kernel/str.rs | 19 +++++++++---------- rust/kernel/sync/condvar.rs | 2 +- rust/kernel/sync/lock.rs | 3 +-- rust/kernel/sync/lock/global.rs | 4 ++-- rust/kernel/sync/poll.rs | 1 + rust/kernel/workqueue.rs | 1 + rust/macros/module.rs | 2 +- 18 files changed, 33 insertions(+), 41 deletions(-) diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 9554921368c0..7248bfcfe8f2 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -6,10 +6,9 @@ =20 use crate::{ bindings, - str::CStr, types::{ARef, Opaque}, }; -use core::{fmt, ptr}; +use core::{ffi::CStr, fmt, ptr}; =20 /// A reference-counted device. /// diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs index 2a16d5e64e6c..0fbcdc226729 100644 --- a/rust/kernel/driver.rs +++ b/rust/kernel/driver.rs @@ -6,8 +6,8 @@ //! register using the [`Registration`] class. =20 use crate::error::{Error, Result}; -use crate::{device, init::PinInit, of, str::CStr, try_pin_init, types::Opa= que, ThisModule}; -use core::pin::Pin; +use crate::{device, init::PinInit, of, try_pin_init, types::Opaque, ThisMo= dule}; +use core::{ffi::CStr, pin::Pin}; use macros::{pin_data, pinned_drop}; =20 /// The [`RegistrationOps`] trait serves as generic interface for subsyste= ms (e.g., PCI, Platform, diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 51c5e0f0a0bc..81972a8f695d 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -4,11 +4,9 @@ //! //! C header: [`include/uapi/asm-generic/errno-base.h`](srctree/include/ua= pi/asm-generic/errno-base.h) =20 -use crate::{ - alloc::{layout::LayoutError, AllocError}, - str::CStr, -}; +use crate::alloc::{layout::LayoutError, AllocError}; =20 +use core::ffi::CStr; use core::fmt; use core::num::NonZeroI32; use core::num::TryFromIntError; diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index 93e375e75ca0..86ed79cef211 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -4,7 +4,8 @@ //! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.= h) =20 -use crate::{bindings, device::Device, error::Error, error::Result, str::CS= tr}; +use crate::{bindings, device::Device, error::Error, error::Result}; +use core::ffi::CStr; use core::ptr::NonNull; =20 /// # Invariants diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 3d812edec057..f83988959257 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -56,10 +56,10 @@ macro_rules! kunit_assert { break 'out; } =20 - static NAME: &'static $crate::str::CStr =3D $crate::c_str_avoi= d_literals!($name); - static FILE: &'static $crate::str::CStr =3D $crate::c_str_avoi= d_literals!($file); + static NAME: &'static core::ffi::CStr =3D $crate::c_str_avoid_= literals!($name); + static FILE: &'static core::ffi::CStr =3D $crate::c_str_avoid_= literals!($file); static LINE: i32 =3D core::line!() as i32 - $diff; - static CONDITION: &'static $crate::str::CStr =3D + static CONDITION: &'static core::ffi::CStr =3D $crate::c_str_avoid_literals!(stringify!($condition)); =20 // SAFETY: FFI call without safety requirements. diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 496ed32b0911..a129ef3292dc 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -132,7 +132,7 @@ fn init(module: &'static ThisModule) -> impl init::PinI= nit { /// Metadata attached to a [`Module`] or [`InPlaceModule`]. pub trait ModuleMetadata { /// The name of the module as specified in the `module!` macro. - const NAME: &'static crate::str::CStr; + const NAME: &'static core::ffi::CStr; } =20 /// Equivalent to `THIS_MODULE` in the C API. diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index 65f70ff61eb3..e8c272e24bd0 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -16,10 +16,9 @@ fs::File, prelude::*, seq_file::SeqFile, - str::CStr, types::{ForeignOwnable, Opaque}, }; -use core::{marker::PhantomData, mem::MaybeUninit, pin::Pin}; +use core::{ffi::CStr, marker::PhantomData, mem::MaybeUninit, pin::Pin}; =20 /// Options for creating a misc device. #[derive(Copy, Clone)] diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs index 12ea65df46de..04d8dc924147 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -2,7 +2,7 @@ =20 //! Device Tree / Open Firmware abstractions. =20 -use crate::{bindings, device_id::RawDeviceId, prelude::*}; +use crate::{bindings, device_id::RawDeviceId}; =20 /// IdTable type for OF drivers. pub type IdTable =3D &'static dyn kernel::device_id::IdTable; @@ -28,7 +28,7 @@ fn index(&self) -> usize { =20 impl DeviceId { /// Create a new device id from an OF 'compatible' string. - pub const fn new(compatible: &'static CStr) -> Self { + pub const fn new(compatible: &'static core::ffi::CStr) -> Self { let src =3D compatible.to_bytes_with_nul(); // Replace with `bindings::of_device_id::default()` once stabilize= d for `const`. // SAFETY: FFI type is valid to be zero-initialized. diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index af36ddac80ff..d248b966cab4 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -13,11 +13,10 @@ error::{to_result, Result}, io::Io, io::IoRaw, - str::CStr, types::{ARef, ForeignOwnable, Opaque}, ThisModule, }; -use core::{ops::Deref, ptr::addr_of_mut}; +use core::{ffi::CStr, ops::Deref, ptr::addr_of_mut}; use kernel::prelude::*; =20 /// An adapter for the registration of PCI drivers. diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index f23a433b2273..b8aabc229442 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -9,12 +9,11 @@ error::{to_result, Result}, of, prelude::*, - str::CStr, types::{ARef, ForeignOwnable, Opaque}, ThisModule, }; =20 -use core::ptr::addr_of_mut; +use core::{ffi::CStr, ptr::addr_of_mut}; =20 /// An adapter for the registration of platform drivers. pub struct Adapter(T); diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs index 96e7029c27da..21fa7b3a68c3 100644 --- a/rust/kernel/prelude.rs +++ b/rust/kernel/prelude.rs @@ -34,10 +34,7 @@ =20 pub use super::error::{code::*, Error, Result}; =20 -pub use super::{ - str::{CStr, CStrExt as _}, - ThisModule, -}; +pub use super::{str::CStrExt as _, ThisModule}; =20 pub use super::init::{InPlaceInit, InPlaceWrite, Init, PinInit}; =20 diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 27911eaede27..a68acb54f0c8 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -3,6 +3,7 @@ //! String representations. =20 use crate::alloc::{flags::*, AllocError, KVec}; +use core::ffi::CStr; use core::fmt::{self, Write}; use core::ops::{Deref, DerefMut}; =20 @@ -177,8 +178,6 @@ macro_rules! b_str { }}; } =20 -pub use core::ffi::CStr; - /// Wraps a raw C string with a safe C string wrapper. /// /// # Safety @@ -338,7 +337,7 @@ fn display(&self) -> Display<'_> { /// /// ``` /// # use kernel::c_str_avoid_literals; -/// # use kernel::str::CStr; +/// # use core::ffi::CStr; /// const MY_CSTR: &CStr =3D c_str_avoid_literals!(concat!(file!(), ":", l= ine!(), ": My CStr!")); /// ``` #[macro_export] @@ -348,13 +347,13 @@ macro_rules! c_str_avoid_literals { // too limiting to macro authors, so we rely on the name as a hint ins= tead. ($str:expr) =3D> {{ const S: &'static str =3D concat!($str, "\0"); - const C: &'static $crate::str::CStr =3D - match $crate::str::CStr::from_bytes_with_nul(S.as_bytes()) { - Ok(v) =3D> v, - Err(core::ffi::FromBytesWithNulError { .. }) =3D> { - panic!("string contains interior NUL") - } - }; + const C: &'static core::ffi::CStr =3D match core::ffi::CStr::from_= bytes_with_nul(S.as_bytes()) + { + Ok(v) =3D> v, + Err(core::ffi::FromBytesWithNulError { .. }) =3D> { + panic!("string contains interior NUL") + } + }; C }}; } diff --git a/rust/kernel/sync/condvar.rs b/rust/kernel/sync/condvar.rs index 7bf3df980433..3b82acdcd56c 100644 --- a/rust/kernel/sync/condvar.rs +++ b/rust/kernel/sync/condvar.rs @@ -10,11 +10,11 @@ ffi::{c_int, c_long}, init::PinInit, pin_init, - str::CStr, task::{MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE, TASK_NORMAL, TASK_UNI= NTERRUPTIBLE}, time::Jiffies, types::Opaque, }; +use core::ffi::CStr; use core::marker::PhantomPinned; use core::ptr; use macros::pin_data; diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index 5ad62d718279..7951c0ca60cb 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -9,10 +9,9 @@ use crate::{ init::PinInit, pin_init, - str::CStr, types::{NotThreadSafe, Opaque, ScopeGuard}, }; -use core::{cell::UnsafeCell, marker::PhantomPinned}; +use core::{cell::UnsafeCell, ffi::CStr, marker::PhantomPinned}; use macros::pin_data; =20 pub mod mutex; diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global= .rs index 732dde45024b..ee438654eb6c 100644 --- a/rust/kernel/sync/lock/global.rs +++ b/rust/kernel/sync/lock/global.rs @@ -5,13 +5,13 @@ //! Support for defining statics containing locks. =20 use crate::{ - str::CStr, sync::lock::{Backend, Guard, Lock}, sync::{LockClassKey, LockedBy}, types::Opaque, }; use core::{ cell::UnsafeCell, + ffi::CStr, marker::{PhantomData, PhantomPinned}, }; =20 @@ -266,7 +266,7 @@ macro_rules! global_lock { $pub enum $name {} =20 impl $crate::sync::lock::GlobalLockBackend for $name { - const NAME: &'static $crate::str::CStr =3D + const NAME: &'static core::ffi::CStr =3D $crate::c_str_avoid_literals!(::core::stringify!($name)); type Item =3D $valuety; type Backend =3D $crate::global_lock_inner!(backend $kind); diff --git a/rust/kernel/sync/poll.rs b/rust/kernel/sync/poll.rs index d5f17153b424..3349f48725f2 100644 --- a/rust/kernel/sync/poll.rs +++ b/rust/kernel/sync/poll.rs @@ -11,6 +11,7 @@ sync::{CondVar, LockClassKey}, types::Opaque, }; +use core::ffi::CStr; use core::ops::Deref; =20 /// Creates a [`PollCondVar`] initialiser with the given name and a newly-= created lock class. diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index 1008dd2635e1..69f419bdb0e7 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -135,6 +135,7 @@ =20 use crate::alloc::{AllocError, Flags}; use crate::{prelude::*, sync::Arc, sync::LockClassKey, types::Opaque}; +use core::ffi::CStr; use core::marker::PhantomData; =20 /// Creates a [`Work`] initialiser with the given name and a newly-created= lock class. diff --git a/rust/macros/module.rs b/rust/macros/module.rs index a534fabd29d6..7f81cbbcc4ef 100644 --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -229,7 +229,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream { }}; =20 impl kernel::ModuleMetadata for {type_} {{ - const NAME: &'static kernel::str::CStr =3D c\"{name}\"; + const NAME: &'static core::ffi::CStr =3D c\"{name}\"; }} =20 // Double nested modules, since then nobody can access the pub= lic items inside. --=20 2.48.1