From nobody Tue Oct 7 09:53:11 2025 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) (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 7B951275AEE; Thu, 10 Jul 2025 15:31:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161499; cv=none; b=D4CbWCtJVqfIZeJ6nxJ6t23yU8G7X9yGz9Wgg8WW34jXpcsBd2t74YlhPMBvwjzeRLpWN9+9QKJGvlqhyWatLstyd91PclfFiCQJX7ou9+oFSCS0eFxjUNPpVbJEl2fY2hxIhDQcoLGSKGKS4+QzbdzISV5+3LrWyWQVGkpIXSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161499; c=relaxed/simple; bh=SMbg/QZQA19CCgHGmkrUm3ENNSdod+XX5AR8EKjC0Ng=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rm/cF2mIenSIWW7P9eCvtdmjM3TVK+ijCEZ5LxStA9uhW0ZEUFiCy9LTd528ZXEbxTfeoEz0WaVACrKG012cJ8GZGKdL1GHg1NArqD2m42741jvqSAWjlioOm8ecJAmkhWbTGrKp/t6rqLX+Ms8VGH17HG6h9DrZpygwpM5tgNM= 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=cAjcqi3/; arc=none smtp.client-ip=209.85.167.180 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="cAjcqi3/" Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-40b54ee16ddso694289b6e.1; Thu, 10 Jul 2025 08:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161495; x=1752766295; 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=Thg/YcRGWCxcUDbNpBIJmKFEPbrVlfqS0d2bmRRNzHg=; b=cAjcqi3/ex4LDjLCWrs1EbX8uGuR+peHKsuj4tmoh5VRsw9xVU5lnXZNHK/H9xyKcW 0w1iAySZmxfZAqC4CBHolXhLb2Tl7QNPPs3LYSd3YiBLB+PBE9u7uuCSay0gSYPSWZLj EU4KS+oPAl145IFK208Cf8ErApA3zLCRkF7OwQWqP4NM1IKa8fRc7HUBUY2F7mK0ZtHJ v977APnyZKhkn4svVhM7Tz4Uz76IfpyI0llZw3AfNne+opUOIwIb3XZNYESHb3VY/ce1 NbVlqIjDOVaUihab7oAdrnpdmFeEfH4O50nkJlLfJ5HIIiHiypuGQdyC7O/yr/XQFlP2 9ofw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161495; x=1752766295; 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=Thg/YcRGWCxcUDbNpBIJmKFEPbrVlfqS0d2bmRRNzHg=; b=MGLTQS3bL28bpSrwasBH3WvhkjFvpHrCdd3HdLdSq1w3vntwGsjzRkwfVYREpbbF41 9258jY3GfiM09vTOIhTWiWNHIUuFlR65p9snfPJOizTl6tsMttWr8B9JQlSlbz0wz9n5 m9YR5OQQP2yLnumEFU5a/78SOFN9Q+TkunGGT1OFB+TqrpzQ4Z809E84Hd5lu6OKpuUa gh02HYbrNLAn5QHQVBx+3BKxA78bakveHMXJ/gcMKT07pqxXXfx4Ai7v9F73PD984vat LPS2S7orDukSmCVB8HwuTBwu87ANSeZXguTblrLxy0FG5bKJUrFmdCE5nZms+M1wHu/P QiiA== X-Forwarded-Encrypted: i=1; AJvYcCUXSL4d3dmyXPKTt1HcwKDFlEXT9DTKHAO50h9kWR+sZxbmzaahCzx3HMR+NJ0pQWuiksr6dMoOZSz4@vger.kernel.org, AJvYcCUqsKxPkRUpEajexkkNs1n7ODwMsDkV3EQv8khURI/7WPVAeRggFh634mcBpmL/HOPiwpr8QBPW@vger.kernel.org, AJvYcCV69gVEXfIOPiWrOBtamIgMl/VIA4BWGLfj4cI3MrjkNcu3XYn2JftvHEdLm2GC6l6+2Fpwyp4xo3lZfP6rG6/9@vger.kernel.org, AJvYcCVHvpzhTE9ZuEnBT0/QXK41ZcKMP5xprqk8vMXTHMy7SCglxRaXPmpTMk1K79Qv5UsVwX41uYoyhebaY8y4EqY=@vger.kernel.org, AJvYcCW4hpdm1vDJL4iDQa7Yt8YJYaQbRQ9BqGiZ4Si8Tk4sT3OoMoPakWXDdmLrBAkgsDtjpOnYGHSu6Q36pw==@vger.kernel.org, AJvYcCWN2jljhnZEIp0OKSDSKMiG2GKyWX5tHE0KUoUaareabeGCwdTSAu7DqTWEFP3zMhULa9yXHujjcda3@vger.kernel.org, AJvYcCXp7STKLrHTUU+SKu8BaHKqAASMoAI0folcTQrz0HNVHoOjp0l0+JEwypLlCJHpk0+qDyc18JxJ9j9Ql/2J@vger.kernel.org X-Gm-Message-State: AOJu0YxrU8XBrDUJUeFwutexqmt1I4gcXf8nFUizdjOYtt/Msb87XDwx gs8AvAGdI08d7Cl7y3XpL9sTIAwSghNQgMv+2HGVozlY5dcT4v9TUCHJ X-Gm-Gg: ASbGncu5W5+M/Pi7zliDGBGNP2xSLXMThqzztS5t3OtXneqf/EvMKHeuJL9igRdeRoL VeX6PdrNranpN+KtJEJVolNKHmPJVgCQ9GASKGryNrnekv6U+ykA50eia4TNkaxZx5M7jtKFK8U D0yUKtWtdjM3dt4NsqQwQnzkQwrklSnldogi22heBFWTEF2T3cX/iqCJJFnyxLOpCY4T2Pe8gfn vEpz9mj3pBXle0CR0j/niSZC/39yg+THuwvxm5Ql7diylQsONIA0QL6vLkUbA8wEaS7+D8IiQ0W kcHdGm2ehY71Ub80IP1U+U3TeoCRjARy9MXygib4ALj7SU5pP3vkPTSvO7OrIOeGQgeTt4C7BGr ukmFnk8YnSqaNLY/aq5XbU2o99EignmqbfdqKCTBLznlBgl/0HiHQ3yPqdw== X-Google-Smtp-Source: AGHT+IFCEP/L3bXBqs/Es3rdbPAg2su8LejciUhcU1gz4fMvPZB8zY7ZN8+0SGHQrEiHpdqhCeVpUg== X-Received: by 2002:a05:6808:1689:b0:3f9:36ec:dab3 with SMTP id 5614622812f47-413ac356179mr2847725b6e.14.1752161495338; Thu, 10 Jul 2025 08:31:35 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:34 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:04 -0400 Subject: [PATCH 01/17] drivers: net: 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: <20250710-core-cstr-cstrings-v1-1-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=3319; i=tamird@gmail.com; h=from:subject:message-id; bh=SMbg/QZQA19CCgHGmkrUm3ENNSdod+XX5AR8EKjC0Ng=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QN3w5ONsQPO4V7WoDPlzbqmPUAfhN5mJcoMl5G7WybG2qCB9U5TBgYrxU4+N1jE5/MMqUyoMUTi 8t9YDb9Lcwws= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- drivers/net/phy/ax88796b_rust.rs | 7 +++---- drivers/net/phy/qt2025.rs | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/ax88796b_rust.rs b/drivers/net/phy/ax88796b_ru= st.rs index bc73ebccc2aa..2d24628a4e58 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 0b9400dcb4c1..9ccc75f70219 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); } --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (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 05EDA275B01; Thu, 10 Jul 2025 15:31:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161500; cv=none; b=iIUNPLuqWQdpg+pJ4s1FKc9vmG5E+qiTiSu0PhEwSeVELuF3Y4R6GKEJWerR92DDApafnuSzRWjRp02e/jrB+iGJpFgh8vSZoniUdWp/zb0fWnOv/8NyJOFK+zPxoeP9sxxmWSvzEk1+f9/cE/msbr2jBB3h+2Oi1C2KhkcwqfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161500; c=relaxed/simple; bh=jWoII9lc0uOqozr99B/x/dDSCK5rJfT2DvtrFXqOZyg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=czcrl9rmYzB7YXk2l4uonJwXibbF2w3wck90224oYJ6XuddmFwcigc//LmeOYNos5N4yVdEhymFMmT0Amj+1BGq4LtU9TbDEYXDxR7hdHynOThlxkk5Nc3JBijCsav5ixZxthZIKze4dZNmMcecVyArM3R+i3cQjKwuSxdaAimU= 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=JgrAaHlD; arc=none smtp.client-ip=209.85.222.175 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="JgrAaHlD" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7d7f2600c17so175468385a.0; Thu, 10 Jul 2025 08:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161498; x=1752766298; 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=VRlT5YcC4Px+mPxn03mYZBsKKJl7yAFNq/vZwOxvJC8=; b=JgrAaHlDl+hVJ2G9UmYAs3f7d2/i+6Fl+xHcm8uRNUBH7AkgmLfLm+GNXibjI/dEYs dM6oMESrIcpSnLMiMtixjNAIjgmNpeA/HShVet6pLLz5e5wZwosVE43HEwVi1SqRlFWJ ZFZ3qMv92r95+LGQbhqQ0Vdyo1YMy0znKmTR3a13KBDgb/Q7muzUAZuq+6sGE7yRWAIL tbeL9swaBqoVipP9OKOa0/TDdfy0lLC9xHvPCNGQ2epaTVEiaF2aOkX6hNMGHFzVnEiW ujFPC3KJu+eaXW6cA1RREY9rUlMPamxIgm01UG6NVSVydNTXiuAH4Roq6/aFle4xfT9O +6cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161498; x=1752766298; 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=VRlT5YcC4Px+mPxn03mYZBsKKJl7yAFNq/vZwOxvJC8=; b=dvVyy3v0bkpA3dFhVKRHrAzTelGoHE7BxpLhcJDFT21rSsJ9atovnRUq1MR/Uehv8y togG6kGbShQy/YyNdTvCJByCtbUzMPU9kI6NxVBjJ56hmrymoSbKnCcSx3Eikyvy+E0/ 69PV2zv7XpColGCW9mk9vJ4afRW4H/zufC+ayms3N3E7fV41db0XbPaJYxPXgjKj2kIe PMcS3Lu5FTPWKdFI7M1m8uXkFotcqOaJ4JpZiFggenT0fETUIW1k2P+2108Ra6oMX2Cc I2edFwLpnRo/U7M24Ytsr+B9p6MVg2OBOzIsmxTg0yZP/g7qgAq6ilJoo6vQ91lKUelr Ec2w== X-Forwarded-Encrypted: i=1; AJvYcCUFKWbZR+I1QJFiwiKX9ZxH56umaRw4SGRbMnrZvqh2hUSxaEm4BrfCvcCoVeiW56GkBMmwbCPBOXhO@vger.kernel.org, AJvYcCV2nLcgnOkvdXv0pq4ivX+TsaXEfvl9ao50u7Uv5TtULRP4NEEdi3N9++Z+r5WZKE2BjDgQYB2kQRrDRBXZYK5z@vger.kernel.org, AJvYcCVLyryva/mbPl25bL1MR/XDwWn8ouwljnaP6JSY4+XQGogMrHhgf8N+e0sFPLH9q28QAezswzISC0fZOpZh@vger.kernel.org, AJvYcCW1CK/YAUiGLodrqIVFu7JGdnvhpruVqKMjzltfx6nGyvIxRSL0PoMlAuE4fp8SyAqE5K/DGYCPHy5a/N/Fwzs=@vger.kernel.org, AJvYcCXCOYg86SwUJysZtWo6QPPEiIqmh0/A+dSzFl5cv1Qi0PHc0YKqKpy96pGtcQTyJRZA54+g5LUvzLIvFA==@vger.kernel.org, AJvYcCXDnG/jw+EjDbZ5djIcKTC7qGCU6tjYCC2wWgqqn37bzB5uSxtv3GqOv7gqWrvw7e2ZFXmfCkmyxCdr@vger.kernel.org, AJvYcCXoMnKTPbeZXjqvpl+z86QPm3O1u6ZzhN8TV/7eeN1Tnd9XxgVfwbVoLUNOLfsSCiKwHpz6EgYF@vger.kernel.org X-Gm-Message-State: AOJu0YwQmfmR6tQJciAj2Ej9p378UstOK63sqxY08VOVXUP5kK4wCSo8 vVwV/yZj/Z6L4SquJ0YiMrynubGSz6TugcFicQjMFFCPffFXNaf7LSGJ X-Gm-Gg: ASbGnctTDFEF69nSqmT+9PKi59v+uF31uHqwNxnzbrPB+HQlyqAV2ArimnGlSyu8ufy Wfougl/UGpMQjgM9t77Np3vPrRTY+ailUq+wGn/moMRQEhBhsfgnDpcUl8lGAxHtCkBLnS5zccd tVZyZkWtLUI2DG72R4Tb5hDCpcVAr4DGgdkrIz1MFI89ftMZhiYVM3OlM6B9SaotP8JEw37xFHS jv575Z7/rwVdhJ4cg5DLDgiZ7PB559uYhmRZCHti7pe2QlYYjR1H3/FSlUiwrC9B9bH/z6QZTw7 44stRRELotejivnqA1vQvD1HotlBlcK6tG4lUT++NHKmCLCGOrpKOjzBUGKf6vgmU+b96tguSvT NvWqCEC/hzmSHq7Sf7/mhXgU54XGqLmhyhN5DMjrrwjifYAWGucDTUi0CSA== X-Google-Smtp-Source: AGHT+IEbHnc/thQlN/cyxkVseSvn6XEvlMVnH9dmo92154uWAjWA+CuUka5sntlNHeO5E59hD3lXgA== X-Received: by 2002:ad4:576a:0:b0:6e8:f470:2b11 with SMTP id 6a1803df08f44-70494f829cemr82415736d6.23.1752161497573; Thu, 10 Jul 2025 08:31:37 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:36 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:05 -0400 Subject: [PATCH 02/17] gpu: nova-core: 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: <20250710-core-cstr-cstrings-v1-2-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=2662; i=tamird@gmail.com; h=from:subject:message-id; bh=jWoII9lc0uOqozr99B/x/dDSCK5rJfT2DvtrFXqOZyg=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QMZas2KzwEMZU/sgiAbM9CbclvQutwrXcG0/5lwfR+8HPYuE3tYEpf9CUwqyhzKlL5//kLxflaj 9SaeU9bFc9AI= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- drivers/gpu/drm/nova/driver.rs | 10 +++++----- drivers/gpu/nova-core/driver.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nova/driver.rs b/drivers/gpu/drm/nova/driver.rs index b28b2e05cc15..87480ee8dbae 100644 --- a/drivers/gpu/drm/nova/driver.rs +++ b/drivers/gpu/drm/nova/driver.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 =20 -use kernel::{auxiliary, c_str, device::Core, drm, drm::gem, drm::ioctl, pr= elude::*, types::ARef}; +use kernel::{auxiliary, device::Core, drm, drm::gem, drm::ioctl, prelude::= *, types::ARef}; =20 use crate::file::File; use crate::gem::NovaObject; @@ -22,12 +22,12 @@ pub(crate) struct NovaData { major: 0, minor: 0, patchlevel: 0, - name: c_str!("nova"), - desc: c_str!("Nvidia Graphics"), + name: c"nova", + desc: c"Nvidia Graphics", }; =20 -const NOVA_CORE_MODULE_NAME: &CStr =3D c_str!("NovaCore"); -const AUXILIARY_NAME: &CStr =3D c_str!("nova-drm"); +const NOVA_CORE_MODULE_NAME: &CStr =3D c"NovaCore"; +const AUXILIARY_NAME: &CStr =3D c"nova-drm"; =20 kernel::auxiliary_device_table!( AUX_TABLE, diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver= .rs index a0e435dc4656..16cd7e36662c 100644 --- a/drivers/gpu/nova-core/driver.rs +++ b/drivers/gpu/nova-core/driver.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 =20 -use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*}; +use kernel::{auxiliary, bindings, device::Core, pci, prelude::*}; =20 use crate::gpu::Gpu; =20 @@ -34,14 +34,14 @@ fn probe(pdev: &pci::Device, _info: &Self::IdInfo= ) -> Result(0, c_str!("nova-c= ore/bar0"))?; + let bar =3D pdev.iomap_region_sized::(0, c"nova-core/ba= r0")?; =20 let this =3D KBox::pin_init( try_pin_init!(Self { gpu <- Gpu::new(pdev, bar)?, _reg: auxiliary::Registration::new( pdev.as_ref(), - c_str!("nova-drm"), + c"nova-drm", 0, // TODO: Once it lands, use XArray; for now we don'= t use the ID. crate::MODULE_NAME )?, --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23AA2277C81; Thu, 10 Jul 2025 15:31:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161502; cv=none; b=b5S7VhgskP+zQ6tIHzou1bLEil+PCH6yr3jxScru31HNOPv2T7jMaPERLHWbyYXTgIUn60bLyiPGVMuB2icJLRocquUTfZ8vUKi2jHVWXMj2eu5lJA1F45B56YrXSmhpJZbnlD80atIey9Y+l4/SuTHUet7g3D/vc6a/xzGj6ug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161502; c=relaxed/simple; bh=az5NNitfUcds9iE19O7xLtIu231XHyJdqG76dw04NVo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qiXSMH0dxNUAY3eoyWUrVxw73GFLO5vsHRdE7Hg+L4pTFMyGV9THAZebQUTYX3kcD2Y7G9ktlXLUzMYggT1j7XM/ktWfVsNZsLtsyfrP3csfv+9Gsd/nYFjkNe7nOuKOyDOi/3eyRuRwHApJJSCgf8S4oI0wVnZKXHzrqxJt/lo= 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=e9wkif4P; arc=none smtp.client-ip=209.85.222.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e9wkif4P" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-7d20f79a00dso160336285a.0; Thu, 10 Jul 2025 08:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161500; x=1752766300; 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=UIoKeX/8IwobjRqJguvSB5N8fT59ta6ahFnyjlyNQrY=; b=e9wkif4P+UmPy2gsDDsAK+K7CqCbb9s39A9pGq9JLT/a6njMH7pIxODXkWMqB4055t oZ45L5/B3M4Ug+3VBIkmdFmu4igJmwMKs89dEdBoeSeEvK1rzXWqPmVomkhM4v7QgrQp 06475BPvAqhS51sCC/TtGc3Q0xPv2kMEz29V6APnJpW7YOtHHEYiHQdrw/aLtJeXb4rU 5yi3T+OsjbfQTB1jBdq6PyqmVeGlM7hbrhnbWsmMrk4124cuLq1310afo9pdp08X8v3t tUyrCPSF61N/twmiYdMUo485nYEzKgRvNZ9x7yyr/tzzFX3UndjSVolHra/1RNNXhiF2 ejzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161500; x=1752766300; 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=UIoKeX/8IwobjRqJguvSB5N8fT59ta6ahFnyjlyNQrY=; b=v9X3Wq65Fo73Emk0L/L9S+AUHkye6XeWcCXTF1QYRADM/TCxBoRZJGXri/396CGnk5 LquZlBo0qt/LH5Zt4ebR489UGAjJtR5DH7I1+wlGfD/Qft/jM+Pl/LsEeQm6vF29Yojd CFHfPtu5SEHF5VGvzmwaKyUTgp42ld7xKyCXA6sXxo60r73U8x1sRBsvhaRenzodrgAs yEgOYyDyLglg88Glhp6LJ2BwGrjiW4oFcUsCdTqk1cCmF2ig0LIpNz8Esf0V3ADIOnRc FbCgCiXwHkU6SjsvZ2kfaadkhGFBSUSgHDVhQ0sySSXnk1vEGhx8yr7RpGHmEORlTRPo IygQ== X-Forwarded-Encrypted: i=1; AJvYcCUIpDCxMT175FqZmk6w76FokR0XzGukNPMrslXyXkFS0CMh0spnobxTeNGnZ+WTNYsApZk9nG0hV7ow@vger.kernel.org, AJvYcCUS/GFgoRdpQ+i/LBdjPexoJwa2RlbDrsWCuWY+wIIrVDLAinshFAMIbKDj5/wUfXe+3ZitxblUPQxUwVzf@vger.kernel.org, AJvYcCUW6XjcdGd5K8P5mkd77red1B0z92VDpirhXIcyuKv5mmmamoATifuZPvcaHtuUv5kfU61aWA1D@vger.kernel.org, AJvYcCVdFd9Q383iH7slJC7lqmD6SyENUGFfYYH55pzpyp/lfX0i6iW0YneFbGqcZ/Y43tNLjwS2m5+TEdq5cDHFB/Jb@vger.kernel.org, AJvYcCW1r+PV1vfSzmaKsAKeqi7eG5RHXJELYhqeWbvvFGXyrmfH/zrBxRDKgLy2NL6iMoE8f/cDnfDAM23OlNB9O9w=@vger.kernel.org, AJvYcCWv4ZTKduE883I9Ifx55j1v4P/y9glat7oBOMRS99ePTJnA7cCJVcFcpqh0rCBEQ27vQ7azcdgfyzM9@vger.kernel.org, AJvYcCXpKRLWlpBCfgWMLB24KRD1Hc6NzaXfkq3mDccNgf5dkBavMkWjDOEvQWx2bdSmvbkIAXBQO2DRT6Vozw==@vger.kernel.org X-Gm-Message-State: AOJu0YzH4a1quv7uaZE+8TJFSiY8KyQ1WtTKjitPsM5YuaBdApuENhCf nTOB5w3biPdUlSipEMBcgxjDwR2ywQSoigOv6Zy5ouWMQqTfAz4K3QAO X-Gm-Gg: ASbGncvntpA9k8hDHNvIgbRJFwfkI12bHVCbytzmUTiWqQEJOccN+n72rJLlmTC7ScQ stXQYsNf/tDFIlbQSI9JuUo+hjJceF0k4xGy2LshPAUwVO4FwXU6pct4eUy2Ft1Qh+MtHurvsFW fdnYBzYRqAudz3ANAiyRk854HKHs5g9KdUIZ3mapbnAWFVgUwui4c9z91OWj4ejCaxMCzbfsjer KkDuduUg189MjWoPBXVUHUoqeVfOxZCALbibR3JXe9DhuSWrPPDYldDhfSo05hsPSgxhiGC+iiz NBZnz3b/+69YqW8TYrsWBbyJceH7yCFGMJCfDajrvG1Gp7SfyKc5UW6a3DO/IIiQepTi/n4bIxV 8pK6ll7nUTKvO72wfpzSuzDOzKgepT3wfS0VLIBX2MB5E1THoI4fMhVIG9w== X-Google-Smtp-Source: AGHT+IF8oHr5nLMMLgFUIh+26Oo3vEZrp2qQehIs/0HytXc2xoqaUlO0ptkhMM21EW8ipxSnApet4w== X-Received: by 2002:a05:6214:240e:b0:6fd:ace:4cfb with SMTP id 6a1803df08f44-704981132ffmr46767636d6.27.1752161499734; Thu, 10 Jul 2025 08:31:39 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:39 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:06 -0400 Subject: [PATCH 03/17] rust: auxiliary: 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: <20250710-core-cstr-cstrings-v1-3-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=1183; i=tamird@gmail.com; h=from:subject:message-id; bh=az5NNitfUcds9iE19O7xLtIu231XHyJdqG76dw04NVo=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QI42baxaWQWxeOM7ZaAjjbblr9vFQZMLvDIIk3qF0FUq544A2sQ7lOWi1QLUpn5SnbV431+3dBC JpBmPn2X7GwM= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- samples/rust/rust_driver_auxiliary.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rust/rust_driver_auxiliary.rs b/samples/rust/rust_driv= er_auxiliary.rs index f2a820683fc3..7c916eb11b64 100644 --- a/samples/rust/rust_driver_auxiliary.rs +++ b/samples/rust/rust_driver_auxiliary.rs @@ -5,13 +5,13 @@ //! To make this driver probe, QEMU must be run with `-device pci-testdev`. =20 use kernel::{ - auxiliary, bindings, c_str, device::Core, driver, error::Error, pci, p= relude::*, InPlaceModule, + auxiliary, bindings, device::Core, driver, error::Error, pci, prelude:= :*, InPlaceModule, }; =20 use pin_init::PinInit; =20 const MODULE_NAME: &CStr =3D ::NAME; -const AUXILIARY_NAME: &CStr =3D c_str!("auxiliary"); +const AUXILIARY_NAME: &CStr =3D c"auxiliary"; =20 struct AuxiliaryDriver; =20 --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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 3C556278761; Thu, 10 Jul 2025 15:31:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161504; cv=none; b=k7CCcRBG+jXUuDEa4/cwaos5bsdYursfI5JD8FwzxssLPfV5J9q6D9nxWKrFfb2sYls7AyPsyzi9drEy7QOuBk2U8MfQPJ0k68Qzkp0HTUHYTAIegg5IPs5mX8jPMhAdfalLGaKa8UuU3pcjxT67RX948Wq3dBztQb1pCya2bGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161504; c=relaxed/simple; bh=hq6DDcaya80h1WPZeZ2fcDK/88nl92ydlSKTms9sp+U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D/wIAf3bEoF4KABRqIX8u2DRSqmssVu5Z3zDqiYV35G+jRtkXHaajeuQgrYglrnDUy8+Mbmn9XSbMcRmw3LepXMDNZz9MQuSHDBp0D6zaISXuRVu3DPGEfqmd6cTML343se3Nx/m9mASTaSP+mEjpQ6wPmnRSrxtuMIgo35mnzY= 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=MNn17M+q; arc=none smtp.client-ip=209.85.219.46 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="MNn17M+q" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6face367320so10035596d6.3; Thu, 10 Jul 2025 08:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161502; x=1752766302; 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=Jwny/YDMsp6Uti9L9noK3c3durn05YOXlAE+7kmbbsk=; b=MNn17M+qWQSR/jcuCIr7El2zAxAsmoUtFtEJ63ZWnvs8TYEbyYGfp+jkR7zHKE1JSV X+KaikLSgJM9UNC+/KUv6m0foELRGSpNhYabFMKvEvoc81l4toKQz+UI72t/uPFkHKJl gJn9zOd9emHEo6ZL/ZWNtmy2wXLi5ce6NdrEIZLX3Nk3zTGbEFOJjK8K8i4MNY1XJNvQ oikj4lv23JAzJUV0uUFQRJhwvVMpBNCTv6FGP5GBVV1GIjo/CKrzCU0xfxyZXcjYHNWs 51zKU/PtzL28urV2Xwumzo85c9fTWmSM2hU2tl1FvkR5uZPxclUyJ1bbSbMWpj23nBWf HIuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161502; x=1752766302; 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=Jwny/YDMsp6Uti9L9noK3c3durn05YOXlAE+7kmbbsk=; b=fNrE0fhBIeYgywH/M9LI+zI3xzIyvtf25DBvFwaT+8b7+9EJEuRmudRQCnhdGl1jf1 15eioyBAIrIdBA2zCzfNSzg5eRI0JqO4ktikPAg2c8+voIH6R9x1tXtl++9FH/P8nzOu GzpWjvDfKRWKrcDwIhurLhothsvgiNk5Bu/RJcNWLNZJEVtMqWq1SjNF+q+S97GSh6ZR qRCU087rJNhTGak2VhxXwecXl8WIo3bHtY2NlPy/QZO6DbbWegS1N/VAUZYmlXf4/0or WjlpG11ob0KIU1+sIKbX/CIgRo5/Olahax82nWa0Wt1pquWNyL2P4Jqn5TEqT+H2/MQQ gRzw== X-Forwarded-Encrypted: i=1; AJvYcCU1VTwWB8TOW99gwYXh28NyxHTqMP4tGgkhm0t/lWGfXDJf1W0GnZIpRI6q9i+0TScH5f5nYi0l5Hmn@vger.kernel.org, AJvYcCUUUtzmWjPhZxvaAkF4Kv48+ew/ZI41SgZWxv2NdFkTDa4sQYvN/3CnG3KvG2jXcFwJ7vL+237Fc5QnLAj1@vger.kernel.org, AJvYcCUhOGSAxbj5pMj6RoQU0rG3o1rW2rD0hsxAjpiezxa+j0Ji9W5qrJarlDulx8sLWC7gm0PuyVnJRAcvX09Bnks=@vger.kernel.org, AJvYcCVBYFxXvitbhCtP29ebKjG2zaAz4LqGVE4JIbFVTkvi1YML2ZK0s1cROEFnL7/Esw6Pfa76tdoE@vger.kernel.org, AJvYcCVatYH8XJujtblFedPd3OzmyBpDegion8rqTJvwdzGohZZfd9NoxPui3acI2L3Ikl6MwJVzjJhl62w0@vger.kernel.org, AJvYcCX7ko+3a/n+5gpRfDrY5wXXboKzv0aee2UvjglMIJsTaXPtdh5u5IQSfLO74acbQaZWZBYs2aqFXb4CKQ==@vger.kernel.org, AJvYcCXUqs9LTfaHIy4cgFTQlZte02sX/yVJrrulESVvwpgQ4ZHOG6H9k/jp11qD4ZhUt+uEi4Mts+98pAxski5qVMCs@vger.kernel.org X-Gm-Message-State: AOJu0YyHSEGwfbl06kRLf0HP3qz49gpgrQpq5NPe5DZSkILeVAxYr47E E2o8tR67E1Uqt2E60u475qszH8inqpPnz49PqKHAA+qqeh3Abi0Dt8KcPkerZfQ3ONdtFQ== X-Gm-Gg: ASbGnctnGpTnt4XLOWjiFFz9693QSOGNbn9bBp0uQbpYobg/qL7QTqkjbY+8yGJcDEK epK5zSPQV0ud3m9oT5YbKrK8WcyYyEgZsZGrqvkE2CCZ5MqpvjGR1Tf5RY2QEZpwrbFxlhMWKj4 scQPbFZIpQtpPLLexgP+oA4rDSn4/CBzMIq74zFUHrUqBgI9CbnfL/aMtjJLMGfMyVVGWLAztBs 4b/CzgmpO1lXTBOrtM8ne3d9xMSfyMvA1YbwMfE5SPTPM87u/GCiBEz+kznnxVCkWnHMnO5qfQS 87eoDX/vfo9EwaPtHoBd5z/3HgeFookjGW/B1azIt1Hwxwr81WG43rYFAKefga7gW6TdJeJQVtx EhwPD/QOWCsD8PGd8TnrA3hypWvPYE0y82lJ3atlON+5dx2OsoCUw7EzX8A== X-Google-Smtp-Source: AGHT+IH7OAFO4MBtcOae4A7Ufmd/gVO0MGsqsoI+qUvq0KaZNdtURjl40SFBRWgfYeNbvdb036U2Lw== X-Received: by 2002:a05:6214:3382:b0:704:7dfc:f56e with SMTP id 6a1803df08f44-70494f4b3fbmr68970736d6.18.1752161501839; Thu, 10 Jul 2025 08:31:41 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:41 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:07 -0400 Subject: [PATCH 04/17] rust: clk: 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: <20250710-core-cstr-cstrings-v1-4-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=1647; i=tamird@gmail.com; h=from:subject:message-id; bh=hq6DDcaya80h1WPZeZ2fcDK/88nl92ydlSKTms9sp+U=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QJ9/Zze0YHCWW3FvdYU/EkNUZX2HriURvSzn4pTjOzAXH73w74+FqJhMSmpj2ynoVkrRw20pPDF ulFzacsKb2A8= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Acked-by: Stephen Boyd Reviewed-by: Benno Lossin --- rust/kernel/clk.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rust/kernel/clk.rs b/rust/kernel/clk.rs index 34a19bc99990..fb0f259cf231 100644 --- a/rust/kernel/clk.rs +++ b/rust/kernel/clk.rs @@ -100,13 +100,12 @@ mod common_clk { /// The following example demonstrates how to obtain and configure a c= lock for a device. /// /// ``` - /// use kernel::c_str; /// use kernel::clk::{Clk, Hertz}; /// use kernel::device::Device; /// use kernel::error::Result; /// /// fn configure_clk(dev: &Device) -> Result { - /// let clk =3D Clk::get(dev, Some(c_str!("apb_clk")))?; + /// let clk =3D Clk::get(dev, Some(c"apb_clk"))?; /// /// clk.prepare_enable()?; /// @@ -272,13 +271,12 @@ fn drop(&mut self) { /// device. The code functions correctly whether or not the clock is a= vailable. /// /// ``` - /// use kernel::c_str; /// use kernel::clk::{OptionalClk, Hertz}; /// use kernel::device::Device; /// use kernel::error::Result; /// /// fn configure_clk(dev: &Device) -> Result { - /// let clk =3D OptionalClk::get(dev, Some(c_str!("apb_clk")))?; + /// let clk =3D OptionalClk::get(dev, Some(c"apb_clk"))?; /// /// clk.prepare_enable()?; /// --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00C28279354; Thu, 10 Jul 2025 15:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161506; cv=none; b=E1tRYC5qf/i06Lvh6qEomGT3FI70DDYahnPfh+BqDLsF//h/SFWYRP7lLt4l3lilMomCSKNHjKr80IExbL/bb1QAjoLqka5OihyhP7ihAIa5eCzTgXqiRz//VDhQW/m36wuceYR+0SvjhuW1TYKuO6x8KFvBk8btaOKVWU4hM68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161506; c=relaxed/simple; bh=af7hQUrBJ3daMKChg+zbV28e67c6tFE/LW/j16AENwg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NJfrxKoPXi62y59jvoAjKxySOOHSfKUHkMiGwFpdR1X8BnRZAvzYOGas23Q0v4BM/sq4ALq9DNcSsz5nSaumALq9G+tr4oehR2CDPk35IqwgYMnak/aTtuOQKddMAQsb1ncIdWJyBfi8X83QjLOo+kFJYX8ssPr0ImERaxw2HNQ= 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=fGvRGVv8; arc=none smtp.client-ip=209.85.166.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fGvRGVv8" Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-3df2f20f4bbso4088465ab.0; Thu, 10 Jul 2025 08:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161504; x=1752766304; 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=Pk9yBfYr9s3i/fDmLyzx3AytEEzdMrcwMBN15yX6MyM=; b=fGvRGVv8ca0UeiVBY2AG+9h20pmL6zqnysPAi2ebMG2T5Zw6C0nZM1CbFWFnwtsFgA F3SRJAwqgT/KUFdQw17Yw0QD4EiA9XHo9PuXx+hwCoCQxJi9IiA8JP07OGi9KOUZQ93O oD8XY/O5B7V64f1yS/UateFmc2tOukxCSE7kgV+Ei/zehUgopnbOyTGREZ2xfcugUAfv qQB8t/gu3FCipUCgPzsYkSYAE/zJOT0dhFWXzO2pby0Mof6fTN5wcL/cXL2hIa7TNJF5 G0V9Cs3BoSDvENvxLunMJayBFzAsWrNtQmqKeqs99x+U/aFeBHlmyd4fwLl1yFlaZrC8 efQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161504; x=1752766304; 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=Pk9yBfYr9s3i/fDmLyzx3AytEEzdMrcwMBN15yX6MyM=; b=w1Vlu+2/KJn+v2+15Sqds/MJCrs5wZ8F3qtbuUymtzIMMzHJKz3JYKWjxZE7KFyqWb BhxxpXFeJfVoTnxfNX0bC7SoJewKq1BabxHVJxFqcm/Bt1EF6D8crpwgr6C2Nw3j26vs 3DQc5a4b+i2qUyr/k09iRToktCi8WT+1FfC66UGuvciGSkkIGsVi2LEaEQMMT3FQjoOG EpGlfyUJGT8zkrdZS5Mr3jbq6NrbKYotzWAJpiRQGxjccE3iBnjYIfmgDkFBrF384JZq jvXiQBVS62/Jsfhv/h0KvuHbnJsy+bB0WUksuEy81cZHiyhpuJPS9fTIJ4ycovX+R61o s4Mw== X-Forwarded-Encrypted: i=1; AJvYcCU+cUwDZmjdRSU5uvw1p6C6XwfVXMFKXwckoBl7RCT4ZkzhTK2urY2mgQP3hNIhNA2RjSXPqbc+@vger.kernel.org, AJvYcCVbSdR1BceznSjs6dlZev01YrG/k9f2/3mIXzEwQZeoXnvha0MEGNgvRwaOW4PYK+0CtjQVHkzknZJQ@vger.kernel.org, AJvYcCVwrQb1camjTyPHOoPCU1hQnTdvSFPEogDwZmzZhcD9Zpb08+Ls+BosgFs63t0Iyo3XAiAlAp2Y/3d786YO@vger.kernel.org, AJvYcCW6bqimBhW44xHIWGezy+cerOpLI+UcG03iqTNgLVfXlenuyTC/4D8HAyn/PAjZnM/gvtkdxQyhS0erkDNwZ8Q=@vger.kernel.org, AJvYcCXCYEnSIFOGhEDaUJd+M/FyuCRwsjc3buFYU+jwWEgk9d7u6nIesku7PZOc4x4SIzdWFu81kcOLk2bU@vger.kernel.org, AJvYcCXUXKjKDr+1zCvZBQdpdF/Bk9O1FDqDi/CIYhkCRA5vQXfFLXIxdC5T2DG2g0XisVKiKDsGD5bxIe7/i3WZRITT@vger.kernel.org, AJvYcCXypvkx8I5e9EYRrVEIwigrmsuRz4WTgYgWHMewidmcrRgx8S3gioqjyaVCW8gKc8c5zAoPOydYxf+Z8w==@vger.kernel.org X-Gm-Message-State: AOJu0YxPBAMKv33H6WjJswxiwPnsNsHitpo7udscwzZCDggyKTGWOMio sGyr1e/XCyX2ktDJ8dgC/XWLX4//X4mwzbaXMdRxczhyXvVi5bCsKBl6 X-Gm-Gg: ASbGnctaadnGPzNIm0O3WA9vLROJbetu9KFoYnzOPkRJZJXTkuwcwO9zHnHLa/INhdt YLhPVsRfz3VlgLZAzTJxemwLX6u2mcTBWICYRG9+WAuSV4hkj1wASSvH5Nmr3A/25YPtp/ytjyv 6IKoZu4T9fRciCbKzeAtvwR9BPUpR6TfFUdALCg25xpALvMgVQr+THNJ2IQgag3NZM80VbBiCwk heiUq2KgsmZteT/tn0P6X3I1K7DygI4ic5BObtND46lytmDy7hUmMb+XDyrwO2xYDM63QoXowR2 sxMdDG9yikNJNvbtj2sH10Kc07b5kbvCmuX1Hl463a16LZtcJ0E3O4/xZSwyCmP6UCrM5VFunUc 7vPs54fY40c+xs+gJgcO7rpA4iJXiYJNYUTn9Ngpy90fPfu/JxDxzoKLPDw== X-Google-Smtp-Source: AGHT+IGD6IulrTtq7XJJHp+fBg0G4KoR4rFCaX6uY+nRZVwSVNUZXwzRxJL6DK9cdBhYXCisVCq1Wg== X-Received: by 2002:a05:6e02:2703:b0:3dd:f338:6361 with SMTP id e9e14a558f8ab-3e243fad673mr39944225ab.6.1752161504011; Thu, 10 Jul 2025 08:31:44 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:43 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:08 -0400 Subject: [PATCH 05/17] rust: configfs: 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: <20250710-core-cstr-cstrings-v1-5-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=2514; i=tamird@gmail.com; h=from:subject:message-id; bh=af7hQUrBJ3daMKChg+zbV28e67c6tFE/LW/j16AENwg=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QNZwSCTvhx189kCCr7+aSgexpeSI6tU5D5MB3shP5Z3q8AlIw1OPYf9wRw5vEVrf3gxS0l1TJdN IQXvUr3fPrQ8= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Acked-by: Andreas Hindborg Reviewed-by: Benno Lossin --- rust/kernel/configfs.rs | 5 ++--- samples/rust/rust_configfs.rs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rust/kernel/configfs.rs b/rust/kernel/configfs.rs index d4797c41ba77..9e7308e4d4ce 100644 --- a/rust/kernel/configfs.rs +++ b/rust/kernel/configfs.rs @@ -21,7 +21,6 @@ //! //! ```ignore //! use kernel::alloc::flags; -//! use kernel::c_str; //! use kernel::configfs_attrs; //! use kernel::configfs; //! use kernel::new_mutex; @@ -50,7 +49,7 @@ //! //! try_pin_init!(Self { //! config <- configfs::Subsystem::new( -//! c_str!("rust_configfs"), item_type, Configuration::new= () +//! c"rust_configfs", item_type, Configuration::new() //! ), //! }) //! } @@ -66,7 +65,7 @@ //! impl Configuration { //! fn new() -> impl PinInit { //! try_pin_init!(Self { -//! message: c_str!("Hello World\n"), +//! message: c"Hello World\n", //! bar <- new_mutex!((KBox::new([0; PAGE_SIZE], flags::GFP_KE= RNEL)?, 0)), //! }) //! } diff --git a/samples/rust/rust_configfs.rs b/samples/rust/rust_configfs.rs index 5005453f874d..ea84c23b784b 100644 --- a/samples/rust/rust_configfs.rs +++ b/samples/rust/rust_configfs.rs @@ -3,7 +3,6 @@ //! Rust configfs sample. =20 use kernel::alloc::flags; -use kernel::c_str; use kernel::configfs; use kernel::configfs_attrs; use kernel::new_mutex; @@ -35,7 +34,7 @@ struct Configuration { impl Configuration { fn new() -> impl PinInit { try_pin_init!(Self { - message: c_str!("Hello World\n"), + message: c"Hello World\n", bar <- new_mutex!((KBox::new([0; PAGE_SIZE], flags::GFP_KERNEL= )?, 0)), }) } @@ -61,7 +60,7 @@ fn init(_module: &'static ThisModule) -> impl PinInit { =20 try_pin_init!(Self { config <- configfs::Subsystem::new( - c_str!("rust_configfs"), item_type, Configuration::new() + c"rust_configfs", item_type, Configuration::new() ), }) } --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7BEF27A131; Thu, 10 Jul 2025 15:31:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161509; cv=none; b=mvoD1oWP7MllaugxjsSXoEaBDTzas/uR5DHxgE3NoiuLRrdTCGUt+2jw1m/KWanNHDkLc+TXDTaVwPDjDK+1A1B4VszFHBjiTjOlkK/9+98IhNY7gqDWGamisTkTnsW2M0XdCtuumonPW3l9EuQGliNDR/WLVb1g96fTg3kxHZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161509; c=relaxed/simple; bh=VNZQXHbrPNQTjnCfNmCZZ01KeKVkMs9GB6vXbtVxjro=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cgFpm1IQ5VHQUjLf+iuV9G8kEDEpkSv84ditB98uH5hPmW7WAdFNNNXd1yHBRquLGFhdp968iCi+StFipDdzXYJZ6kgTo6KO4HWRGiCenUgRWnRY/SqE1EJgGYnUbODhly2g29u9e3kT04MARRxhFDUEXND2jh7Wwc2MXmLYFvA= 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=JbClBLye; arc=none smtp.client-ip=209.85.219.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JbClBLye" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6fad4a1dc33so10567246d6.1; Thu, 10 Jul 2025 08:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161507; x=1752766307; 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=A0zIVbcphTDjCV/BRYSz6swPeiPXn1qULo40NKxP67Q=; b=JbClBLyeIgTxf+QMF720uIYCGAIMCzgYBo1twWIQMgeRyseXADqq6OMW9njiQKJ5fS eoDFxfizlsW+AOr7LQQ5OhUxrbOZExd5KfMTMzJnwFeISgX2Z1jB82N+clTrNnqolsQe xE6b5PuPssCadHZcZsmSO0kdSyOx5XlGfesdcaXRaSNMAYf3BUNCe0YQxO/IRi0Bh4BW df9/vMfcFmmmFJDeNyNS2rE0h6hfI8WK3kghVqDyyzTZjUrdZZMg43/POst4I81g/6Oe AG3Th1Ee2fkx5Fw1ZQDTCNb3cvf67P5/aIZH7lY3fpG4UWuGD5OMVep3+XqMs/9+IIGW H59g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161507; x=1752766307; 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=A0zIVbcphTDjCV/BRYSz6swPeiPXn1qULo40NKxP67Q=; b=FxjUgxCebjGuS5Yl2GjlX6gbqqaWK/Uf/blquT5tEzZYo9/Nmnxe8uWxtnQwQQU3kf e2XRHt7tEj0YMlnBP4gCBH9M7UmhH1COISYSStEgcfX9FmNcHGmNeTMd6QLHzWGBnMIB ux15jpXELs1W07HUF/QUNRuTzAE9ouK8ERFbFxHXyMrDyfWrmWeocJgAUuNL3kHSYfrb VGeiuNwKpMOYR/NAfgUzN7Fi2Hx0pjSaBFk2Ivlk3b28WZ0QHFqGw14hsZheHUjv3uwW MVB/Xg3OvJ9zKcGW12cqcdkpwrNdWV+PKX7vQCiaOpNqvHZNoLiLwGH7/VQTANhjL0T7 YTnQ== X-Forwarded-Encrypted: i=1; AJvYcCUdwymS87Eni9VdQfu3XjcdjdZz1N2eGQNmmkYnd+7sLW6cwM6uDGN3h+sZL4j9FFSz4Y4cuwhv@vger.kernel.org, AJvYcCUeI+PVQcr3wG0kkAwEpM2W3sNAt070wXlNVwbuYYDZFPzf/qs2NejkQHRH4wkSB0VjnSdDJrm61Vhs@vger.kernel.org, AJvYcCUtIpJpjK4IlynqdmCPa4bwnn3Xmi2LhdekH438vSOY2FFahl2pxoow2BWIJVI3IC4vlbIJX+6NWnGXlAtetmu1@vger.kernel.org, AJvYcCVjBy9wGYIkERFbSNxxyYEojs9eolY4h8gv/rICTlErdGtPj/O3jDCKJ7yPLoDrJyzoyn6KpzUaINde@vger.kernel.org, AJvYcCWpoMCUclXvVwSTp85FYzyIWAb1DT9HvmCXEkWd2qePuL0jpLJqerU+AK/4nBmhrRHNtrJoToigyxArLIuA@vger.kernel.org, AJvYcCWvjjEsoiUl45R6Iy2j9SydXje0HK708VnXau1iOmBcgT5otGlgVl36boMKY5t0ygW0ndnNZCgSdOhNeWvOqs8=@vger.kernel.org, AJvYcCX90NUllWP2iuZ2QkTMUwsTwwubyCuook2J+KJRHGEWzL4ZHD4iN1ljJJeLIOWYYGDK33XM3+/jR9wtrA==@vger.kernel.org X-Gm-Message-State: AOJu0YztednSOVsGkHbx7dinEflNGiLMk38cvSh5ZsRTc9Xm0ykGR9n5 RsfoWUNLJtmGygcsTHJYWorvTjSLZQsfwvtiakusTDrqHbbxGiC5QMZr X-Gm-Gg: ASbGncvu7fD5tbPdJ3hgYjw7lHUYQeWlbitgw6QzyasjYVBRI/0s9UBODNXUVtCjed9 P/qFjwRplRXQ21xMarvqlG8Syx0jc+B8cX/2icfYXgzkiNeZT8Ru2fgK3KgQ1rxz42BOnPuZMjs F7YTS4H+TIvWGvq9wrVv6RSWyosvBvdx0ap89mJEB7oGWhaijWv1ktgHO1ikFuaJvHNLmfh5AVX SY0evjBn6EfLy/usnr6Nq1I7cT7B0bTv54wv7WH+7fa7TkCi2HqrdhcMbRizo/cZY6CSl21RiY3 A7gjI5lSri5KZ+XqSVqvOLQx+5yHXiQN4HOw4F1l9jfwSfKoMWWqz0OfwQ8lgYArsHAPat5oQ3V 7hh6rANu1kGT95fy9WbpxeghUqXrLf5c8JEh0cTlH+NwbfdIt0R46r9U0ag== X-Google-Smtp-Source: AGHT+IGcu2AWwgL23R/GZcRg4GNhqiTRg3tVkCGWznIBgtE8Kyf5DTvce0/bAy+ygow+T8DZUkNSVg== X-Received: by 2002:ad4:5aa9:0:b0:6fb:6114:1034 with SMTP id 6a1803df08f44-70495068decmr72119166d6.39.1752161506061; Thu, 10 Jul 2025 08:31:46 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:45 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:09 -0400 Subject: [PATCH 06/17] rust: cpufreq: 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: <20250710-core-cstr-cstrings-v1-6-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=2282; i=tamird@gmail.com; h=from:subject:message-id; bh=VNZQXHbrPNQTjnCfNmCZZ01KeKVkMs9GB6vXbtVxjro=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QJt8ypGIS+ehjdJ0134iQriRSNjL+xYEiSlM8eZgFuoZS1V3HRYbC3s63Q2FJIma29BKt9XxA5D 3g7BKjvyMGgk= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- drivers/cpufreq/rcpufreq_dt.rs | 5 ++--- rust/kernel/cpufreq.rs | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/cpufreq/rcpufreq_dt.rs b/drivers/cpufreq/rcpufreq_dt.rs index 4608d2286fa1..0b4feb27b4f4 100644 --- a/drivers/cpufreq/rcpufreq_dt.rs +++ b/drivers/cpufreq/rcpufreq_dt.rs @@ -3,7 +3,6 @@ //! Rust based implementation of the cpufreq-dt driver. =20 use kernel::{ - c_str, clk::Clk, cpu, cpufreq, cpumask::CpumaskVar, @@ -55,7 +54,7 @@ impl opp::ConfigOps for CPUFreqDTDriver {} =20 #[vtable] impl cpufreq::Driver for CPUFreqDTDriver { - const NAME: &'static CStr =3D c_str!("cpufreq-dt"); + const NAME: &'static CStr =3D c"cpufreq-dt"; const FLAGS: u16 =3D cpufreq::flags::NEED_INITIAL_FREQ_CHECK | cpufreq= ::flags::IS_COOLING_DEV; const BOOST_ENABLED: bool =3D true; =20 @@ -200,7 +199,7 @@ fn register_em(policy: &mut cpufreq::Policy) { OF_TABLE, MODULE_OF_TABLE, ::IdInfo, - [(of::DeviceId::new(c_str!("operating-points-v2")), ())] + [(of::DeviceId::new(c"operating-points-v2"), ())] ); =20 impl platform::Driver for CPUFreqDTDriver { diff --git a/rust/kernel/cpufreq.rs b/rust/kernel/cpufreq.rs index 71d601f7c261..0f316dfeb5dd 100644 --- a/rust/kernel/cpufreq.rs +++ b/rust/kernel/cpufreq.rs @@ -841,7 +841,6 @@ fn register_em(_policy: &mut Policy) { /// ``` /// use kernel::{ /// cpufreq, -/// c_str, /// device::{Core, Device}, /// macros::vtable, /// of, platform, @@ -854,7 +853,7 @@ fn register_em(_policy: &mut Policy) { /// /// #[vtable] /// impl cpufreq::Driver for SampleDriver { -/// const NAME: &'static CStr =3D c_str!("cpufreq-sample"); +/// const NAME: &'static CStr =3D c"cpufreq-sample"; /// const FLAGS: u16 =3D cpufreq::flags::NEED_INITIAL_FREQ_CHECK | cpu= freq::flags::IS_COOLING_DEV; /// const BOOST_ENABLED: bool =3D true; /// --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26FE9279DCD; Thu, 10 Jul 2025 15:31:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161510; cv=none; b=qjs3g/ySO8N0MXiRZhMebTIX10vSEXGXt+xoQCvhwGu3jeEVOJCeJpysBOx2dDbroxegLtHpRgwgvWOY2XwKhiLUR/AIl7GI9BuXBttSAleV96+OmyVK18SBM4Q5KiUe78C4WxwC0ljA0Ahuitdo3x9QFAeKRLEZrcPPwlRBkns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161510; c=relaxed/simple; bh=lKArFG3jk79KbI1Ip2d9VIpBoj3sVr8YWgzpzTTR72M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M8BJh7kcRG2FGTJVgBhW1TRc6UoLrXcgqFM9H73Hy4Mb5kPCWjZbZO2weHBCLdOSCHwCDJcaJvykoHl8eHsBBydio0EZ+tjBI5CE8orWy7SXi3lQeogRWqpstBEDk3gj7Jin1pqCiS114K8WGfhMmarbfcNNuHbEu55hAgINd+E= 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=EeZugnrR; arc=none smtp.client-ip=209.85.166.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EeZugnrR" Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-3df2e7cdc69so3134025ab.2; Thu, 10 Jul 2025 08:31:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161508; x=1752766308; 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=WVFjfPNTbi6R66/7pUgl3ALTHRI4zFg3YUCk14hLoUg=; b=EeZugnrRXU5e4qMz7AAoIYaqHEBnSAtpygoa/I+p3L9f2WMnWzBOSshncuXMC3RuIw JOQCMujro44fJtBM+jGmK74GJE1HY/kBG3DEaOrFRzhD8nG44XppjHEVVZ8oWcDsrnZM YlBEi12sKKoBj/6iRkVLpWipL9XP+AaA5WrwL73oY97cUocXhimW48W3AuyvzN9yIjin V3n8jtoqBZMcpSr39MY77kNHhzX7YTseHhoQbVtLza2yJiE/hR+GG+5Z6yfswTdBV/d6 6sV2dBfhVFT1ue7jZkcp+hJyyuy4RhesHees+N2ii3rKzJJAvQbKhRZ4fbRqooNA56su dN9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161508; x=1752766308; 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=WVFjfPNTbi6R66/7pUgl3ALTHRI4zFg3YUCk14hLoUg=; b=JdNymk8lK76D7r6/rhCDcK93hTuA2FW4wqeIZmQ6tuLBukf/tmNvqsuDHU8/ivzBip xcrUIvdbGqc0dlujLg7CLvr/oBkm9r6i8l4FLc95cEIPoadoZfWQroqDdIiBklc+lpju rukzTF61mb+Eu4prr4Iburng0n/zxNiUKa8oWdwqWq7S0KHxyWuAMWJ0pywtX73WanP/ 7TAc3psVLUsDyCxYpGNW8H3LTk/Urgxqr1Ts4PUXHYksFMCJ6c2iiAlhpglomVJslHYr /cIvA6NZc8JbS9YD/BzD6l4gZsFo27DnbMjVxZ+WrP4sCWzwQ7qJFrUheADLvxDLjZa3 8O6w== X-Forwarded-Encrypted: i=1; AJvYcCUnzWFo/TqLxlClKjCYrSpc+Yd5wOsKDRUe/WWcuOegFE+LCQsObZNpPG6o37Oje0AierSLxo72dSDUMRGk6K/e@vger.kernel.org, AJvYcCV/XQ9AtiXfT0ZLMCXRkGeZcSTsXDc3ZP+7k276BOG2mEoV3Pb7Dt+vFUE4dLQ63ljaMjmI1dKEzjzP@vger.kernel.org, AJvYcCW/6fm2KQOgOKgZbiLnfNdQ2JmzC/M4EkYtDr4SovBHqfY3N8gncsjhAq7TvymsgYcAJ36eRNzsUBiu8w==@vger.kernel.org, AJvYcCWCDb6Rg8ER/ic/IDggvWyxyU8tvuzaNh6Cdnpt7c+B3zAVg/F1EUsX322ub9/PAvVXDEpxc/qnZJ4DyZ3+Uq8=@vger.kernel.org, AJvYcCWv9BD4B6OsA9GQEDk4uGSG2gN1d52sgMKoJIJ9emVajKYp0IGSAFpGXQjSYjuFj/YASlaG1Fq3IXsHvGxR@vger.kernel.org, AJvYcCXBBj3TVFC3Z0iuDv48gqFOLDYlJtxwlBA9TvTHfglIu93uVNcAB0Xwk4asD5eQUWlnUP6pzmE4LyIi@vger.kernel.org, AJvYcCXvao82+JIvZUrXVTXbTaSSAx6jWb88dRueXqQg7QarbzepiFciJkHexZwvXrofMHA29W7OYIAN@vger.kernel.org X-Gm-Message-State: AOJu0YymZhH9uJH5jpNyTbwyapR/jV0jjlN15SjL0b0H0qtmNx6x0OV9 hOiUk6IWcf3JYnJjiZn8ZlBosXw2QcVe8Z++HrHMdZriJiznneOYm2md X-Gm-Gg: ASbGncu6ADcN3GGZaqpZOURKFUXqns1s3MFRdVUysJjkwL10fViYvf2Fzizw0e+iEWF xKkCpWcI9FqtZJHfE08Y30LmpGSwSx19aGW4Ei2ops1Tc6cHG5CHOaFoUTviVipcl9e44rCXfTy mb091ccXN/LPIw91fVb0izInTlTlcQz1rF6ZBnfhoaZMHwHnqSGJvzD7FY65o2Z5+JJm+jm/Uxp pgE0OVgRnEkf4kl+KKMfJG/lAbGB71nuFgDS53fFvCqXZVvCsNI5mCR/4k1ombb1zqrrUei91e/ KvCWg13rCALRid++sJu7OLO/+HjQ1prXttfDDTBQ1A2IQrV90rBw6N5/BsTYR64Iv0You4SkUfU rogxpcC5wGdX29E3IVE7Q5WAOnFtaewWJNBApYPkDYG9N8T8eZ6llOxtbIA== X-Google-Smtp-Source: AGHT+IFCym+xBGoaFaMTBAc6u039EKWRGAB/Yd6+c7XI6q8JLxZTaP4UxwS5DlA2tuk9iufaO/epKQ== X-Received: by 2002:a05:6e02:b42:b0:3de:2102:f1d8 with SMTP id e9e14a558f8ab-3e244019ab8mr53662575ab.18.1752161508131; Thu, 10 Jul 2025 08:31:48 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:47 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:10 -0400 Subject: [PATCH 07/17] rust: device: 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: <20250710-core-cstr-cstrings-v1-7-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=1137; i=tamird@gmail.com; h=from:subject:message-id; bh=lKArFG3jk79KbI1Ip2d9VIpBoj3sVr8YWgzpzTTR72M=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QAzd5arAmJGDCeVxbMUwisyHuguGLVYd1t94JvFxCxzK/cekAHr5Rtjw+6FA4xzDvfKhCkirXSB JiQdbWuO4ygU= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/device.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index b34173536230..ff300e1d014b 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -11,8 +11,6 @@ }; use core::{marker::PhantomData, ptr}; =20 -#[cfg(CONFIG_PRINTK)] -use crate::c_str; use crate::str::CStrExt as _; =20 /// A reference-counted device. @@ -198,7 +196,7 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Argume= nts<'_>) { bindings::_dev_printk( klevel.as_ptr().cast::(), self.as_raw(), - c_str!("%pA").as_char_ptr(), + c"%pA".as_char_ptr(), core::ptr::from_ref(&msg).cast::(), ) }; --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7EE527D76E; Thu, 10 Jul 2025 15:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161513; cv=none; b=IrIGz5wyws5wkJXb0T20DuvOD48O2ueOa7ar360odrApg04LDbv2bhw5gtCn22sULjpIov2bWNVHfCPia7yRc4KJDzqy9MQv7x/aSGPh2IYhFnBiM359PL7E19pFhvcBJ14nCQauPyLl8CCLHkiHEV134T0wbdcjpnyctDNSIT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161513; c=relaxed/simple; bh=XbZfSG96gLboq9hAwWHxQ0UcnmwXIVGU56caleXhB74=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PTQNzkztvWLHj+tNCrOnXzR2PIyr6tSiwoyeK+ObO9mR02id6VFPpaKZocc9ht5h7LCuVmzZZrKpk2/715HqhenfLxmG081r/CSIOFZqIPPDRrM17LO7+rOmeOzYh4vimm0K+k/2zKMxuwBneMGW+SJsCA0G6JIFOIPmwnBx2+Y= 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=akgeDkkM; arc=none smtp.client-ip=209.85.219.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="akgeDkkM" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6ecf99dd567so15167346d6.0; Thu, 10 Jul 2025 08:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161511; x=1752766311; 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=0/JDalhR7HGrdZn2Na85qCxGVUjNuqdnchv4YNWMoGI=; b=akgeDkkMb2XoTbSkWonCcugcqiwBDAyRO0tO3DbS9nE+7mQouel98kvSMzCjWDgcUI YsN7NF1nWYdmR056QAO7MMuSOaOUTIth49zxM9RNgu3z/hpLSzWheRNV4izsNIiEUL6Q Z0D8AporftpAo8ziwpLZR3jCRVopbTLSyLlvrxGcfnWafy6F6QeLEfY3MpQkufOOc18/ PE6mMoy81Gi9G4p1422KrVgG/kVWmOGlbePixTtOJUg4ceDWRNKEWhIFedxHlTIdeoW0 HiJhlhxvE5ujWdnIcdhGCcgNXpJf2Emxp7Std4v2m9/PUdRM9p4audzaqeR16ctW/afS lOrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161511; x=1752766311; 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=0/JDalhR7HGrdZn2Na85qCxGVUjNuqdnchv4YNWMoGI=; b=VD9tgem77QPyxpMrYk4qJvGsUC+Hl4vTcAcpkwF+2RmLbvajp+0tqkmInw7iNmGQ0N rD3/OkA9YxPoEubD7JM/hYjcYS4Rm0cfproNIaJBbD+4cm2eyKTMNY3BMk1zyJaJw65G VlAUO+YV9lYTqIPjW7P+mzcNyxRKyV1+esGDIPgLvVmaKYbXk4ervZtYArGln3OD/o7K P+f/h14vpdOkM07kVYXzI33tXhKWVKfaB8g75L76+sADhtM/Sofdi3l8UH/UkSaAIRvB CJ7LOW1fitiv8H0XSWN/0wZ5fSaPGVVVZ6wAWponKGpHdvd4nxNa8CHiWX93kQUn05OK A8kA== X-Forwarded-Encrypted: i=1; AJvYcCUP2Jr7i68gp2eBNJghaOoqTIcnY2n2azAa7LtIHzFBWpzBHrG56gedcvaD+/VGmK2NIthPUt+EGrIoGzjPxVF/@vger.kernel.org, AJvYcCVDvHvuavOQxTCT8u31V45XsYB+JoGQ4mYxlo2inqH4q0ZRSnvhscHKfQ/xXl0DLGONcfQobjsZc+swOkzCpcw=@vger.kernel.org, AJvYcCW/SHbWJNATecpe7VYFANWNZnBNb7gDih6/n8CJFx/4jj66HemDRQKCFdjUPaHt147pGQamGVn+d0oeIg==@vger.kernel.org, AJvYcCWiaxO76irf9bEHAMF2/jYidZQI6YzJQIPe9iEzZwWqBoor6X5qmsF7oWOysWnSKy1Ky3si/Nd50sRM@vger.kernel.org, AJvYcCWmWiglswnr9+H1+T/ib8G6iiOP0B1kQ8qXRq+QFEB1wdHfKdMcsyqLubWcxbvsaxbP6FsScMO008fxoVQJ@vger.kernel.org, AJvYcCXM+Xm5CEyje3BjZuCmQzWbfHTnRIE4TYNogJbHWXvMOgufZ43qkvN2wY9/yE1zEfBo8q1w5Ss7@vger.kernel.org, AJvYcCXuN19A+Nsq10S4Dja2saqPXS3/xdxroCDISFqi+RIiLOsOkwSjTr6IA8uIRqzRQ43/5cLPZGzk6WBR@vger.kernel.org X-Gm-Message-State: AOJu0Yxid65CG7R5GWXoZy9CWPqc0L6mz4LxvfoRQ+vUYh+VCRLo3er5 uTMSq1iCVHPwlq5BLI/wiFx9lNaZRg+JlifdzdIFeSRAph4bHq6BUrFf X-Gm-Gg: ASbGnctXDOBiN3MdXeozBG1u1e+YG+QqbJi3/QA/Pr4fvtSCRWQw+xdNYjTHaLA4b8L l+VzYiq5q5mxHzjRnEG0mua5pnwJ58qVFURuIWXG0dawd0S5TF7wRkpuFI5OhHjubDl0V202ouD ouOuQKYrVJBu6JerDAn9ew4JFcsZQGtF8bcdE56k7CGQnrCgFCSMXfOeuyh2gglLR/HPWaAPAo3 R/9znlw6k2sArQitca543grcXxn95PrhBfC/hveoW5Ae1j8galz3xoZYeHaAR8uVVbf1UeS9tE4 JV/3xuzBkGhIRxdxPKKqOaeqP0Jahs3m05RWubyqU9hVvnMvs4xktRGySrSno7opQvF/Scyoxm8 qRnA7MN4KEhTiN5VyAA9HakAe1eke9ZMlDxgLPpI7L4EwMf0t4JxrrAacGg== X-Google-Smtp-Source: AGHT+IGlK4u+h32oGxozpab2tD/B7Yph0jCBKI+iYfgyIGiWbIZ+FxxQ7L/p4QWTrgRuBT/dl81aJQ== X-Received: by 2002:a05:6214:21ae:b0:6fd:24:b0e0 with SMTP id 6a1803df08f44-7049802b590mr33096746d6.6.1752161510215; Thu, 10 Jul 2025 08:31:50 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:49 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:11 -0400 Subject: [PATCH 08/17] rust: firmware: 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: <20250710-core-cstr-cstrings-v1-8-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161489; l=1536; i=tamird@gmail.com; h=from:subject:message-id; bh=XbZfSG96gLboq9hAwWHxQ0UcnmwXIVGU56caleXhB74=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QHERu/vESXn7qmFFW348pi5DoDLh036HXrIdmw4RD3DKS+WftxpPEwxHBNYrRqltGIq+N1QTXos LZ9h+wNtoCwI= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/firmware.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index 4adcf39b475e..d07849333991 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -51,13 +51,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(()) @@ -204,7 +204,7 @@ macro_rules! module_firmware { ($($builder:tt)*) =3D> { const _: () =3D { const __MODULE_FIRMWARE_PREFIX: &'static $crate::str::CStr =3D= if cfg!(MODULE) { - $crate::c_str!("") + c"" } else { ::NAME }; --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C61C427E7E1; Thu, 10 Jul 2025 15:31:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161515; cv=none; b=gP43LFgH8f2spkBjovrKlTce4zFoGl8Xm+XohMV/7PVG/zQyPq7o0Ql9ls8XFIdFQ9nZ+2EaLyDxR00E/4HCLPiOzApLA5j1cpXhMIp3+H+VPru1icLi2C1Us9F6R6zhTC7hOiZi7eZo6cw2mjGeHHrjWSxx0JPGtoc+K2V85bE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161515; c=relaxed/simple; bh=J5o0eOArrOTJTpc2azj/aF5PzCJhmI6sEK5fjkHI/F8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Drl4riTyB1tB9XOn4mI4cyn9kTLRr6xQxumKOdzdEff+FiwnibRQvEuEskRcVf7bmRCQjZ8jtbvSoZ4HXZ4ANfTaelmfJ1My/PfEE1SHT57VIKxaTdo//JtTrvNKeqhPiDHlV7569LHgGRjYHocE0GuxbWyNEI0jMf6cUqO2PL8= 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=B4VzN+Cb; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B4VzN+Cb" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6fadd3ad18eso10245956d6.2; Thu, 10 Jul 2025 08:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161513; x=1752766313; 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=4Ks8bHM7zC5z3iDdXs9rRDxnAyDyGip6jpzzBCBja58=; b=B4VzN+CbFKHkxOtBWR3ttpXP+N0LnL6AjwfiyEOrPpl2FkENsjtnf57rSUfwy8Z3dI CFT7MaCg8ck8NcDiwc6/Ax3clTjbb1+i5OtiXKKUJV4YLXwqYGaxl7mVPtDPgtT/xmFB +xXWDl4N5KBKhbjFnCsPGwBJ2xqMkGWAC8frzL1z2AhP0mEufKAvPt40A7qAhFa49deV FHh6ZOpB3dGAVAerViqJsFaQExhwpRaQynk0xdxixCaUHBUc8RYwQwt0PTzKng0irF8O gnXaNy83jk5t+lMtN9r5LbnNDd/rIz4q140+l9aEQXVXcxaLnItIDgJ3ogOsCI+jnZ19 KxqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161513; x=1752766313; 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=4Ks8bHM7zC5z3iDdXs9rRDxnAyDyGip6jpzzBCBja58=; b=EeCzEe5V+VnqZTagCYKdx9NHp/J/eUBVVBni6z1M104kx0DyJKiyv/JnWEjDkM5UQF IwY+LNgToMLADkAaA2SZh/Ge4Lhnt/bKF00Jz3oQosCRotDTFvp2KygWQO7+baAqkkO+ 0mpPUlqvx9fj+IFbjCwdzTfWVPIO4UDLxmuD3pguT8couSfV/YI/nLZuY6UmVSFQ7taP beSEMhD4Fos7zAHYiG9S+Gyr6K03wnBQH2cxzQWLqsjriQ4cfPjdPAOMd94Q89/+hJKd YqiX9wiUZB6P1TRM8LCs8YropBNkIaR2GncKK82580PBWhG5IaFlwqmkR1ZrPsxA+0Ta yriA== X-Forwarded-Encrypted: i=1; AJvYcCUBuEHsti+sG3kvvfax/HcYuwpCjVYlAGvUBkX7VO4RDa5pbIEkE9hy+7atY2dDuOe+1cu5wmYswEOy@vger.kernel.org, AJvYcCUPCEiYhZzgjqYWhPhQExdTvYykafPUo+nIhs4kL7dJDToc7Jj8BpdyvbGYU1uvi7W9GakPtwyl6AzmNg==@vger.kernel.org, AJvYcCUZAsnn+n4xL8PjKLviwWUibIvj/wPjCm9uagN25oiEHEV0F40wR39HfECBnzl87NVhPAk0ptJLIMSBezKi@vger.kernel.org, AJvYcCV6r3PG2GXbfR2l8wH1gVbUPe235DIrqi72X8PPhdZuXaa9FVxlqtMMZjlqu/wjycyjiDbYuO2WaRyg+2WO3Hc=@vger.kernel.org, AJvYcCWMWAHK67RK6YL+JHAiKfI43Tz7WzheunmRydnMz7V6mQiMQ/xTjihbWenPEYWaIi33XeUwzdSK@vger.kernel.org, AJvYcCWo2gSt8+6TvonFT1XKDTTqk00sxRF6IkWXePoygnoS2NtjurKdlVS15bUhDXaHJIh5UV2IFfJ+kZz7@vger.kernel.org, AJvYcCX8wKHJYGXP5sAOHCkRmpIESC3HxxoaNm3OF+KP1f3uPkJ/jZT4W5ETQPMeCPdkKS8qBeM1GjJbDNEKU4r59TxM@vger.kernel.org X-Gm-Message-State: AOJu0YxKZs2cBBwxfiEeUc9hoOft4zuu7k/Bsjri1/VLVzZyqaZONQjx B0ZcSIzmM8avGS6xAfjykvh6zElqEh73XSXiTWsUBT7rlngtcSDDKbGu X-Gm-Gg: ASbGncsoJyPoUB7iTC3QEAEEd/WZkqHH8AFwH5wNnuOCyu9zK6XS3JPC55C900I2bYC RbgJPIm5ceuhjAAbKp8VYBFfOqo0nPUtdw0Vs6/LcsBhTqkjkk/dds93teH9UMakD9unWxIlyXE Ej0U5FHa139jIIOONActThrraQAQLB0GwgjTTg6WAVNuTj9BXoQIiR1dkAeKwRjhTtP3qot7esS lRXWItvRpa8LhdrjdcYCKfTLe8Ymn+p5P7q7FJw7jwHfxFm0P0ayzSIYsTwlf8007sUiedr0yhv SD3REb3twoRFauATBYDeW5kgudkUf9nXbdazQLOGpzO0MEQpjDzz17uNgIi22iwsylrNoRG7iKv seMhr5iIm3GNWBQY+m3prP+9rFiW5rMs3eWHdfdq7glv3wZUxZsVORVmnfghoS8rBs0RW X-Google-Smtp-Source: AGHT+IFoSrjZRzqG0EwD5iKIM8G8wO8Fxu5mk30c5cyjVOtKpnzT1r1+B6K/lvk1oMIKliboya5MTQ== X-Received: by 2002:ad4:5be2:0:b0:6fa:c99a:cdba with SMTP id 6a1803df08f44-7048b8306a9mr112914086d6.14.1752161512354; Thu, 10 Jul 2025 08:31:52 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:51 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:12 -0400 Subject: [PATCH 09/17] rust: kunit: 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: <20250710-core-cstr-cstrings-v1-9-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=5223; i=tamird@gmail.com; h=from:subject:message-id; bh=J5o0eOArrOTJTpc2azj/aF5PzCJhmI6sEK5fjkHI/F8=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QIl+bHSYyg7LEPGhm81yDwu3d9qeBHXf0NQbLwDCr/7CHOY4tb8sJrhORSolJV7ZIYNV/2+CAKH 7KXtFjsca4gM= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/kunit.rs | 11 ++++------- rust/macros/kunit.rs | 10 +++++----- scripts/rustdoc_test_gen.rs | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index a8eff46040ea..66e1781cd583 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -9,9 +9,6 @@ use crate::fmt; use crate::prelude::*; =20 -#[cfg(CONFIG_PRINTK)] -use crate::c_str; - /// Prints a KUnit error-level message. /// /// Public but hidden since it should only be used from KUnit generated co= de. @@ -22,7 +19,7 @@ pub fn err(args: fmt::Arguments<'_>) { #[cfg(CONFIG_PRINTK)] unsafe { bindings::_printk( - c_str!("\x013%pA").as_char_ptr(), + c"\x013%pA".as_char_ptr(), core::ptr::from_ref(&args).cast::(), ); } @@ -38,7 +35,7 @@ pub fn info(args: fmt::Arguments<'_>) { #[cfg(CONFIG_PRINTK)] unsafe { bindings::_printk( - c_str!("\x016%pA").as_char_ptr(), + c"\x016%pA".as_char_ptr(), core::ptr::from_ref(&args).cast::(), ); } @@ -60,7 +57,7 @@ macro_rules! kunit_assert { break 'out; } =20 - static FILE: &'static $crate::str::CStr =3D $crate::c_str!($fi= le); + static FILE: &'static $crate::str::CStr =3D $file; static LINE: i32 =3D ::core::line!() as i32 - $diff; static CONDITION: &'static $crate::str::CStr =3D $crate::c_str= !(stringify!($condition)); =20 @@ -249,7 +246,7 @@ pub const fn kunit_case_null() -> kernel::bindings::kun= it_case { /// } /// /// static mut KUNIT_TEST_CASES: [kernel::bindings::kunit_case; 2] =3D [ -/// kernel::kunit::kunit_case(kernel::c_str!("name"), test_fn), +/// kernel::kunit::kunit_case(c"name", test_fn), /// kernel::kunit::kunit_case_null(), /// ]; /// kernel::kunit_unsafe_test_suite!(suite_name, KUNIT_TEST_CASES); diff --git a/rust/macros/kunit.rs b/rust/macros/kunit.rs index 81d18149a0cc..c64df1a01b9d 100644 --- a/rust/macros/kunit.rs +++ b/rust/macros/kunit.rs @@ -89,8 +89,8 @@ pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStr= eam) -> TokenStream { // unsafe extern "C" fn kunit_rust_wrapper_bar(_test: *mut ::kernel::b= indings::kunit) { bar(); } // // static mut TEST_CASES: [::kernel::bindings::kunit_case; 3] =3D [ - // ::kernel::kunit::kunit_case(::kernel::c_str!("foo"), kunit_rust= _wrapper_foo), - // ::kernel::kunit::kunit_case(::kernel::c_str!("bar"), kunit_rust= _wrapper_bar), + // ::kernel::kunit::kunit_case(c"foo", kunit_rust_wrapper_foo), + // ::kernel::kunit::kunit_case(c"bar", kunit_rust_wrapper_bar), // ::kernel::kunit::kunit_case_null(), // ]; // @@ -109,7 +109,7 @@ pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenS= tream) -> TokenStream { writeln!(kunit_macros, "{kunit_wrapper}").unwrap(); writeln!( test_cases, - " ::kernel::kunit::kunit_case(::kernel::c_str!(\"{test}\"),= {kunit_wrapper_fn_name})," + " ::kernel::kunit::kunit_case(c\"{test}\", {kunit_wrapper_f= n_name})," ) .unwrap(); writeln!( @@ -119,7 +119,7 @@ pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenS= tream) -> TokenStream { #[allow(unused)] macro_rules! assert {{ ($cond:expr $(,)?) =3D> {{{{ - kernel::kunit_assert!("{test}", "{path}", 0, $cond); + kernel::kunit_assert!("{test}", c"{path}", 0, $cond); }}}} }} =20 @@ -127,7 +127,7 @@ macro_rules! assert {{ #[allow(unused)] macro_rules! assert_eq {{ ($left:expr, $right:expr $(,)?) =3D> {{{{ - kernel::kunit_assert_eq!("{test}", "{path}", 0, $left, $right); + kernel::kunit_assert_eq!("{test}", c"{path}", 0, $left, $right); }}}} }} "# diff --git a/scripts/rustdoc_test_gen.rs b/scripts/rustdoc_test_gen.rs index 507d36875196..0e86bdf1b5b1 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -173,7 +173,7 @@ pub extern "C" fn {kunit_name}(__kunit_test: *mut ::ker= nel::bindings::kunit) {{ macro_rules! assert {{ ($cond:expr $(,)?) =3D> {{{{ ::kernel::kunit_assert!( - "{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, = $cond + "{kunit_name}", c"{real_path}", __DOCTEST_ANCHOR - {line},= $cond ); }}}} }} @@ -183,7 +183,7 @@ macro_rules! assert {{ macro_rules! assert_eq {{ ($left:expr, $right:expr $(,)?) =3D> {{{{ ::kernel::kunit_assert_eq!( - "{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, = $left, $right + "{kunit_name}", c"{real_path}", __DOCTEST_ANCHOR - {line},= $left, $right ); }}}} }} --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C562827F72C; Thu, 10 Jul 2025 15:31:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161517; cv=none; b=i5ajuhUw+KIMq9+Dtq6ql8q2gSOMDpvTbVMQNWTR7bZgg2fbEL8vpoIY4GUYpAxKSv7BLTDaVpJ7pEn74jEA1VxXFtTZw48/jZfp5c9cJ6wrP37uqeuqmc6ePAP4IqEVx1CCA3nxCFMmRlWwbMW+iMF0qyMhaftbahH0DdT9Us4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161517; c=relaxed/simple; bh=B0KEkllv4KLqzgncCGypsjEUbt1Q46eDNieIWc4/B+E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d7fD4mdj99NKdsV4Sh0/mRWvQeRRGgPDuwD24iJXBYBk543cYEtHDfAcKAbbYVD0hM/5/IxvrAlJ4wzLMCCvdZl2Ivd1H8PzghrhlJMMeQVLxh/3zl1m7L6bc6HkEONd4gOTyl6/CWnqpi8r3c87PY/6LGVEUL252QQl3lpn9dc= 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=mkPCbV/S; arc=none smtp.client-ip=209.85.219.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mkPCbV/S" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6fafb6899c2so11251986d6.0; Thu, 10 Jul 2025 08:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161515; x=1752766315; 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=WhrV3vZWuhikKaFejaIZB2VhRDh4d1+RSI3qAol7Dtw=; b=mkPCbV/SA+mHYzxS36R55YOCJufNlXM4YdNVmVqito3xkBUX9d3tBF11BCzh2WfUjQ Q+3jDTMIckty68NR1s3G6siex80X4waLbsM1/UQhsWmRVJNxqGh4JBJNSQexh6GYfqeA 2h0nVeDGpjutlMBdIeoZ9ej/OX4f9iz32aHQDi6xKlpb/HNIGOOSd/tH7c59FBIgLlNf YKWzGZIhDyeo7fvR1zEKulwd3h9ZDhXmQ5ZMSrcgIfEZnkQgDkX42k8C5/xdtNb5ZGJP +l7VK3d+XQQoLSmrZiNHERy1bLVqrq0hf76TW+qIGBXmRaPkWW2hZaufNKQNkpFyetKX 3ESg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161515; x=1752766315; 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=WhrV3vZWuhikKaFejaIZB2VhRDh4d1+RSI3qAol7Dtw=; b=wYf03ztolu+yHye+xW4qo7x5wt0urTz3LxTZ3WdkGq73jfFnxRPabOG+RG6kO0M8Dv erbgVRRt/cUrS9cUn37pnJsuhaObNLiDWSaG2+QriA+rH8E0Cg1sZH2vJ1VLn36wU64L 1GrcyN4by4sbMFowFtPNqW6w7S69DmwNrCs8tWv0s6RkEYLOXPUbhUmArM/G7bkujDS5 GnK2eI2MvtmYN7g+tUIe7bRJKoFLws51xVsKGThx0IQMMAS4zmK9bvRBhxAG1edeXMYc Z25q3TcI8/ZoUYrfZj164UM0YTKSzT1upMpDnbyUXUsMVVyP357pOuhzCf/f/PJ7kCHv 8Zrg== X-Forwarded-Encrypted: i=1; AJvYcCU5exllngRVySYd9mIM7gvpsB038mbAs4kNXfKFhmluvVDdGO+i8XJG5D2zTy+5vGR6tD92CB6SROBU@vger.kernel.org, AJvYcCUJHL5WPa9Zrprov8fkikFMoDwpWI8a1H1yiYz+XJv6vxlSRcLr8c6Kii/tvMpawPzyJETvwCQZOeVZDw==@vger.kernel.org, AJvYcCUl83rxBKZYb+/QmUWg8G9ZxFr5nu/E3MKwgzpVLL78HbITW0zEpa5huLn2havyWD8K52HDiADkHiJ1kBmn@vger.kernel.org, AJvYcCUwh6neaTl9gxHkg4AM7D7EqUlWU2iEq0rznaAVfVDNwoEODBYSlDSRSSS2OJWqT554Bvaw+OEQ@vger.kernel.org, AJvYcCWG9gfw0g6Q38tuXW22A1/eD3HM8U2BiD9wvwECmIXbfhYBj6/2UcB3iiRXurs0j5PVLUxnYdxmDIXKX+ETU5k=@vger.kernel.org, AJvYcCWgK8Vcyus9qaY2h9/Fil0W+yiY2muC89VrmvzZam7pa7z9HQm+Rc4hlxA8qjMeIxNplB22WiQ6UXSvY7WxJthn@vger.kernel.org, AJvYcCXF0gQUNCjD3OvIkacyKsCaFsqpTDsIuoon++i0TWhK1pjyiC1offXzi/S+jmrV1jDlpvjUGEfZ/xYZ@vger.kernel.org X-Gm-Message-State: AOJu0Yw3v2ard+AHOToPFc5hHDBNj+HAVXMToxaB81w2F2FhydviqkJw OKUYfQY3k4OdZDIGzJjXGNPILcPIz4KCWsPtp53bvChLSx3h7iPZ2NoJBp6Okrry1QKtUg== X-Gm-Gg: ASbGncsaP4bW73YbRkz2eyggjQh14y268I9ty7rstIYnXQeodwrogIci9boVN1Jxcx+ 2/sVyRIpTN375XDtOyLJDXjrectYhCK565mt6GTsy+MT0NFCsQmLcSDZL6f6zIa+jD9l82kxLMU dlt7bITGxTm8e2Vlp5g7aE622mN6QPhwDJLHJ6C9GoX0f5s+3zmWrgjNqsMJVyGJKmily8oXftD viBDO21xBA8gUrpFDetkTgXHwbIAdFy9I6Q1sTDS6ItjSpswT3bjf29dvF3r4sC4e+T54JmgoTl 4rplr87kWDTM8V7sKMgoUCBLHtgWycxMQOdE2dMq7hX1qYdcQxXyzroXRequzjx8IwFT89e5OI/ UuH0YZ+hqRpohIRPwMRUqDjXnMIwehl/P1Oo5xtY9/kDzAG1L56TTDzNWcg== X-Google-Smtp-Source: AGHT+IEw13HodLomzFs84mjDGVe/DxIwgY+6Bt92at/u/VVMJbnCgIFImh0JWt602UotdmNBzfqpDg== X-Received: by 2002:a05:6214:2a8b:b0:702:cf15:686a with SMTP id 6a1803df08f44-70495a2b055mr54603066d6.3.1752161514460; Thu, 10 Jul 2025 08:31:54 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:53 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:13 -0400 Subject: [PATCH 10/17] rust: macros: 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: <20250710-core-cstr-cstrings-v1-10-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=1002; i=tamird@gmail.com; h=from:subject:message-id; bh=B0KEkllv4KLqzgncCGypsjEUbt1Q46eDNieIWc4/B+E=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QCK05p8xNa3LGaXJc6O6PPvN7xhvmquzms/X5YPBQsJOGR8HkhPuMGHlIcvfVVrrU8WqBLJgnYV mMhn0UT3LHAw= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/macros/module.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/macros/module.rs b/rust/macros/module.rs index 5dd276a2e5cb..532342a38b6f 100644 --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -228,7 +228,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream { type LocalModule =3D {type_}; =20 impl ::kernel::ModuleMetadata for {type_} {{ - const NAME: &'static ::kernel::str::CStr =3D ::kernel::c_s= tr!(\"{name}\"); + const NAME: &'static ::kernel::str::CStr =3D c\"{name}\"; }} =20 // Double nested modules, since then nobody can access the pub= lic items inside. --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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 BEF0127F171; Thu, 10 Jul 2025 15:31:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161519; cv=none; b=Ho9n3l3RupEDGdG4qdphmGqRpVopfuhugDMbV4I91v/0zhtRhxiRZCNUxZu3kRJ4BAmzcr2A5rH9KDeU4NhDiyHrHXCqwuvqAFFuAcBlcLTOAhPRWpslaABjfOE7W6TxLydR9R6a6O2s2/AEM84dIpHRmpfZA4UIYCiHT9tAuXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161519; c=relaxed/simple; bh=JeDAf6wFDPBGfHdjZdgJ1MROy+GiZeSAvyl6oVbgRRY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YX3xwh+75AASM558ExgSU8aTTcyaRdDcfnlttWsGY/9GpDZIPWWQXM4I2EH3JREbJPLp1wrErID3sXxoR1OQEV3/rkmJuXbxmhLogQAiMBKbrDmiJHV5dBzb9Q5NiNx4aJjvpqJfihDemlqb3vWfWYq30wKaJmH+eyqdjQ43HQQ= 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=bfyc0aIy; arc=none smtp.client-ip=209.85.219.46 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="bfyc0aIy" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6face367320so10038246d6.3; Thu, 10 Jul 2025 08:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161516; x=1752766316; 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=Vyfnq6g9C4EoCLlWfGQ54YuT/nc9bWKydj2wfDI2B58=; b=bfyc0aIyweHbubLgo0RgXJXmKeNs/rN9aorV1Wx2fGbG7bwaIHwL/gkEAHt27xikFR 2jUyRR0mXUSfF8prede5NxEH9CtT63Due9rm3yJDovoGLn/Qa8T611msoAQl4yLEO6lA ou/+2ggeh4LjG/1aAmn6SHjW8GSL83LxTlulsvND8euj6jYl9rkVKHTBaHTdUSP0kr52 XJytvBbijs4esbDRW/KZ8sDYC8e9odBulWQXg9L7nqxA2qS9GH/mOo/MGkrF4QYrT573 qx9PsWJSuFGsXKxqAKnvfhpIiT5QC3rUeHk492goIGLs6cPQP6naEFo61sGfXfHtl8sa nXiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161516; x=1752766316; 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=Vyfnq6g9C4EoCLlWfGQ54YuT/nc9bWKydj2wfDI2B58=; b=vdaBUnHPPgRg3Jm+00XzynD9fhNTZTPpLgYKBSplV9wZj+faeBFHlC1tdWwAISfzad aY8MD35ZBvOR5f6TB8jXsbkwpHOF4DuOPShD/D6LCm49P74F593EOYWlw0l4bjT14hge P1XG+/+uIKYpPysRBkQruanvKm6YDLQLQFF9G1zL1ctkkdtUplxwsXJJ78hLeWxPYJLn 6Hqb9RVpet/cscZwW/K8fLq+E8p9el5XdbPWJywdjdza1SMEo4MQbwwsPpzFLyMLzIjT 9fOubPBJJzcf0jiE+tko5ZjOrEEYzgmkeXVxZGKX/jPA5an0lzM3IFKDEWE4gCK4faPb fCFQ== X-Forwarded-Encrypted: i=1; AJvYcCU10KH6rxNYLU7J45vtuPATIBDcax1nmpCQVEChahgXnrQMUBLQj11r9A1EpGxaCCfpUe8NUIsqWEHMizwXbBrQ@vger.kernel.org, AJvYcCUEoMvmrDMEzz+pGVrNuChtUoNHvMd3hjxHOwi3tGgB4TlIuc8chIeePUQ/SfJucPd6jP63962oLVVIUhe4Sa8=@vger.kernel.org, AJvYcCUi6rREct9E53Ln+919GzvMynGJsv1wEa/N1OQunxG7tgvULn/hd6UEBuX8YLJ/SxdoKVg7+wBL@vger.kernel.org, AJvYcCV6m7AzCYk1ZGrnEWnjqcQ39fKldAzI8Q9MdEuEBkga0tVuV3asroOTYN/BGLMR7dh4U7KYpxxXiictHA7T@vger.kernel.org, AJvYcCWaLBfE9UbGBStlBgtd2LyjkSPsJeY1BKKIa0UOq96pypDGVJKSBfcozV4o5DDuJ8uxc+abThbanGyxeQ==@vger.kernel.org, AJvYcCWdRj1+ehgG9AMMgOQwFCQrP/pZuCT7FKeXkaYqVdMsdO4LPJD4Es4IwU5DicFdTImuaar+SHJMu3qI@vger.kernel.org, AJvYcCX1qVOsMF0wLmglGdZBXQVrDW/Qkx9boq/0tKsTaRqdClsVuynH/nVYUPhIIBvorsSmQ/SZj6RLI+r2@vger.kernel.org X-Gm-Message-State: AOJu0YzQ1alsyhjA5cEUBmb3Au3qZcZKemL7RcJXbPjYS5pOz7xqgxQJ OJwOa2GWp+oAlIhoFlT4jCO4hX+hXtxKCseF5nR7Fom2jbXMXhnpamHS X-Gm-Gg: ASbGncuvrcSlKvNFLD6K4tIseSd2lmFBi94Pi9nnPjsPYblODcH5P+pEW5Tb3d5mK2H s/uGowgF64LLYP5K8lG0fWVaYHiusBqqFIgXZGgcx9Q2fOGigyfUZd1tgI2PaNZdrWtZx9GuD/D dcRml2ldwuiZ1sWHABhIPDHmlv86i3j5jGK2GyJHqKhysOejnJZ2/Abt6e13BVIZpXoJOGxFq8U UGolubaegdCd+y15hPgza23JBGF+B//nYaI9LCZfXobpVd3i5MecWU3EmP/GerhbtP/6LlPBBV1 rwBJcNw03l9fop3vADRP234G0oebdfneWGy3fNKaYXUwuBGEglH0/zVD8rUYnEU1v/HcOCznuax 1N97r6FdvRL1pHQr5bDICZL6Q9kfxRW0Jz0m2KVVvLX4IvO16w9aN1NDjBQ== X-Google-Smtp-Source: AGHT+IHvkNwRUWyARITk8WnQKy0SNCgtRWKVuNelSxExNeuSX0iEEl4oIe58qDpAXxbYdul2lXKeWQ== X-Received: by 2002:a05:6214:1d08:b0:702:d63b:4c9f with SMTP id 6a1803df08f44-70494fe211emr78209276d6.23.1752161516474; Thu, 10 Jul 2025 08:31:56 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:56 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:14 -0400 Subject: [PATCH 11/17] rust: miscdevice: 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: <20250710-core-cstr-cstrings-v1-11-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=1089; i=tamird@gmail.com; h=from:subject:message-id; bh=JeDAf6wFDPBGfHdjZdgJ1MROy+GiZeSAvyl6oVbgRRY=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QNEY9zChdkMx4tt2VV68lYK+vC3TmeO7PS6pRdkJjdhnR0BMNjB8WcH4aXX01vTLirzgenjn3HS nz9VxZLystAI= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- samples/rust/rust_misc_device.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/rust/rust_misc_device.rs b/samples/rust/rust_misc_devi= ce.rs index c881fd6dbd08..12b64296e912 100644 --- a/samples/rust/rust_misc_device.rs +++ b/samples/rust/rust_misc_device.rs @@ -98,7 +98,6 @@ use core::pin::Pin; =20 use kernel::{ - c_str, device::Device, fs::File, ioctl::{_IO, _IOC_SIZE, _IOR, _IOW}, @@ -133,7 +132,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.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B54122E6D24; Thu, 10 Jul 2025 15:31:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161521; cv=none; b=FywpVEfEka8s1hsYjdrYlYbfv1wLRox4n/THYptMYb97K0+Ux+aI+ZOxhVgOMwvj59vjWfEfwf04MSKvNAsvHm34xKP8NiqitlyIuLv8OiIs/hXdpZnL5vMySHapQbGFPZ8qtv5DbSs8n40sXNWGdMaeaBfqLvwD4k2IxpFKfCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161521; c=relaxed/simple; bh=7TrWBDFWFk9XPUm28ZWCh8FAmf3iX04XjynnFQqD4OU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FT3JVo3FLJMX7gTdwKFW8XwhmJarWxDQx71u+QVrUSEjracWUkWgiXQhdWSq8Oe8kl8CCq/KZWYeRVmGrhmSoqimwTHhXeu5dThV1vzjUCymsXdPrRCxoAPU68KJx0plsXVxx6JfMm4r+cCarQZvYeRHo+TqalFdaqWIdZltAMQ= 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=GNPgj6Di; arc=none smtp.client-ip=209.85.222.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GNPgj6Di" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7da3894b82dso111188885a.0; Thu, 10 Jul 2025 08:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161518; x=1752766318; 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=VogKYzaF/TPYy0XdUUSO/DnQeAdUNW05tROf4gMJ6DE=; b=GNPgj6Dil71gKSH4DJg8rMAmQUbW/7KDOBx95bx9DTsq6SiHc8cWKB8I4uJH3bBSgG o0g7u4wNSKBlRkgVvnWmOTv+jJeyxobU73WBUEk8wdcR5C7+Awqj3Sl1g0K4QFCfHX9+ 7fD6WamPJIdb91xSPmVXPj5GsUNDUPV3XajtDV85KD8DFLMktNj/H18mO3XclP0/I8WP vSXOSAihcRBSHoX9xZGUbvRBjD6BLwsbu3OkeRrp7wTi7x+UU6rt2Hjgv17uFKdi/nMS ZFSJxVNTIBFvSnQekUirTHo3HmuWXbcrZ+Jp93wQHbNMZrz6S2GvGibeUhQP9+7H7CIM lrCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161518; x=1752766318; 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=VogKYzaF/TPYy0XdUUSO/DnQeAdUNW05tROf4gMJ6DE=; b=DrfPl/Y2NylOwMILJhsM+N93160YRI7DX6neZ/J8HdYwd4g3goSAXUb6yZM35yKS2/ 6A7C5Xl9w5+cKDMM26zUO7jD3QVYvLjFnnM/2ts97k8+kdevHiNz5oQHiXUx2h93Ihl7 BGMENA+s0cz2ucTBBXJcjBGq/Z7c0pniqwy12Wsx6JllbHvDRJ6wZaUP1nlPUiv/jwC+ pZi808+mS/POa6PNGI/SXGgGXSf7Wlv3+j7PLgiKgTUvASDzsDQlfLw6O9onVX7Vyx0D j5L18Jtc5S/g790JD5Jsu7MR/IxNOS/nruKSXzDVUiouagtVn5mOJiBGv2OcJ7LGQpva T6tg== X-Forwarded-Encrypted: i=1; AJvYcCUI5f1rzS7Y6Y0n9VcjJb1AQRFgqTIjUS02qYGPDqLljqMRBzrVRazX0ebQTT1dOzHtfdbQGEz2@vger.kernel.org, AJvYcCVv2ocHDI5//zwtHCoJhXA7DgN5FfhRUgsR23Y75ZUMsop3nWIW77sIZotHQX74lsWp6yzTyB18LLL5WmJxHp4u@vger.kernel.org, AJvYcCWOrYDk5rcfEUdt54ZFTwXm+YIGZL+HoRV4pDOci1jaHkolrtdj7ZAwRLby8Qa0mXo8w3qIkREXbhNnxnbG@vger.kernel.org, AJvYcCWYgqkE9T0N0kbJcjfLlLrTYYbars3N05vvzo3+AASw5yKtcP9/Frn0UrXkapnQ/fp1x+zZALg+thsA2hqXg0s=@vger.kernel.org, AJvYcCX7AGXl9MTlxmAg8P2jBNM5lzlkbx2QZXDW4p+s25TFjxzagIS8yG1QG9qFrQj0UY6HbeUdXkMpv4kF@vger.kernel.org, AJvYcCXH8rBrT7gMirbqbD9CRFMvKOBp6CjwGAekQ3bJhmbilP43SOkYmoD4hEebLjZ/3RuWmHueLdDQuA3x@vger.kernel.org, AJvYcCXdzR35y5cJ01VYZ/444RCcxfc3Ehos/zheRMvMaNYVMCIFMIFlEG5dp88ySah+UwZlEB/GjXkBXFItxw==@vger.kernel.org X-Gm-Message-State: AOJu0Yz39zHQ3XFvtDG5mzqEofy+RBe6FEzevRzsb+Zwo66GO+np0JYI yxtXuexTtyD6NyWOyJqP/E0j7GV058Gqb4sN4URmFIi3XYaDxL/uyOx4 X-Gm-Gg: ASbGncuM7GLLwR0lPfBlUSStGQnaAomCScvwPfrRVbrnpMEMzhj7ynJ88MYEBKQgZ0i QoqNTf1rXXes7128FOZTJVHIUWb4TZqrp48JLP2Hla+5ti0o2ggc1fF5LUKhngdtMSfi1hkPEII vLBrD+tS996dZ+khvSPzaz6yqDvlsBj29nvw31u52G3KHUIkhNngULLVWhRfwzxLYdF9BcHFejl 1zTeTh49NlTXCCJfrucwiHE9UcJbqzaF08j3aYFUribXfgbjP99gUvNgq7/bi3P6aboftt6iSsL DoxX6J3OEK5b3gWOcPyfYpI7tsCfkCMK6y0LjKK8SxFK8g14IX7Q3SaYAkAASma7LcPVw/GpKEQ 5o3EpKDLQbBZWf4bxFjiJV8r99AByiSJKRKXXfrvoYpQiYjty3TiGkJ8vZQ== X-Google-Smtp-Source: AGHT+IG2Rkfi8OgB6SO217W8qmSZiHD1v3NtIITwS70q5UwQAur6eRtXERJ8W6PVRjTxYB6Q3LpV6g== X-Received: by 2002:a05:620a:458c:b0:7d5:c8bc:fa72 with SMTP id af79cd13be357-7dccbf44f7amr446032685a.28.1752161518435; Thu, 10 Jul 2025 08:31:58 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:31:58 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:15 -0400 Subject: [PATCH 12/17] rust: net: 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: <20250710-core-cstr-cstrings-v1-12-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=1665; i=tamird@gmail.com; h=from:subject:message-id; bh=7TrWBDFWFk9XPUm28ZWCh8FAmf3iX04XjynnFQqD4OU=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFXzGSK5HRWWRQmhbpkjsw0M+w2zZ3jjGVMgci5eUPPMKCslqQirC8ELfLlHiYCioE2kdDwvYv7 NilN9Earm3gU= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/net/phy.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index c420e5ecab4b..236ea516a134 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -781,7 +781,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::*; /// @@ -800,7 +799,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); /// } /// # } @@ -809,7 +808,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::*; /// @@ -829,7 +827,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); /// } /// --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) (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 DE6812E88AF; Thu, 10 Jul 2025 15:32:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161523; cv=none; b=cnabhYeRFto1IQCzLArja/X0OMv3DPT+tjHvZiWJBmD+DUsNFNmtgyCh/Y6BXrenxqZQa97f5QULXGaTL9n1uK2ek8yAFdZFpGxgQU1Gz+33d+tngw6CeC3NqW4sJ2BfSrFO6FTojbTWDKrBTYKI5RBCkh4Vl1MS+v9bYmpxs3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161523; c=relaxed/simple; bh=K3quMGfwWSednLdCqfDckFdHtFzQdXTMeNPKPGlz5iU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fPftUahgOem4vm1cJR3kJgl9GBs0KOPvmJzU6H94miRrN276YSi7vDKDgn1eFbBghVJcDWmW2PUTcDm44zHLBJb/PC5Hj0XvHxn84Ip+AFreOU5/Yj9sAFqda/DANU/s3/fMUO3xeEsIZqb4j6MvM01s7qbNUgd5YO1cg4c71jc= 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=mjQiHOJY; arc=none smtp.client-ip=209.85.219.47 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="mjQiHOJY" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6fb0eb0f0fbso13348036d6.1; Thu, 10 Jul 2025 08:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161521; x=1752766321; 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=IeIe+UDk+Kp3nZEK6u7JnfOt0xInihmGzvZ4vkm0xmQ=; b=mjQiHOJYL8/GB0iXaWuI76r1icOn0OY1ZHE5RP0Ba+l9hBJCq0BIntDKOXIfmj2pVt frvYeBnXUnuNhcfFCLaVSd3R3mrEQM/0C+riC5IyUFe7+PoK3fgrixbn+Wx7vJ6HaGSH L6mRCILF2n8X5kUdpBSffvGLtUE6SlhpJG/Ordli53yBA0fOcNSx4+db3pvoXDAzv3t+ 1DuJVfJCHP0nNwbagtJtk5gOk4fMuNd22s6KcrH2YtnouXVsZszgtlEWwu87u7uAuXpr xJZYlF8zI8+xKrmFW74H+sx/X2KDa3MxFN5iBa+4yq9QFWLfgSn1luYKI3Au697sv3sj nunQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161521; x=1752766321; 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=IeIe+UDk+Kp3nZEK6u7JnfOt0xInihmGzvZ4vkm0xmQ=; b=jBhWSrfeN1KhP9ncud1dCcsGmCtLuvIcANwJiWmeEKmI8HHFWWMN3HGbKUvvZYrA+A 3Q0IG6U4Q/0OzsbPYaXuoncHRo3BG+CA1VezfEXYem+UyF4r5TxiJlrDSOSfQ7w+1SOC Nmg9gnPxQkfayrMOqK+7nm4xWdoWxvjizKdm6Vdn52BubQu3ORarB27Y13JwG6EtxMSK 7Raezp2AaJcSliEHdr6z31SzQHvWOq7fqXeo23FqdXry8Owlcawu10O75lSRrSPUgrJ9 oIOtrMPSoz6MogVCfgGX0JFVitIqxCNJORggqEKlVGl+L817NEMhf5HN0V8AHKx0L/UI eXpw== X-Forwarded-Encrypted: i=1; AJvYcCUDZ7f4gV0CoYli2o7xlYAKoO4R0Y/eIUe7ONvpSo2MCm0tLP/ToTo9oqSbT6AC84v0TUeKspFzMk5H7ACkqYs=@vger.kernel.org, AJvYcCUi5giC2OQ/ZseBaxcPNgMWpZjand5+y0gzO40UiVEKrKECDjR+HijvPv4Cv/b8Joc3EzgmDAuK7b1Z@vger.kernel.org, AJvYcCV0xPdDwygWFvbc+IzAsEyWQh/wIZYVxhbypLTO+WbWqjQwiVuXYXhCI27//DKURsS+LTwqoTzIVNE2@vger.kernel.org, AJvYcCV4C1Xf0/qD1skyQGMCqQdgKYChkPsG1KV5SF/DnrV8ffIJMaZzmR7SlRMh9OdDmcFxzi78YCVn9qYODQ==@vger.kernel.org, AJvYcCV5Nr37dVg20JmxoajB0ln7xf0DVQt0nlh/3p94qHM79jiEkUdUqkuPSqKWTK1pbM7+XN7yVDORKVQ8EknG@vger.kernel.org, AJvYcCWFSyj3QlVKGg6bI5QTyIeL31otZB2i1cI3yQ26QmHpz8FM+G8WSXPEbwlM3uP6bNKbCO3Y8chuX3iLGL9yq7UJ@vger.kernel.org, AJvYcCXSQTatcelGE36PUQ1oahzrIxjlk+TjXz1nlIrn5aj4USw096L20O9VPPob7Q+Y5HUOB7sjdG02@vger.kernel.org X-Gm-Message-State: AOJu0Yy9M1+TEzn8zN4ajRllw408Tb+9RpepZscjREsA2NsTRYyp49wT kLZpD5Z2lRuovzoXaOlwcg11knxqVanoWZFF5hsuPVH6SFcuzHE27YwV X-Gm-Gg: ASbGncs6cOcu0kch8gtEg0yNt/Mw1DhxJoM+1r9e1E4e/BC/nRpLC2eF7nQGJws1+Qd 7tWhPzfcJ9CoJOrKjWkikZuwUCl+Za2aCHH2AuKX3xX2eJQiF3vXEb57OTOSZjFoI4fjXRnZECC 2mKbFvvhSWr4/SMuMujS/8P7UlyCJRxMwBwA/Ea4yDKwAXkfUSX5XqvtMK2D2qn0h80o8hpeZ8J O0KLKZoZsIbVbrr3c/e6xiGiPRFi7OFfyqNPYk8jg4lrrKOs0qMyFswuQB0p+FI5Zhpf6o49A0y XlwM3oWtJwqmz1xF1lftmEmWcHNjKDToV0jvif8X1qZqaVDICaNYKiOVEtn68hd8T5juas5v6Qn 2rzCrgYUUXmAzo+3iQ5BEX+E8sVrZWFFvVZfsEMUuUewf3J++hXaxvPo5BmWt2Ulyfdg2 X-Google-Smtp-Source: AGHT+IE2LTVg+t8dxVKDODJkNp+d8w0QU6pVu3P5qcDuA/4/6USIg8YBIVkV3R5pz7GFSaok/yUc5w== X-Received: by 2002:a05:6214:d69:b0:704:8870:122 with SMTP id 6a1803df08f44-70495a7ce2fmr58033506d6.11.1752161520428; Thu, 10 Jul 2025 08:32:00 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.31.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:32:00 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:16 -0400 Subject: [PATCH 13/17] rust: pci: 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: <20250710-core-cstr-cstrings-v1-13-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=1308; i=tamird@gmail.com; h=from:subject:message-id; bh=K3quMGfwWSednLdCqfDckFdHtFzQdXTMeNPKPGlz5iU=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QBVoj/q+8630VrfoOdU7edikEfH4QTuHyG7talu6SHNqLcu39+eYJff2AqEgN0swyq7Yct3tiub arhdIzcGBNAI= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- samples/rust/rust_driver_pci.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/rust/rust_driver_pci.rs b/samples/rust/rust_driver_pci= .rs index 15147e4401b2..4ba5fcd2b357 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, device::Core, devres::Devres, pci, prelude::= *, types::ARef}; +use kernel::{bindings, device::Core, devres::Devres, pci, prelude::*, type= s::ARef}; =20 struct Regs; =20 @@ -73,7 +73,7 @@ fn probe(pdev: &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 { --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (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 C787827587F; Thu, 10 Jul 2025 15:32:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161525; cv=none; b=jn8eRfPstUXoWI9Pg9YozsAE/yJsW9NvBxb0slPtyzAdC1FwRRBkxaJGoxZjBo8T1eOzi6A2bAPe6d3asxD2Wos59bcXI7KJ+JMLY68C0PXnXMzGRLQVwqjvKPkn4LbVQd26KlHkjSJj7P7hPrHDWVgI7FZXOn3d33Kx+R13B6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161525; c=relaxed/simple; bh=b7MnZtqZPQC4U8mIjLdzpMTp0A3ghkW1nvaMttMu1TY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sRbP7c4+YKzP7C4Qrm54W7s8FrYwmk0hk/oAt/7Ypym0os9n2woF5KJREeVIV6WuQskkZRmdC6RYg/uiYP12Sb9xfP0rstaA/wy4V/MV0KZO4tFS2PS9DucZ25pzCFD5YNXeOPjpHPL2q/qn0EYmZUgX7Mshi5krrhJKZ3xsoPg= 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=M9gcHeJC; arc=none smtp.client-ip=209.85.219.46 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="M9gcHeJC" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-6fa980d05a8so8235156d6.2; Thu, 10 Jul 2025 08:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161523; x=1752766323; 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=gjJPn9BNZDTlQCUGZ6ZHdjrXUEWbzobkN6Ni4tq8q/s=; b=M9gcHeJCe6nyLRmTFSLc0ztkFV5OLdS/m596H/hY5fwePBEE+DMqLrCxnTlHguBfLc n1h8LnaFFBhyQAYk6pGCMjN1jjXjC1rX/QueVQnUP84oSPgUPS9TLsYj4IJF+7TPHQp5 kPx19tiBGU3LJ/VW746Jy14FXoLyj3X+vdcyFuTXzk7OigXEJeJEFLOgGmKbIwkGc9qP VW53RTxVcfrhCZRsDoAL0GBhVPjJksfD7deYkLjEsbrCtOJyeSQWHSE4m1Vpi8cPOCQK kWU6Pwd+DcXSrrAlv1skyY6uCzh1PEfV0RFJJS6IIX3mqckD1d7WKbxYROFjgWpj3olx 2S0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161523; x=1752766323; 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=gjJPn9BNZDTlQCUGZ6ZHdjrXUEWbzobkN6Ni4tq8q/s=; b=Te4i2G6z0IiFQE4JV2M8m0eLrtp052WSfnkqPupXGc3KCg6lzVZWZxLWZD521w2Ttc zqRZpao7i1NjH3ffcbNHReWN3wyvCEPvx71IfcS+OZ22dwj5yLwR+uk6CSwT6PzTUAwU pjo73OpTra+lSJkZ4ln7cRhkgWzpJCQBB3PzY84MUKImA7i9ROmwATro/DfPG8hHBmSX tPg/P46/Zk2rzbHop8E/FouSGPct+dhrBmWwDKV46CAsRzLbjDltazj9wfUEsigdltEj gn4R+GUyj5UOol+jgCizM2mf1GXJ91Xbeyu4E6ykO93OOokpCR3+nS7RxdTD6sfnoeLD 6KBQ== X-Forwarded-Encrypted: i=1; AJvYcCUqnBEp4D9a/dlN+sJi4LsFyKiRUvxgOGw44LGvHi0I2kbjlUHA67ZFwv8E4hDmEUwTLnOSqKsP1Q8DmDaIYLI=@vger.kernel.org, AJvYcCUz2+QUeTiCj9dZbns1GCUnUYs0K0hn8Rb/wWNtvCcCrgT5FnSiAN3JiXmGn9rTmhAeAtTtDvEnoP7ymHzMTi8F@vger.kernel.org, AJvYcCUzyCtcaq7hBoXowgnTOoXFv5Wx2eZ2diaoYUuOeFrEcZoIQLQdLvQledh81sUJTJDeZ1L4G3ssKbC6@vger.kernel.org, AJvYcCVfvc6Tcl6pwGFu5QeubtI5i7E79JVbyoDcMO+zlqj9BlB4KprKqeDY508l8/r5QiiMJ5C4B2n8mVdK5GHs@vger.kernel.org, AJvYcCVqBJDrId6W3kVj4nFjkXTNnvKlP421CLlaFSnsgXuE2BFRSMWBR2/aNo1JQ7Kpf3me1jxF4Liz@vger.kernel.org, AJvYcCW00rawfXsd1YIoWVC1Kf6A8NsmzrDJAYRaFDv4kammy6DYFgJgDXdMqmZx+KfEdOU6x4vCkb6xPrRpPA==@vger.kernel.org, AJvYcCX/1fjhSg1wbsgdRFWqAsZTkmVNfXSK7ibLSs+cX+P/ogoiGGk7WFxvej/RmTN/NxWqUVKTVSXbf7pf@vger.kernel.org X-Gm-Message-State: AOJu0YxgGY3atBP9l30Bawi7gWYl71B4Afpqxpgw5+ylUGfnE4m8mlUW wD8VQQLqasa0IkZwoduFRDAnOMvc2ftYRcfsuKHvSG0e72pxytZqlscC X-Gm-Gg: ASbGnct7nnLswmc9w2Z/sZqTt1VZARIeI54PEDugFcAfEBDQF89qMrB4jRBHaD/vPRZ NvSQU4OaUJUj0iV6BmYeVod74ajKdAIGhuXQ39V5zlCJFDcrNAQj7RV+juVZJB3LszrHW5rZQi7 5ezYiiyHlCXCZ5/Ljkp8rRoRr/1k6V4DytTJ22nJm+S9KfB+eUcw2YI1SHZ7nsZL/vW2Kag/yKd vvb87xPjD6sau0uSfrU82tVhmoLjyCk5NgFaREtXm1L513Y5F59ofV5V4pTdkFbaFdpG770fnoU fYDP3LkQXF3xDJea06yO1iaR70W+JevHOb7TkQPxPkUJ7ZwGQXXJiSw//gT7FbpD5OYNiszCNTZ GunJw4BOzbkfGeS7ElukIdHiKCOJY0KXAN1r3MXzdhtFxMrl1+/AekVRRHg== X-Google-Smtp-Source: AGHT+IHjIbts0URjbxS9KvRYcAvq4YRl3uR9tFk562fCAP2FVfBcN0PJZZlEyH/xPHjBXW04p9wpRQ== X-Received: by 2002:a05:6214:3d11:b0:6fa:a4ed:cce5 with SMTP id 6a1803df08f44-7048b9da2e3mr90346426d6.44.1752161522568; Thu, 10 Jul 2025 08:32:02 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:32:02 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:17 -0400 Subject: [PATCH 14/17] rust: platform: 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: <20250710-core-cstr-cstrings-v1-14-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=2804; i=tamird@gmail.com; h=from:subject:message-id; bh=b7MnZtqZPQC4U8mIjLdzpMTp0A3ghkW1nvaMttMu1TY=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QIC5PltnODTYX8vUFuqLnupbovnoGnPtVA8TJd95OaL9bqCetFK1JYHe9Aro3uVPT4GacvOI9dC qPGGQfSlBCgM= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/platform.rs | 4 ++-- samples/rust/rust_driver_faux.rs | 4 ++-- samples/rust/rust_driver_platform.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 0a6a6be732b2..99ad0b132ab6 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -125,7 +125,7 @@ macro_rules! module_platform_driver { /// # Examples /// ///``` -/// # use kernel::{bindings, c_str, device::Core, of, platform}; +/// # use kernel::{bindings, device::Core, of, platform}; /// /// struct MyDriver; /// @@ -134,7 +134,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/samples/rust/rust_driver_faux.rs b/samples/rust/rust_driver_fa= ux.rs index ecc9fd378cbd..23add3160693 100644 --- a/samples/rust/rust_driver_faux.rs +++ b/samples/rust/rust_driver_faux.rs @@ -2,7 +2,7 @@ =20 //! Rust faux device sample. =20 -use kernel::{c_str, faux, prelude::*, Module}; +use kernel::{faux, prelude::*, Module}; =20 module! { type: SampleModule, @@ -20,7 +20,7 @@ impl Module for SampleModule { fn init(_module: &'static ThisModule) -> Result { pr_info!("Initialising Rust Faux Device Sample\n"); =20 - let reg =3D faux::Registration::new(c_str!("rust-faux-sample-devic= e"), None)?; + let reg =3D faux::Registration::new(c"rust-faux-sample-device", No= ne)?; =20 dev_info!(reg.as_ref(), "Hello from faux device!\n"); =20 diff --git a/samples/rust/rust_driver_platform.rs b/samples/rust/rust_drive= r_platform.rs index 8b42b3cfb363..e6487a970a59 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, device::Core, of, platform, prelude::*, types::ARef}; +use kernel::{device::Core, of, platform, prelude::*, types::ARef}; =20 struct SampleDriver { pdev: ARef, @@ -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 { --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 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 3BE96275AED; Thu, 10 Jul 2025 15:32:05 +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=1752161527; cv=none; b=mU/UWRnivDqwydVTpgHvk1j0O/aArjcNUmErFCRWaX8wg/ycNsQigmL6fgkMrDPGNg1v8e6fm/o4x0PVI/ioyN116GjE9le5vWmhkXi9Dwa/9CQw71z+iFI3o4fVTsHSLbKHos1IKDykOyZHjI8r5G7L9nCVQRCPR+bmRCeJOkU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161527; c=relaxed/simple; bh=oWfPD9SZ2WRxhFsnid53HSH+eaDtp4ct8AP6223uNWU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rnDnNHcnmF9FNwJnKa5/6rYOpRBBYTi1ZMbHUNc5iXtFWP5IbmtT8exNz8ehGEf1yeeX5a7T+pKpO4wXsLvuRHaGSQVnP/wVRtdZAEk7lrISgoKp+DHa89rJLoUxghN9FvHcrHS93X1vgFo3K5DhS2Okd3Y9uEwpXe3n/iyZdnk= 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=NLkodWil; 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="NLkodWil" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7dd8773f9d9so39746185a.2; Thu, 10 Jul 2025 08:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161525; x=1752766325; 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=eAjg0ZV0+LQF8h7dWz/4RhRbIfQ28PSCjaiFK3RId/4=; b=NLkodWilQepBBmMlEG5wvKO8+gAweW0Hc5VTuFdsL5BSP77lPoaDZ4lzpSwRlNQ8eg rvmZV3PsIpBjMzJQabEinOUQo1W9n16qhNf3a4DSj4wWtWtj3Ku3TvLc1iO6x5Vcj8eJ rXbWRnPivkWCYTSkBWN5CbwIFKu7Zu+e34k7ayue6eC1EvtyNHK+7nR5udVPhBvfHugv BSHmotqzsyXl0RUH0mt3v7Wc1fsH0J8DbbVhmDQ55dZCkQtGBeRJFXBojVbVHWa0dA0C o7ntZAYHfCoUKcwa4JVT9AKCNAsv+z9/KEQUiDxA6Y0V4IPuJPJuZT4RQrxjaCAVxfTm P1oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161525; x=1752766325; 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=eAjg0ZV0+LQF8h7dWz/4RhRbIfQ28PSCjaiFK3RId/4=; b=QcXdtQ6ANZYDfA/UGUc8P7srBkrkzeouNU8F2fkgMdaF/H051sHcKqBDh0MuF9NM/8 wJ/AEVr30A74A5Q6kKgmjQ8hXMo1agX2XTMEUJ6vhGDL7ciWzNErSBheU54V9dD7Y4Po IHrpdrH1gBi9oJO7RoiMz+lQI8yRdBZlM0YTt6zIqgMNJuHI74rjU7l3h0iCarPdngki k9uOHZHbAKO6ot/eZVNQpih9catHxC3RTNVMFLJlc67uzhkUqb5Nopq+nX/M40mGg+AT 0pZQkTlWD0yXKopJevw8qMeWSDocvcL4x7b5RicWct12Zlfn+joB0IdP9H3kpIJ22zRm 5zdQ== X-Forwarded-Encrypted: i=1; AJvYcCUYBFMCRInOWPk3BkrHcBsnNovYH3JgwzcA/GiNFO4n9g/2un69OjDkjSuNHKYButoJi64jrgv13N+kZQ==@vger.kernel.org, AJvYcCV+ej7dYuTlw8TNqnM+7tt7/xtjTosbqQq5XgnL1ng90ZqIXgXsdOLbfm08Vw1IXJPHjcCLo2P/q2a9@vger.kernel.org, AJvYcCVLbpqGDBkfbURVv/XeEqU+ENa5u8tLlxHmhr7+Jn2dYJu3SM8Y6G/38/xhLiNqKuZhW7oUkWHV@vger.kernel.org, AJvYcCX8zKpDg0ewcLVUq2iNroKe9ta/xBBgbfZku0yyHo9HYvnz8mUzH4SKbyWANbAhDrekdteX5l29Bx5EPMRQ@vger.kernel.org, AJvYcCXX4DZ6QnOocOoqx+0J5jAhgQhHj0DACl2yhVRqwv5bWoLUX7pceCIT5SfUFCMucFZIiCVC1RKyh/vjilKTyV8p@vger.kernel.org, AJvYcCXi3kh+FJUu2OS8hgmrqvhBirSnDHl7ybeQDPiBm07+cGZ2pbIQvcjTiK7939H3wYE/VYxtHvQMs4Zo@vger.kernel.org, AJvYcCXsTgyP4x0ihh5RZpfH34MZrzdX2hg2vgxSj7DYmi7LXnMNP1keMUDwHvc9y6PQ5//12UjoCqOFbmfqrwN9V/8=@vger.kernel.org X-Gm-Message-State: AOJu0YxtkjMNFhGcrySouVsO78uGgC67wedb/4/El+xOkJChHrvcyL2S rtkVtK5jA6frGJgemFJm/9gEE9kMdws92NMZxTpxPmvyyjF3UlASTt2+ X-Gm-Gg: ASbGncuprBu6MlL7AbcRXVZU+XoxCxGODew3FZk0zQwg+eavMls8ZPRc8nVibjT/V75 nljf6J9/HBRwyfIjdxtfNFVy3T2RIIQF0PRkf1/Y0R1rI1w43TduhVi77EvUuTpUNuatENH141w 021lcqLCefzpBqUqFkXWgl0a+c66P0k3Q9T2Zr5ubcnACO8zy9Z5tLskjdY8CDL2YB3eQOwP/e4 2HaWsbAVEdmpdBwP7IqyirGJMkLFvkRCFdEofbhWYudzR0UNsqyNM2BVu/tK4e+lMOKJ/cQK5RT IN6f/K7PHtkBK/Gw3RRfsedUSa5QhHVID9Y6+LFFbTZK2oRTvUBPDOAOXWm9248fHh+qNgISY6Q VBV8DPjerFsrxR+5RHWTElPCTnam5LL35TwWFAxUK+9uU/mDPcMj9G2CnAg== X-Google-Smtp-Source: AGHT+IHa6QfTTxtysiSDzhEZvT6ceVeIez49OGRLLuuePcNYfbMj3bkmBsvuO2geaZw6Uk2BToW7lA== X-Received: by 2002:ad4:5608:0:b0:704:9275:a7c7 with SMTP id 6a1803df08f44-7049275a7d7mr44810926d6.2.1752161524949; Thu, 10 Jul 2025 08:32:04 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:32:04 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:18 -0400 Subject: [PATCH 15/17] rust: seq_file: 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: <20250710-core-cstr-cstrings-v1-15-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=1281; i=tamird@gmail.com; h=from:subject:message-id; bh=oWfPD9SZ2WRxhFsnid53HSH+eaDtp4ct8AP6223uNWU=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFNv2Kh23FtytsmiZFEP5IAXsVFrrWde3HmnmKMIPax0OI3s+QHLlwEHNMx8/NtqTIKC1Y9eoLt QxveS62SAaQY= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/seq_file.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 855e533813a6..518265558d66 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, fmt, str::CStrExt as _, types::NotThreadSafe,= types::Opaque}; +use crate::{bindings, fmt, str::CStrExt as _, types::NotThreadSafe, types:= :Opaque}; =20 /// A utility for generating the contents of a seq file. #[repr(transparent)] @@ -36,7 +36,7 @@ pub fn call_printf(&self, args: fmt::Arguments<'_>) { unsafe { bindings::seq_printf( self.inner.get(), - c_str!("%pA").as_char_ptr(), + c"%pA".as_char_ptr(), core::ptr::from_ref(&args).cast::(), ); } --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 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 A33442EA490; Thu, 10 Jul 2025 15:32:08 +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=1752161532; cv=none; b=jawckSZGJfW+bz0w7li0FQ4O15negEcWxCbNJn7CgEEdhQiYyKHIIS28H4549LTBQoIZ8rXfG/1cpCgSLWmC3StU8F6PxTyzHuIoSc9DJ19ogn+ynlFZc9nRihGNwtSEbvAor+DNUG/bpyjkt+P8EibDcW+JDyURF2PySjm7OIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161532; c=relaxed/simple; bh=Y04H46Vkhl20b1wCTfgyVZYYKhXv1+IODFSBq3p+QNY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DFLda7Syxlikg0ChsBawlz2PVMXydnwn+8/b7WoQl3hggIMZlyVGuEGSePUqIJ+tw+q73rUTvitJZFIj7RLKg319q12G/566nv9vzuYn0KWXv2+fnop4pAEe1jT33NdPqGI8TJTOYHsKYGaha5rIDCx6Mi3HLcGfjsQcOFmF4lQ= 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=FQdkpDO7; 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="FQdkpDO7" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7d9e2f85b77so171073985a.2; Thu, 10 Jul 2025 08:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161527; x=1752766327; 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=hTPDeQ3MzYVsL9l7pIRQLeK6xoOi/0dqJ+7kw94Xeno=; b=FQdkpDO7tL/ohueIW+kWqMuI/8hA1SNArlFh+ibvAhocpOBRDm1KMKf1+YV2uhJI0b fnikBj5nmCmje9Y/fs/6zy4N5io9s/qwPnA9Qgy8lH6upxJIFB/ZitNRHIf8bq/5qAoI 31eU+MvdhgZ8nMvH5wB0yGd+4EXoq9pviZXpkGI83xnByaNfL4JtRdkiN6dqLhC+eVzf EJig4PXUneSuY1z6Zp+Pr07XHoP72lUjp83TdtgoURvZxtVOwrIknxp+djxzTBqsRrdS CtUh+govDJ8VUfKfvGEdRHlF+NIOG5dWY7APDwFStriAZo4DgQl2MI9FzcYJGHXtDjG4 KYsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161527; x=1752766327; 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=hTPDeQ3MzYVsL9l7pIRQLeK6xoOi/0dqJ+7kw94Xeno=; b=SkpCD0wXaHEZmp1XoUPL+ttBM1+wkZ/fk+s4ueBEgmlGyIFdHSOthOxDRbgzWSlwp0 mNjeGuJgG78DLU5/I3GTPgH8mESBESV8EVo/H5QW7yMA8Z4eNxyR004E5WYdp35RGCwV tCXNMaH44tLE5MuUJPWbYM3gf1plG2MpecULfpwXLYyK4EvTbkjOykizbDwNsKdC6uWl tZ9ef4d18u/WDmwBgJnzTOywfIq4yfFc9x5RBRXrKFgQni8sJkJAeA+MgDPi+zo5ZR1s I8nK3x7RENnPOHwS+0P6iSUcawTY87gd6f7pZ20pSvj/daEF57mvlddlIhDJBndEHHW0 cnVQ== X-Forwarded-Encrypted: i=1; AJvYcCUg2BTGvkdjXCifRa911yugkcZYxxS7V0KBXTYS5B50f4kngaqAVIe/SBR8MFZW3murKKXZOUz5PchRQA==@vger.kernel.org, AJvYcCV9j/rso8NLm0HYIBOzPBQAAw0ThoztGfLfem5F0EqBMUcLP1Aq+rbmZFYi7frDMkYTTBoNWR7JbURm@vger.kernel.org, AJvYcCVBtvlDvMM+McXHKocOyncIB7bmLRKLl9iDtQLSXYrchFCGZg3Ojlr/0N1texXo3v9kyPkT+WFlN3tvUzLH@vger.kernel.org, AJvYcCW8k76O5QV/pb/ZE57ngRXMHTSH8/c1vEu97EpJIaqRYw08I1t89LkU2+XGetrqdtTKOEZIa+4P4e62@vger.kernel.org, AJvYcCXbndWgD/GxAvZ4HHVcpZs/h5xl3TwKLsLkeCq9fBqaHPb+TsMwfWR33CKUhJBMICDK2ZjWcPixUakHANWQILA=@vger.kernel.org, AJvYcCXkOYhHeYXb+8tcAm9BcG0ZhrkN2xG1cwZHtqqek0MtRH7E1hnHFqS5dGsUbBbfjf39+SrKfqs/0D1GAHYNkbVK@vger.kernel.org, AJvYcCXsLXKCJT5KVq928rkwgJXcm9Gwk9HVwF3R0CDRMsKKX4cQl/CzdU7/2ZiQ6dxOdjfkj/pEwlMx@vger.kernel.org X-Gm-Message-State: AOJu0YwnJ9YefCSD38m1DYq7VvFs7jYUMCzPTIZmCxRqvlWUnpJJ8wVx 8K69v1zqSVcTyRpuq/nQX8w+SKhyMLrVeHhoMZ2gn5f12U7D0csPR4tu X-Gm-Gg: ASbGncuh7CgmUClg8C8ZDvkbxJTPvhjWi8HVWU89mws/RB04jI4HMWohcxn0+fUA6Zu BcS/42IkzXLwI9F39V5NOq3Iw4iqVz6auTiuJUTeVyMz9tvIDE9YZpezr85Lsl5FiuZ2h0hHAc4 Q+SBlspUvjFmhGNWy2P4LeVqtmBqSSiIAYx9/Ery7IfvTnEkC2sGtLGB3G8Hd+wGvko9CWaHjvn UKZff+WSed/evwoFEV+xEPMQR/MbYH9k3eIio1YuStmRgKcVhE8z4aLhEcTJkDQvLtPiU47NOJm RwZYo8iUxSOQservY6g57maewIYSh/Tfu0e1HSEkIfm/JuDpvqo9gz9xNazA97uS/wCQSZAAbOp rKyCwd0JrL22TNXJO2H0x9dtKbMiMmxaWc0IqjAhZrr0jQv4W1CaHyRQVOA== X-Google-Smtp-Source: AGHT+IFwb1eDl83RWRgNOPiI2xnO3+DJqfkH5CNG1RfiaGeJvrTkceoGSYcx57ApRt9niHfqfPdvrw== X-Received: by 2002:a05:620a:1726:b0:7d9:7096:4910 with SMTP id af79cd13be357-7dc999b341bmr564287385a.1.1752161527419; Thu, 10 Jul 2025 08:32:07 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.32.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:32:07 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:19 -0400 Subject: [PATCH 16/17] rust: str: 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: <20250710-core-cstr-cstrings-v1-16-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161490; l=1304; i=tamird@gmail.com; h=from:subject:message-id; bh=Y04H46Vkhl20b1wCTfgyVZYYKhXv1+IODFSBq3p+QNY=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QN/x43LOGtGcE5XoKlHGuC7ORRj2DN1CIT42OvTRD/0MaEaE8FrNbcFi6fQDB5xIRVLz4YRHP6h Lk3wiyMArwww= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/kernel/str.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 61ebaacddc23..26bb3d916ba6 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -266,15 +266,14 @@ impl fmt::Display for CStr { /// Formats printable ASCII characters, escaping the rest. /// /// ``` - /// # use kernel::c_str; /// # use kernel::prelude::fmt; /// # use kernel::str::CStr; /// # 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}"))?; /// 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}"))?; /// assert_eq!(s.to_bytes_with_nul(), "so \"cool\"\0".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) --=20 2.50.0 From nobody Tue Oct 7 09:53:11 2025 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (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 8ACA32EA73C; Thu, 10 Jul 2025 15:32:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161532; cv=none; b=hg/CxVwN8CgRCoaqv7ZzdhrDyWoOls7UMbBvy/8sT2pI87Rypes2KGruDfU4YC38chCbCk8r6WzaJn4iRbq/bChrjz07/odyT4qroSGnq4Dz1LZNdGG3D8rM1hqCGNCC/0TurE8HUTYcKnq/uH7knO28Lv+tNFoYlehqLQpTMe0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752161532; c=relaxed/simple; bh=lLdnM+NUEuXkQdsCZ2Zc/ZWA5W8wgiORDQ2a6677Zzo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IQhSe7SYC7glGeEpmnVeCfn4FWCWUqx3Yv2sJxYkJOSdkobLMzJhe+NEoIkXgM2Rba59OIdEr4gyFBYhDmQLOspEDkRVWwiEDKew0U9DkPwKeZYWnZ7Zz0AQ54KVn6Iv7racMZvONi73/dpA0Sjq/TT6yJKsgEwhkcFnT+azL0I= 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=H2tHOLqW; arc=none smtp.client-ip=209.85.219.51 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="H2tHOLqW" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6face367320so10040656d6.3; Thu, 10 Jul 2025 08:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752161529; x=1752766329; 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=qg9MyoLzW2O/wZTFQuwcCSu9JeslcLq4bzCQcPCtBGw=; b=H2tHOLqWsA/F9mJv+GKxy7Wvb1tP/3gMKiJipylhtMWB3Xqq8PxJ4hL5ey7LIOn2rS LwLlqcKTBLprwN9jkhBH2yKlB3yxII02DuVw6bibBBrMHDB3OnmLFOBtEhiEBmpRXne0 wxOMxtlA9KZBz2ScGpgBOpZClHFw2sYPkdt+Eu5e1DXflitGMLbD6jl+BEIZNGiJB1IS 7u1vRqNs8czVBj7iapBCuicCpf8dg5BpUlDYAMV86ywh4Ity2rWt+YuqAufOdbXr4iJL E7SgBUgnPuGxbB1EVvGN4e75lcQQjUknD1IgDZI7jTmiWl71YHKEBkxmuOeFkS96xpQt 5Lnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752161529; x=1752766329; 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=qg9MyoLzW2O/wZTFQuwcCSu9JeslcLq4bzCQcPCtBGw=; b=fr8BAfjZfC823xSNDi8T+Njkm375b2w4Yva6zyHJchOZsVud82oJRP9qwx2iOODXWF W+dFPW3mtIZudYfM4STNk9Vw+ovh7mJQyi76LapSSfahSHbpfC6kqpQjOH8xxiTVQHO0 lLMIGDjdCu0h1PYkLAywIppikmhES5s7fHhs9FRKQxxeeBwKMVTYmsyQ4XCMS259iIym GQjjHEhvGC1g17lBw4bUaW4OYgJhL5OhIlcyJZ1O/E28WxmMyOkqFtEuVdDieVsEkTFm Wf8nRaYKRULjwtBhpDjHYgzCHIDgyx2Kz0DUrvd0PW5e4b31JC2vyNrja2wh11SDzx09 2wcQ== X-Forwarded-Encrypted: i=1; AJvYcCUNPo8ztHMvstNB5uOIJ5Ht95+ugQDreiZ0q4H5eW4SeDo85yE6ahJHIdxEr/jRPtW3GED2eUAs1Iq3G4Hv8IA=@vger.kernel.org, AJvYcCUVIJKbeldAT1iOs81ce2UO6ZA4QtIYUxe2SA/GJvtjltHH/sX4uFqJgAQqyhXSOh4MS4QarbDD/YABFQ==@vger.kernel.org, AJvYcCUYqb8yhy2JVggzvJ8BG7N39Cn8tpazPGeMrTJZ50sBsMo/doKUYrGthYZyiK1CrAyqiwfdgykq@vger.kernel.org, AJvYcCVJcOXJ0VvfepV6A1ASFgVpRWY4pSdghv5LpNkezmRBrb17undJhUhY+ZkuDTQnnlnNUMlCK4rioB6S@vger.kernel.org, AJvYcCVo5m1rlrV8/2s3ssP1sSYQq+z83Ee9JfQt1VXwsshzH287y/g//SUvJEeRD1S1MZxEooGtTjYRqOV+Dm26DV2U@vger.kernel.org, AJvYcCXJtWOrpYSwS+qHacLTnykXyQHwaFH847PmVyCd6qSOfpdmFtgAV8vPWdXRaFkY0/HUibYssOjlrx+M@vger.kernel.org, AJvYcCXkQup6nqO+6OKlAxo9aFjSDMeE8dK15n0QIZ9eisOrd8NrGoQ63mcjiX65YFH7osOzS8CqyqB5HfFM3GpJ@vger.kernel.org X-Gm-Message-State: AOJu0YzCBP0y17bK2oCxc570hYMuD8Ho55sJBGysQ/UGoGn5RkfNXSuB uDUJBi3ReOnuGl3QOt4HgohW8+xeDA507WW2SrxtLY/IQDnxLxYkAgG2 X-Gm-Gg: ASbGncu2qj5CiaSAdaRxvftywAFpJPu0kIHttrFdZDNHVETnhHaMcnU9ywtvZYDdcrr XyuAxZoYQOXgTP/3gKIBts/HmA2WvyX8WXmUGpIXqCU6UbYI9e7tCflxz77AydFevm0LjWwZO4R xOiOVgppdXsKCwR22yJXOjLEyXRLnWxnKMoaLAi5u2TPDmIy/X92Z12DUWlaONFQNbk9JQD2jZL L+XiVZbEipp7Wl/bZTmjfW33mdl944IA4dKC36B/oRmQNcmwc1MtHHKCfe786SZIXrFaICKpvRr cIiHeBXWsKgapkJHivQGNYmi43w2fHTaDU94D3ReKU0O6uvmCJsYVJ0sjGZqr/0rmzrBTFdJcvW LSFdvhc1T1n5rgkK/RbW/4YzNYR4dKlq5o7qTPs6pTk8cxFgOW5cD3aDjjw== X-Google-Smtp-Source: AGHT+IGR2RRZQW2bcini0bMXKS9fKRmwAOf5eVXkkfrEVuuKui6PaVOKJy0ulnbPEP69BzEKMolKgw== X-Received: by 2002:a05:6214:328e:b0:6fa:bb26:1459 with SMTP id 6a1803df08f44-70494eeb96cmr79324366d6.7.1752161529395; Thu, 10 Jul 2025 08:32:09 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([148.76.185.197]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979dbc3asm9449496d6.38.2025.07.10.08.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:32:08 -0700 (PDT) From: Tamir Duberstein Date: Thu, 10 Jul 2025 11:31:20 -0400 Subject: [PATCH 17/17] rust: sync: 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: <20250710-core-cstr-cstrings-v1-17-027420ea799e@gmail.com> References: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> In-Reply-To: <20250710-core-cstr-cstrings-v1-0-027420ea799e@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1752161491; l=3792; i=tamird@gmail.com; h=from:subject:message-id; bh=lLdnM+NUEuXkQdsCZ2Zc/ZWA5W8wgiORDQ2a6677Zzo=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QEQCLdocV7E4OivASyLh0mReapGH3HAqrlKw6p+xfkfcFh+9TajU5mVNbgdK6iJLvlwtkJLY9Sp YR4gNbcIrDgs= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- drivers/block/rnull.rs | 2 +- rust/kernel/sync.rs | 5 ++--- rust/kernel/sync/completion.rs | 2 +- rust/kernel/workqueue.rs | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/block/rnull.rs b/drivers/block/rnull.rs index 6366da12c5a5..9aa79b862b63 100644 --- a/drivers/block/rnull.rs +++ b/drivers/block/rnull.rs @@ -55,7 +55,7 @@ fn init(_module: &'static ThisModule) -> impl PinInit { })(); =20 try_pin_init!(Self { - _disk <- new_mutex!(disk?, "nullb:disk"), + _disk <- new_mutex!(disk?, c"nullb:disk"), }) } } diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs index 63c99e015ad6..9a6d2753937d 100644 --- a/rust/kernel/sync.rs +++ b/rust/kernel/sync.rs @@ -43,7 +43,6 @@ impl LockClassKey { /// /// # Examples /// ``` - /// # use kernel::c_str; /// # use kernel::alloc::KBox; /// # use kernel::types::ForeignOwnable; /// # use kernel::sync::{LockClassKey, SpinLock}; @@ -55,7 +54,7 @@ impl LockClassKey { /// { /// stack_pin_init!(let num: SpinLock =3D SpinLock::new( /// 0, - /// c_str!("my_spinlock"), + /// c"my_spinlock", /// // SAFETY: `key_ptr` is returned by the above `into_foreig= n()`, whose /// // `from_foreign()` has not yet been called. /// unsafe { > as ForeignOwnable>::borr= ow(key_ptr) } @@ -111,6 +110,6 @@ macro_rules! optional_name { $crate::c_str!(::core::concat!(::core::file!(), ":", ::core::line!= ())) }; ($name:literal) =3D> { - $crate::c_str!($name) + $name }; } diff --git a/rust/kernel/sync/completion.rs b/rust/kernel/sync/completion.rs index c50012a940a3..97d39c248793 100644 --- a/rust/kernel/sync/completion.rs +++ b/rust/kernel/sync/completion.rs @@ -34,7 +34,7 @@ /// impl MyTask { /// fn new() -> Result> { /// let this =3D Arc::pin_init(pin_init!(MyTask { -/// work <- new_work!("MyTask::work"), +/// work <- new_work!(c"MyTask::work"), /// done <- Completion::new(), /// }), GFP_KERNEL)?; /// diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index cce23684af24..432624c69c72 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -51,7 +51,7 @@ //! fn new(value: i32) -> Result> { //! Arc::pin_init(pin_init!(MyStruct { //! value, -//! work <- new_work!("MyStruct::work"), +//! work <- new_work!(c"MyStruct::work"), //! }), GFP_KERNEL) //! } //! } @@ -98,8 +98,8 @@ //! Arc::pin_init(pin_init!(MyStruct { //! value_1, //! value_2, -//! work_1 <- new_work!("MyStruct::work_1"), -//! work_2 <- new_work!("MyStruct::work_2"), +//! work_1 <- new_work!(c"MyStruct::work_1"), +//! work_2 <- new_work!(c"MyStruct::work_2"), //! }), GFP_KERNEL) //! } //! } @@ -215,7 +215,7 @@ pub fn try_spawn( func: T, ) -> Result<(), AllocError> { let init =3D pin_init!(ClosureWork { - work <- new_work!("Queue::try_spawn"), + work <- new_work!(c"Queue::try_spawn"), func: Some(func), }); =20 --=20 2.50.0