From nobody Thu Oct 2 00:46:11 2025 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 AE4BC2877E8 for ; Thu, 25 Sep 2025 13:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808463; cv=none; b=lbTW6vxf57bUKztkYwrbRgO7+K/NxWD5DnJuxBnuKYcLPC1IRavX4b9cVuQMjuvqHC39/Kf5L5g5JrrSkqrB8C9YS8g/4RPbTjXbGxM4pSr/EmepI5n3EHSGTJaZQH7Sv1DWAzCkF4NOCl0hjnRX+cImU1FoRvxPHIcFWMMBouM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808463; c=relaxed/simple; bh=jCTV/tUAugB6kQuG6h16qXAYA9gVjuY3K+nRw8uudBM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jh7Qm18CXVX4V8sF+7RAfLzkJHXcEXHjWwhVwCQRDdLGn8SViB2UNfTOi6HML8VFDl1prUKF52rgUA4VfsMsu9GlmWt8xI17C4g3kGOZCcZTmE+tMOJicdEDibFtfFwC/LzNNy6Ma4SbiGoQ2E9ZND7Vn8cp+LoksVin35zbfB0= 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=Z6J/uTPs; arc=none smtp.client-ip=209.85.222.177 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="Z6J/uTPs" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-8593bcdd909so100478885a.3 for ; Thu, 25 Sep 2025 06:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808459; x=1759413259; 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=NalRugr56a/X75BPbSyIQMh/LBa9oMHO7W+8WbDPYnY=; b=Z6J/uTPsKBAx6HJvmtIfO7ZFGEZlxiRThXTNdmWpI6dnkrWfEZoIBlrMY8XFP9vkXV kzjwUZ2cyShty0w+OGd1mcm/0TBWPX1Vck7YyMRIwlt2uE/SZemGRNTGSoK7wmMT3o6B LRfr8ljEB9QhHA6pE03bg5FmyemcnqeNJbjjQ7Emo6yibervgmQ8hMLtHaa/1Pr31JOW ThqJQ2sWN34kuFIerLiPC27ilZaIOKZNADlF8WZIY2fkcYHgkin4qh1jy62oyvp+DSLm f37Pe+aqxutH6a3OaydVe4TxZ0GTgSzG5Y0kw3MjNzPWkWOWnFbeYGSPOF/L8QRQvhHF K/PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808459; x=1759413259; 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=NalRugr56a/X75BPbSyIQMh/LBa9oMHO7W+8WbDPYnY=; b=rA1UaEaCkIlT+EkEnXOhYfOlIVEVJj+8VdCrmxSODctx2GMHxl4pYB8iYfAS4K1CEn VcN0Z+xQnriRhvSGk0YzcaQMxTruDZvNpI0xzAXybJ0SO5KRy5nY9TBMSclirD0M8qAW ot5qPy478Vl2hSm/1CvJdHodT4JwhfFePmrBxEjQyq+sFYGrowiO/ZGKu0/cQqniFAD3 7/OzVJy75hAngN8kfgfKbFZQvTA2uzszJ1Gc0IPDFAPiybTzGbOtjFq3qG86zHYRtSzH AUNhO7e+Ielx92F/x/aPbjVGDdGVaEDmwLalOLD16EGGITChRG5yHGiIF+8OiLzJKopG IK+g== X-Forwarded-Encrypted: i=1; AJvYcCX8eRL8TZ5Q2XOrO/wdd8XHYMeAcFwE3SMAnUUrGEm4hENfqRF65HI37+WbmsFTsQmyFqOaRSnyrdi5J9I=@vger.kernel.org X-Gm-Message-State: AOJu0YxDDBiTKWJmLLY4J2W8IdyKjJ1YNreShI4BlalqXMo99m3qOwmg d1xLSEC9yXNcdE5MQkWyrQFlja4c+Nvv7plwcEmy3lm2I+jK5tOG4+Wc X-Gm-Gg: ASbGncvYu7O2uPsybLnf9Z8F/x/Vj7XOaS5EKJODj8d5/7jiub7EUs7ybFX84i2Tibb ncJnIv1hHIZTMEg61JC2kR+ZHD5qa0/dmg65fpdLEHvCeje9PnvWHXPfaMdIFQx3ejd5nw4BVr4 ayUbQAaX+MZNDeIJzkMLsy/xefOrtEH5nwSKq3O08TYqpydWdiDimaZeqf3U6tSUoWrP6XY5iEe maQojZhU9rtnRErugYIxz0ld+5OtAXTWFku52GZ8B51wEuifNhqEIDdfsO3okWnf0gDFb7V1Eky 8g6eb+dzIjjcqAK2WqnLBE72QriJZBxrRVejLMjJHB8kWBMocHg75m5X7MZygwN/zJ9s+PdhbGc /dtPX2Nr0zl/TsVKWz960l7NhAb0LHSQ/FiDELGkF4GWTdwJ7BoRSyrbO0605CJJzZLt3Arvypp yYNiCr6wOH2K0Uf3AHA0/iG1Q4Es6xk8JSsWQGEVITwgUajJtv2mHdNh7TbH6i0XcR0R5i X-Google-Smtp-Source: AGHT+IGDJTlODDEEGMd+XqS6TrdaLhozVUbA41arvcw2luGPWfwQ5X2fWdHexXOWX/V4ddEWfD+pug== X-Received: by 2002:a05:6214:500e:b0:784:bd2b:abbf with SMTP id 6a1803df08f44-7fc39460bacmr55347756d6.24.1758808459061; Thu, 25 Sep 2025 06:54:19 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:18 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:49 -0400 Subject: [PATCH v2 01/19] 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: <20250925-core-cstr-cstrings-v2-1-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808436; l=3366; i=tamird@gmail.com; h=from:subject:message-id; bh=jCTV/tUAugB6kQuG6h16qXAYA9gVjuY3K+nRw8uudBM=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QM5FRv8eNJ3CAtJrq8ctlI58A1uhfnem30wXWxndQdEjlI88vgu5PfmeFU3nqX15SZ72W8uXUUc 90i73MD8nTAw= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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.51.0 From nobody Thu Oct 2 00:46:11 2025 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35917289E08 for ; Thu, 25 Sep 2025 13:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808470; cv=none; b=k2L6+bYK9W9tfRtYV095Vyio8zuvL7UTXv/dkwKXRBmL22j/Z3fIJ74DqDgn+l1FZiGvSZsDLl87sXjI4bkBpDf2KZO2nBig+LI6nqVkn1WONJH2Bryz2cQpYMJpu3bqvUuZatZR1ECI6p5GLZQAKh1wYd1CENs7VV3BBe6HzrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808470; c=relaxed/simple; bh=a28D2oz73aX2HfdAyFfsKbL334Gi28aqVXRfaJ6AmKs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ANE1qAsp2JDvn0PLqzzmYHKmSQBWvnzT1WqPgl0nPae//e0z8I9YiDJp1qs8XaUY0oOB0ZQfk1L/++UgxKP3oaLDflX/nPF091KKPCrTrciwMVoNYrmAmX/Zu6BeTzXskr1KhI6imreQzZQ9pecaftALJJeBQ+LoHb0GRySSmGk= 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=JyBSanWh; arc=none smtp.client-ip=209.85.160.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JyBSanWh" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-4d41154079aso5773811cf.0 for ; Thu, 25 Sep 2025 06:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808467; x=1759413267; 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=gUijmF9iuJuAB0zjmMxkDhFa2siruE3gGN7H1MY79is=; b=JyBSanWhIqVHtczXr/C06BJjsuqkRhHbMql48boYTQ32gkEZOpJsuQ6rWfL+xNVjAr YWsoQMJH97FKLsoaBsYw0NIw29bWbQCRciYbebnQKoY+Ni3PyI62sPxBXyK89TtcY2d7 6TbQkU97tLv0hYvsOofthnMlKpzRVqL+ZzDbxPNQbC9fMG/QXCkm7YQOl9/znwXosUp4 DEK3jW7hC9zFrwKq/uvslUuNdWXB1pgVEQUnMuys54qHWIV1uGfzaDvTXQMrYrVE6nXT lqxGwvV0KdRCWqUnqRIwGau9LbCl95dgBoVxnrJEa4y3BhDB7vpHAnQslcxHLc3uwGhE k1Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808467; x=1759413267; 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=gUijmF9iuJuAB0zjmMxkDhFa2siruE3gGN7H1MY79is=; b=R4vWTDrCiEli3048ZWwYYm6qAMKHZeO6UG3/U71NVkXulRiYH2oSgy7nuj6OQnTx+d un12CnnPJzynpXDak5sL4dev0j4PCRdcFzD3ZTT53LwUAKwdaxen23EFaZE+n7xOcvZh n6Do6zYC66hWSSRDkb1lHyuXkKhc5Fuj4nFEPZyq0jOx4A+/YIEkp6ei+uh/Twbwjqcb C5hJ1bPoKx+0rNJQ/0WtzLN38L3oM70xT7VAzSe6AAJgfLhXQTc3CyPSLLjNHIZOljWw rrivzpsw3o1yvqvz60knhwt1vsrqDxfgGWx5ViR5YUTl4LLS1J7As4pgu0/41W9/Torj XrEQ== X-Forwarded-Encrypted: i=1; AJvYcCXDOlaYS6D8qRGWZ2u/INwSe5KTetEFMM+jwPlZesoTxs3M26zWdrbxhRNpCPZivLUhVBoAd2Wd08jRT2A=@vger.kernel.org X-Gm-Message-State: AOJu0YzD8TaK+J0xdjHbvQw6q61Y7U45xWjmfVNO+6+81bVH9ZxuYBLz JKYZiBKst+RRrNzmHnnqlr3nsQgAB6VMDl7oyAp2g8a4LTBG+k+xyS1U X-Gm-Gg: ASbGncsqnTzceI60JxaV5heyJsSmPLw2YHDl4ZRCTTg6S8R1gZ+ca4/GUcevpZH7l63 gw1Bo5OxC2gQ9yLldvO2+eReTHXaMM7Pl/Td+nAl/6GmltTMUAV3foq5B4/+bN+zUGO0PJ54Ay3 djKYDtUzVL1NZpbE+BX3RxbakMRJ6byaX4l6eHz5QdE8ke+CaSBZ4adZTa0es9aMpzAgZeJ7HNh xeXdRZ0sWIdpJt4RZWYdTdRkQP3q/ql+G1P7ERCEpNw7G74mp7Ag8NtCZbK8JkSC1cGCviYoP3Q SL0JiQ8jeSNL7beEmkdNb1uz0LlSqB8f1qI0XQqvF4Y9AmcCZZSzNuzIbrxwxzlF5QFpn4AycZW BhS3pbNl/CCoJ/K+m83PD/4yzbczqg+aMI8sgqD1HPjbmTgkJBaBMAA7NrpgSe/Y+DXgcEKhwt+ Jv7zZJZ8GDX3a6Vdnuc7Ao+AvCKQgL4wEksp93qlcZnu248aOH0wLSb8Gb9VGGMLMEdxjy X-Google-Smtp-Source: AGHT+IFfyTZ0Kg2oYHDkA6MZ/FXiX6A/UvU5m7OAHMKeDgQlNpiMwRGrpCfne5Uk/q1fSoRc2LB+qg== X-Received: by 2002:a05:6214:1301:b0:766:30e3:eb9e with SMTP id 6a1803df08f44-7fc3a0df24fmr47841866d6.37.1758808466670; Thu, 25 Sep 2025 06:54:26 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:25 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:50 -0400 Subject: [PATCH v2 02/19] 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: <20250925-core-cstr-cstrings-v2-2-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808436; l=2917; i=tamird@gmail.com; h=from:subject:message-id; bh=a28D2oz73aX2HfdAyFfsKbL334Gi28aqVXRfaJ6AmKs=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QHLcRDKGO1UNO1Fhu+96/NdqIONmVEz9UH+4kwXhhoYDAdY/CR9wCCd91BlfzpgIkfI2NRm4QuH Pm2Zu/FAx5Qo= 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 Reviewed-by: Benno Lossin Acked-by: Danilo Krummrich Reviewed-by: Alexandre Courbot Signed-off-by: Tamir Duberstein --- 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 274989ea1fb4..2f1a37be3107 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::*, si= zes::SZ_16M, sync::Arc}; +use kernel::{auxiliary, bindings, device::Core, pci, prelude::*, sizes::SZ= _16M, sync::Arc}; =20 use crate::gpu::Gpu; =20 @@ -35,7 +35,7 @@ fn probe(pdev: &pci::Device, _info: &Self::IdInfo) = -> Result(0, c_str!("nova-core/bar0= ")), + pdev.iomap_region_sized::(0, c"nova-core/bar0"), GFP_KERNEL, )?; =20 @@ -44,7 +44,7 @@ fn probe(pdev: &pci::Device, _info: &Self::IdInfo) = -> Result; Thu, 25 Sep 2025 13:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808476; cv=none; b=qeZm4/dNrIsM7fJFVl0TOQpF06ZggaIWCcl44/yMIfD/T7JMRjXQwgKx4u5Ce+6Za5dW5m5m2WhM6X+cXuLE0Lznm+4XOEO+5v+CZr9bfJ134fTIrEVXHc/lWofkBrdPThlQkgVO6nI3p8dS/1x9xyrMwVRMMZeFVFTxsFAEORM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808476; c=relaxed/simple; bh=hAcmGZ1oTJ4jVBQJEYJ6EMTc7nRfLDtEyG/sjigYIyU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S5t87B5M+/OavnnpIeR0npl34jWGiTdTekZ2TIS3xJZC+Rqb4qZM3Wnv6olgD+/aUliOBiBJSultVKzwiwU6jeMjSwfQL0rEdcZGDmbMDmu9H8k/cMQ0WwDSV35plUxDmMYk2YMvMKlobgpPZS92XOEHiEJXvklHDiyNWaFYu5c= 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=mdFJ5Y+M; arc=none smtp.client-ip=209.85.219.42 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="mdFJ5Y+M" Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-795be3a3644so4498976d6.0 for ; Thu, 25 Sep 2025 06:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808474; x=1759413274; 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=2xzf6OZF5c76vENMOs87EjkdVa89C5AWM8vex+/TLyw=; b=mdFJ5Y+Mr5cQmu2a8FMx7odFq4o5MU4BtNFZUkmdmuk5NsirvsjSA9+cuF1FCaZ/oJ 7wiY8Pgx6585HzC/a7LApe9Ol775mowjqiHcnsl8BVXk5hr+s/Kw3bhzgaTJ/AP2mN0n 7fmlXG5ejtVjGJTM0UCXTvNO9a+yn9hoNAv8KGozm6Lz2VOnWwqXfkU/5lj3C48p42jG J9ypONLwel9qPlk2MIK2ZXA3mt3yU35/JsHk5wqj2dD6Rnn6nDeJ3/LHViyX38P5LUBX tdXG2Lxox0kyA2sb9DwgI+ROdjMbTirj+beoub0FU6beRgwH8yBdgKfJJS58Rq2vLX/5 +KZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808474; x=1759413274; 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=2xzf6OZF5c76vENMOs87EjkdVa89C5AWM8vex+/TLyw=; b=gSzPZI2H6eMDi7zvoChCmtSoPBpMOahWrMH8SN8JigdOVWuNZSZVd12OM6Vu1+H5Zj ZoBc2N+qEX/CUdOjPTRVkXAGoXM1G71y3TrwCrVzVaT2ZBUHGHFPVD6fK3hXdJn8gUMw LRFu8RVCSKfPhA9jAy3ynl4/kptWbCFGjytswPJvVG/PBQZv+bF9WDjCukz/Bxlcc4Ae 2xDusuatH1TAq6m8Mo3vYuMKJRL82WamE4mVcaf6SVdioo1nWFLl7QHydkkNQS9RxjMd mgx8bm/SA8eoOvtj6vmf5ufGzD4JM+6NYRb3E7zx7QSd6UFDirG7Dx6ewddNersHnjoM 9Oig== X-Forwarded-Encrypted: i=1; AJvYcCUhJSa5whFQPUoL5ymiPWzCodbfjKO+T0LJAEfeH6g7sXwGIeaz0BFuEAdjc0vS1Ff8lMHo5SGNvdNiuhw=@vger.kernel.org X-Gm-Message-State: AOJu0YxjFnluL46uY85RSTSh0L23k9QGQC0LmyLxmnWueH94ZKYHfP71 GLWXtISMTxpxqPQJC+zXqDpYKEAbNTQSNc8wq9Q/2nxX9Y6/51YSbUzQ X-Gm-Gg: ASbGncuG74HAJjxSmbGYPdN1Kpt5bRXFi8/O+YVq7VGa9Zrg1N6OCPH3WzovUUjDpRg wYBd+paZqxpMErulcf1EMpD6hAQb9tm0jMMT3HUbdCiUurwV0UCNGbHBRbdhFZFLZlnmPD0sOXE mbOyQ7HGEwsxWs9LzxRy6QTPZ8eyTFZEPCZKo0ZmDMC5D43Mf9kpl+CtOW2JVW71S46cZtxfNBQ YztTwc3P3EwejkUS+yws5NqIj/TtKV3fvjLmWm4YrtbzwRYkiEHZSHNJxr8NljXYJwCOIBO259E /wISuo/7XrIbBmbLB1R/aG3hs/nXboqfiXUw9YNIe2Msk8cgXo33BDOTwkB5gSsHhI2MgPjBSFt EstaVt5ownAQUraXIr3dwb7pBqeiPAINJtqMI86DfmtioVlc0Diq/4fbHmhv6psN/Tc3wF2TXe3 GNWKt2NjdectYG9wqrWechNsbXFJ8rlBhsM2anzXtL/UPDb8xpOlBBwkAM1pSWf0b8NhCy X-Google-Smtp-Source: AGHT+IF/YXOPVFfPbsLgNMSmKy5gMrqFYiERb3qNmBjJICdsnhp8ZUohxvtzmsCi+i1Rv5C0gLGPJg== X-Received: by 2002:ad4:5bc9:0:b0:76a:fcee:97aa with SMTP id 6a1803df08f44-7fc309ec826mr47810606d6.29.1758808473264; Thu, 25 Sep 2025 06:54:33 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:32 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:51 -0400 Subject: [PATCH v2 03/19] 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: <20250925-core-cstr-cstrings-v2-3-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=1276; i=tamird@gmail.com; h=from:subject:message-id; bh=hAcmGZ1oTJ4jVBQJEYJ6EMTc7nRfLDtEyG/sjigYIyU=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QEE+jmobZ+OS5gJ2DI0z3t4gywTvP6wS/uYHw9wdi8Q0VEYO/oiFsjlDMO0nWijf77etP3ctTic ZfcFfCn7DRwM= 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 Reviewed-by: Benno Lossin Acked-by: Danilo Krummrich Signed-off-by: Tamir Duberstein --- 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.51.0 From nobody Thu Oct 2 00:46: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 76F81287506 for ; Thu, 25 Sep 2025 13:54:41 +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=1758808483; cv=none; b=hmxK2eifaRY8TlaU2VQzhJ6uvey+8MsW/KGzcXT5ykRKoCZ7clzsaxqMluLn2OBUTamMTkXWLzR+IZs61LZANJwdslZdAcsjrPArrT8wUZd/5eJh8WJChb48xi7628pEzF3ytHccyIJhJyePN5TTyKYwIlGKHQn9aZq/2tTEv6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808483; c=relaxed/simple; bh=bBVznekpj7qdZ0+04IhJTyz4wbdj27t8Hhu1jfona5I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zp3qmp+KgdLliCJwfBc1rvXwK8A1S4P4E2XA0Pz8pnOzJ8Ft5k1eURag181WopLqlWx4QIIMZ81eTb2IoC70qY1T7iuwcAPEPyiLchzN6XM12dUtmiPEsB2obWOuzqsVEEaekN2xC4HgbF2s2yVRtlM2P1D4o8VdJ1K/2MiS4Hk= 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=JGvqmg2F; 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="JGvqmg2F" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-78f58f4230cso7292646d6.1 for ; Thu, 25 Sep 2025 06:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808480; x=1759413280; 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=r6lalX/iBRsGnpItoRbVPuxYp6EIBWS28tOUXJUE06A=; b=JGvqmg2FjpGnums7f9TtB91ZEHDxTDHKw5ZM2KiCeGnwDIKrxIWYi7oHNZ3VFYWtvw XaS34WAygmxNW3LOyTf7QTI6sc4u/zxOtwCJJ5iWmNL1bc+P6qBsNlSUstqD0Ic3jjjc S2wvXBH8DP5tN9ehtUeGsF3xwKkjGHkvQeVtet9YibnqfNA7DrGcEvOZntMMmaj3yGed GYqnxdeL2pnRx4UnDjbgutLucrIsneP96Nzjanj+qaaSNO11aLaAmhY4trCpE+PH4aKE Q0MqeM/uH1uCNuXTnQ3LBFtMA76FL+9wavqqpDnbyUt89PFtZQvCyXt8w8h4KwK9A1hC m7ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808480; x=1759413280; 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=r6lalX/iBRsGnpItoRbVPuxYp6EIBWS28tOUXJUE06A=; b=DqWo7Ao5xkl6eAoqIVIAFZwj2+hy4JdVkkhmNl/QZEPVtombjuBF74KdWTThs9VcqA 7jODuHU7XuDUaGYUH9ZoegMZvCsUIk/ncI/lR2P4LW/s7LAujEQDygdnU/P6cscOguCU lHVw2rylLbqpn+DWQdwBgY4IiPCL88R3kJYTbzprEswVcYrvbTezRzapZsxv4FUJpCj0 BR1iDa5Jj06JJj9Ex4nIQs42BlB++OvStO5vvNnxpfz1nMRXguZh93qJmLwh9Qb8lFx+ XFjWPSLxkEL+hFqym/cidO3F1lK6BjcOBWSiL5DppfBg5vzNnd+OFCnujGgVCUKHRR2v lnow== X-Forwarded-Encrypted: i=1; AJvYcCVovgLNFBlXTNAmrD7a20Y5937ll1Nqj9FC7vy/OmG8h+ac5XfNI0XUtSQL2R5KimL+N1PJyU48LFna6hE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2VsZBMZicDP+UvGz37kXjnX/d1huwNmjUdqm6EVwIVZSxcpjP CVOdAqrBIxNJefvgrQw+3FRVSSRMhC4AFK8gvJQapHFQf0X5bsZX6ZCF X-Gm-Gg: ASbGncs2H0asMCR+Xq6BgeTjaGVVGzQOjPrnxBebJLuiuMJzmjXZeMtgWlyZ2R45WI7 lLeTd5LRmC9AEZWtcBU4BVkZo+ZdnGI5lo/y+wJZAPutp1H5CGN5734pRwhO9WI1fJISf8gOKEm MWN9LGWIPYoN86X6W4JW6ItV8fMsUk4i8wK8EtgBrM25Hm9aNpHlr4WEUWARwJvEgTVT/E5B+oY 83uBjhaM4oqgXqxMR8zn3p9kd/lFYWVVijDCTeC4+Ra+y26/y6J9SgsyvsqAWS4PjRS/6je/x2F 5GEThSMbSpA8ITPgK/ZMZi4n/A29rk1jc7i7ZFMZLsVvuFCxQMkD6hCIbnGB/sF3UAs0JeC6oMZ n7rMuM+wHaw8McH03+/zINEAfdJoKt2jgfzy7kHn8+fhJN1AjIJeKEriF8K4mxFDyU6YUaw2Dc3 DCyGzbkLTEM/osBuvn2/Z1IllbDoOckOUs1j4i4FFeicNG9NgauBVFS7udg3XDOd/67nab X-Google-Smtp-Source: AGHT+IHepv29FfYPtTdxgOoNZgUW8YipGs8v8IsYeK+WMtrN5j7d3Ey2ZO1H0B0PLPCt/i6MFpqqEg== X-Received: by 2002:a05:6214:e44:b0:782:1086:f659 with SMTP id 6a1803df08f44-7fc39463963mr48276926d6.26.1758808479997; Thu, 25 Sep 2025 06:54:39 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:39 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:52 -0400 Subject: [PATCH v2 04/19] 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: <20250925-core-cstr-cstrings-v2-4-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=1787; i=tamird@gmail.com; h=from:subject:message-id; bh=bBVznekpj7qdZ0+04IhJTyz4wbdj27t8Hhu1jfona5I=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QIaSBovkrkMRrRLSQD5J+u5uy+nbEnxtyP0CB8hGaKgQan89NKIGBwidRQmE8SW0OYKsdw9ArOG kkgFhmd1d2QA= 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 Reviewed-by: Benno Lossin Acked-by: Stephen Boyd Acked-by: Viresh Kumar Signed-off-by: Tamir Duberstein --- 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 1e6c8c42fb3a..09469277e95b 100644 --- a/rust/kernel/clk.rs +++ b/rust/kernel/clk.rs @@ -104,13 +104,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.51.0 From nobody Thu Oct 2 00:46:12 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 E2D2929BDA6 for ; Thu, 25 Sep 2025 13:54:48 +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=1758808490; cv=none; b=n8jAgH29dkIWcdPedF520z3uxq93hZnqHP5iLmCspnFc/zfJyQ+IucDN2Ivmze/JfHQXHk1mrT6Wov7lpExv8nIpZNFiRHAlnzZMWXLNodY86PNLehmXD99uXGmhKN5NiOVwuOQwEYLoyp23dJagU5CIVXwPHDorCszPyh4H4B8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808490; c=relaxed/simple; bh=JsC9L09JB7c5Qto+RbQqrQ01xP/c2mn8RT/NxDHSNBk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cCNlrkceOcGEaBXj4pCl/CByGKbDGA1PrBSSohL7aOY6oWpOcQRZ8vyuJUW/eXBJWsVuUC3rGXcG38b+7ESeSGH5gl3GvektB98Zr301Bc5hegkYfZ2PEcFNEqgOM+ssDhth0T7lH6W9iAQ1ZiKzxkTfoLVJ6bA0ot0wvocepIM= 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=H1gv5qj8; 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="H1gv5qj8" Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-79599d65f75so7318856d6.2 for ; Thu, 25 Sep 2025 06:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808488; x=1759413288; 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=BVNYKpGpulAPMt7+7S4cKU51h0g+oImaV0zrihGhT7E=; b=H1gv5qj8GfIQ9NRTPG29jnfP5KbJmrzGm60wuBegQlxfzi4jxkdpfIylfdPN4xZk3c q2QUApB4uLNi93Kc/1NIhhyFmnA1rPCsUs5s2XW2e/JrEsLPA/pxZAybOsQYypiNyJeZ F8E9r7EDbtojWKa2jPZRZriZjW06M/jx9c2eSyWMVQyNRvbS2OQdR1jjMRqF2a5aOqZO QS8CHo2QP6ms+mSoi/5P0ntPuvt88siRyvIedXZ/900jgvPk/aMHzzqGqC+Cpd/7m7Zu Pzva6Sy1sPibjooacQDQ/Sn+UIF8g3VST6P5tLbOeD9V7u87lsIOCbavrZPRrtxhJODn qeiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808488; x=1759413288; 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=BVNYKpGpulAPMt7+7S4cKU51h0g+oImaV0zrihGhT7E=; b=qiR5gNHrcCWuVV9BogiBvlAHk7vXt5uJ84WK3M50Udhq2SZkKMfxXEjg7dVGozwqvm JUiA6s+ueDxyLKs2/qaUXBlE8OTGOw+SatMLffmZ+igFaMJRW5O8OCjPOqBZDASJW1WE ORFgprtX7lc48nWQdjxUg1Ar6ZZhKRod6ELYb0QvCvG/kjJEbKkV33UJdrc+uS8fNaVc J/NGBfBgm7I/oDV/cPWfkbOFNi7fAHO22QGohV/KyjoBZLTNYaTcuTPmB5E9lN3/lGVY lMvSFhW+wPNXemLKrprjyQL6rQF7/irAXm+ALiqaWypVpjUTjueaqfMF8HsnWrAHYo9J RssQ== X-Forwarded-Encrypted: i=1; AJvYcCXXFY0w1Ae392lArMxfJkNwJu19Hdx+Axs3gRmHGxy/2OOLJhxEylMLfiV0Hz8ZyPV+DknDeR9ouBu7BHY=@vger.kernel.org X-Gm-Message-State: AOJu0YwBbOZXt+xtC0ksP7zWYECfkBSe+UN5lEeryV1hOiKYkeV0svQD qlH3e9TVeq3kTDY9paJQJyJs+7/6Q8dXfb5HaK9wq7hNO1rN655oiMtU X-Gm-Gg: ASbGnctO8B1nuqedvdG6clfNyerTe+I3rkCAq88VrCsCqn2kGjsi3ANl12AwOGI9qnU lKqpX/nxgCTjzgghy12UpQT0jVt5OqOWLX/6YgAWWLw6rGspBK+tsWcGlwZhBzWPts0hGP15iWs oGHhJEbJVPhwZStlH2tqD8VTPDB2cQTL+kxZGeCZzRCI3vsvpImirpDtgqmWiZXwsSUkuxVtuFQ rr7DOxDBc531nisBszJV6HSCiJsVDI/z2K/bUGu++Rb0Fj4B0mq/48aJfaDu0RX6dby/ny8eS4W GKqhHmUpu1MWsKrVM/iHE9w8xw3Ek9tVcpjukfnYTEJSn8A6OQq30mNQw1OY0DK5aAU0GJmkBZj bAHBjYQ9lmPWWSy4KvpeOLg9JhEv/2c9japFzTBsNmVP6ZuU3Mf2h6SVTCG6Ar+FI+3AVjR2EKC k31ckdgNDohIwVdwH9o0x2rMX156JwCeUv8uVbxREKfCKw7C3Oak19R7zPNhRPMtTsQ+01 X-Google-Smtp-Source: AGHT+IGcSCDHxLWEAv2+tvuTndpWh14kIE0XwxqS1qORz7M/FkaXk4hS2hKSF3fui4XqH/sHYATWuw== X-Received: by 2002:a05:6214:c87:b0:77e:443f:dfab with SMTP id 6a1803df08f44-7fc3bf7dbbfmr47922816d6.32.1758808487268; Thu, 25 Sep 2025 06:54:47 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:46 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:53 -0400 Subject: [PATCH v2 05/19] 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: <20250925-core-cstr-cstrings-v2-5-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=3197; i=tamird@gmail.com; h=from:subject:message-id; bh=JsC9L09JB7c5Qto+RbQqrQ01xP/c2mn8RT/NxDHSNBk=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QCiWFaUQLEh7L6qOIxKWop5VB/xMpVQ3YvBt09OraNycfeOEzMuEQ7DscsvKM0CSzPbqArJQKNv 7EXOamgAaLgc= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein Acked-by: Andreas Hindborg --- rust/kernel/configfs.rs | 9 +++++---- samples/rust/rust_configfs.rs | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rust/kernel/configfs.rs b/rust/kernel/configfs.rs index 9fb5ef825e41..69bb1fb53543 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)), //! }) //! } @@ -1000,7 +999,9 @@ macro_rules! configfs_attrs { static [< $data:upper _ $name:upper _ATTR >]: $crate::configfs::Attribute<$attr, $data, $data> = =3D unsafe { - $crate::configfs::Attribute::new(c_str!(::= core::stringify!($name))) + $crate::configfs::Attribute::new( + $crate::c_str!(::core::stringify!($nam= e)), + ) }; )* =20 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.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FCCD2BDC27 for ; Thu, 25 Sep 2025 13:54:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808496; cv=none; b=DJBYEQQqy5EHClcXi7J+iGjbANIypKdeRFnI30L67FH3irSB5fNgM0LJz+yNPzPwwUSTVNVcxNHfGXMY/BoalLWkG6Mndy1RAoXssbiAhD0bnDMZbs0y2sqQM5pedJnlfHth4rLpdkSG+3jxGBbBwZgnhLF6GV6YA2GUedLDnAI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808496; c=relaxed/simple; bh=Min9lnjKt/hlKTHKx8DHe+UjEz1oTNKYHDrlD//vrww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FpGwxPy2/LEXerHKM3fp9gFOuZ843iGNUA0WAHBFFdXA6vgE0V+iuQ2uOrOBo0r/k/20VbrfyPeqiVaQZmkxUrp4xzXy8FzvTixkCCEniq4dVoTSfWE2wYDIYdRohXRJgxqaDbn/IQxRrNEBf51/qULaoSPKVv/P/4CQtkisrno= 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=S1LvN2ul; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S1LvN2ul" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-858183680b4so125070585a.2 for ; Thu, 25 Sep 2025 06:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808493; x=1759413293; 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=NcH0HLOTSj/FtySm//oEeXI3qjx7RwnfgKjEtc013kc=; b=S1LvN2ulyuYlC3JWx5P5dkUrvUIOGi9gQL/n8rTKAAcrRyMSLnFoSen2I6NFWmm6A9 EXjjsdoM17SO5e44MMD6uU2ZYn6rWgpyGarbUeLpB9nl9ihi1fKt6C9HqDyCeUnPVdi1 Y+1LLN8O5/jnpyRfOUwNwTPFjHajLABxQU8p/K+rnLLwOs5fmFdUHWCM1YjSo24Hx9OR EVIOBfOGs2rr461N46M/3Xa95WPkUE4ujXu7cNkGFT9v1f9XzVn2+UFIQ9Hood1imnrP r2YxhgCSqNkb9y5sW2wM6xRjIdBzGTw4cNUkw3eMXG9BPax2jsl0LsEqWpeWn235zc6G WpGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808493; x=1759413293; 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=NcH0HLOTSj/FtySm//oEeXI3qjx7RwnfgKjEtc013kc=; b=r3JV25ksbQhwSYQqGx8iPfacdA4Li/6SpN1HEJdIheOQCvnGozK1pew9WXnSZ9nY00 /Y/xk3tGZ2by5MVR2lifSNar4hUPZogEPWmskChRjtx8Qbvb+x+nC/BlwRd+6HBuIuIj xCH0HfyaYWht+gmcB+RL2KFEr9TrNB/eQs8t760uK4sOsHKrFl1aaSzbeXLjbLMSsNg/ hihehdXBgtLznP7RFfjY7XaWS8EgN4lLvzxhwhv/ShUP02FdzjkUyFOmgZn83DVjbkJB XiwnLDtjcqNkJEiNpZqwupgEVwQww7EeIxzHplU/XWpWdchKDWPOhSmDHj63/Zc9wkGe P4Yw== X-Forwarded-Encrypted: i=1; AJvYcCXg4bVo53ir/tKyCd10ldhVXT1VdScdAZoI2t7NONEKkdZt+WoDOaHBlHur1z03WuhVppjblHe68cMIw1k=@vger.kernel.org X-Gm-Message-State: AOJu0YwqDiS7qzLFPZXRYDa4CPb7APcgazeKy5ctSc3PypotDr53Rorp Is4et4Dp1qXwHmRDRIrsXyPuMNiRDkZ/1GsuMJmp3XF7semGzdHxo5Mj X-Gm-Gg: ASbGncthpxl3iOh9T8IsInGaERhUqbnPa+eZjZLzjoaC24AJ+C6Qb3QICTM0tFiXP1U K2JMN3+uLq5QEnslDYmxQccyczRKwsfMmKe0033ZIqL5VhNcNRlquCS7Ow1pGOR+cIuQbSSwkfd vRHRAGlo0tLTWAhjCzyyNnV7206xTrjdBSMnmQONuVMNXNxrn8OU2XWzbJ+bbNO9pMvEVQBDfG6 2nVPGXPCQ5914gy+jVK5WdLX9cknFRC26GnTGupfG6GBZ4qTO4lIMi6Nuh7AELMduVtfJYd12pT JHQLdA5XEPbBjyWxZX9bBResVAhPzfLaJaCNMtAbvi+GirUIivktro5Nckn/SHNnOGy+Eak43dj X9Jxo6/rqbRMhPhLUZtZFcKiopcqmEko5FoXu0NDWWmZ7E2a19/T3m/riVCgqiFxUTf4PqPnoBX lK86wZ2VW753NJ+WnOR2Ru0vfAkEjRvraR3JGR+7zVemYgn8DwbVmQ+S8eDIScDqf53BRg X-Google-Smtp-Source: AGHT+IFFa6JfDTmizjqmxfQvOyAEd2lLRtwY0ex2OgZ0+m8iJA/xUn2p1/EJZbMyBxylc7ieBx66XA== X-Received: by 2002:a05:6214:20e5:b0:786:50ca:73dd with SMTP id 6a1803df08f44-7fc40d25d17mr51916906d6.46.1758808492358; Thu, 25 Sep 2025 06:54:52 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:51 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:54 -0400 Subject: [PATCH v2 06/19] 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: <20250925-core-cstr-cstrings-v2-6-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=2379; i=tamird@gmail.com; h=from:subject:message-id; bh=Min9lnjKt/hlKTHKx8DHe+UjEz1oTNKYHDrlD//vrww=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QO2LsZad4F+RVkixHdOcMhyCY96m5gE5v9iNO38GMhdV/J/W7PblbDJmxH/UCygnEMUNp04FBPV HU86loJ89jQs= 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 Reviewed-by: Benno Lossin Acked-by: Viresh Kumar Signed-off-by: Tamir Duberstein --- 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 7e1fbf9a091f..1120a8f5edd7 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, @@ -56,7 +55,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 @@ -201,7 +200,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 86c02e81729e..43ecdc56cb59 100644 --- a/rust/kernel/cpufreq.rs +++ b/rust/kernel/cpufreq.rs @@ -840,7 +840,6 @@ fn register_em(_policy: &mut Policy) { /// ``` /// use kernel::{ /// cpufreq, -/// c_str, /// device::{Core, Device}, /// macros::vtable, /// of, platform, @@ -853,7 +852,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.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 8AA8A2C08BF for ; Thu, 25 Sep 2025 13:55:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808503; cv=none; b=JsfhrEhb8J5ExkZCu4+Get7wKQs4q/GXGIs57aVVjFGRNxHDhL4cQw/WUmaWOq78kgHD57qdo2otVAF8nTU93frtqknW6u5Jtdzyq7/xXVi38vbsWYHekjIu2+NNvMe8T3JaziWAipq6KNlxCfT6vv1nl7N4pJn/iUGs37l77jU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808503; c=relaxed/simple; bh=tEhBaBJnhQFO++GmUh6w8m63Mr6JSvoXu3wOHmq14e0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ev08lAAQ+dYyyTiaosHzNJlYgtUB+iWZ3DbKFwnFHPjcxgWfjkmth2P6w89kGA/Wmbk2qR15JllvpSCygXttjBS0KYyNsD/iZsxSRhsqtzPEs/pLPQJXtsgrKzTne7hoYNE1IYQrUrhbxXbPH61KAnlMoB2iHTh2bAT0jpyfEJY= 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=X+cODE8g; arc=none smtp.client-ip=209.85.219.45 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="X+cODE8g" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-791875a9071so8417556d6.1 for ; Thu, 25 Sep 2025 06:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808499; x=1759413299; 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=XVSYVBz+/C/3yUXq0+Xlzki5tMQiQIQTN1ASo1OgvYI=; b=X+cODE8gpcyrA5FeL130iIoEK2/eyLm4jvpb2LplgGzizzyT5BcZY7Q/Mpmz1VoVAO SJDNVPXmqsZMqD+NQb6+JkQUviwFh1qkH7cIOFoc/xah7Yo19jSz0GZP9qoOZsyu1Uiw 8I3n2Fdtzr+mEzFrqoXozNdzbpq0vZbBU8/dt3PWHB32wXAIVjoyNwZHTbWwu/btTQ6d GCWZSbQZUYgU0yFAydilmIm+tQaeSkBeoHNKiDCoNsFFKu/o0odqaC3VHhrMoapxRWAX H/90suxrOSxo151ZsRHOCms0ShPgsFRpVkfnIdH8MaE18pah7e+z3YhErUKAHvL0tQwe lT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808499; x=1759413299; 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=XVSYVBz+/C/3yUXq0+Xlzki5tMQiQIQTN1ASo1OgvYI=; b=J8s4r9kgKn4E3h33lrViWREQbq+VUxqq8n8WE8Al/MATDCkyD4cZ2a0+nRplyv5NCL WJW789gqohY7MZk+wtLdCV6wNasTGTHwTAaUHSY8CvN7a0OcXzusLWVEkscM6hLipsQz VOYkFmaEWwz465GzXnrQSNoA1dbeYKo2SoymH67fBSdI8g74ZlUnc3O5Np88FkeEoC0l utuBpuWsMXMHQzU+t64/HW1mWE4ufwTkULddk1yLuGlZdWtp/v7qwJ6gueKIlaV07bti K2PnAQRwCD3xlCnz0L7e2oH1NcXfcv7r1y6Q+UZCD9uku2SkSTlpVUG60iia5dgULeZ2 sv3Q== X-Forwarded-Encrypted: i=1; AJvYcCUHVEerZAZK0xWLOoG22tOy9XwDJ+N3z3YDfZIZWnn/OUeMdIloI9SruSIPmtGKurMnEGj+251U2gAQW7U=@vger.kernel.org X-Gm-Message-State: AOJu0YwB03Y9JlqqDDemoor/a8uylOxhqwF59YfUDvF3mXtiWlq70+0i Bl27aJrF0shnh71htdO9CTPES7FY+CtB3ThxpTvCU1e+clI1RwJeviKZ X-Gm-Gg: ASbGncuTvn2ZAlDENuqTrTnnsGCOAROrhnrxTveufWgt0PQRrV/wOl+bJYNesGiVuPf VOiIEkl3LtLpQjekT2r4mKHonm+bKxZUR6j8QExuF+du8QK/n24M3Cnai5OR1NRV2GpyloYGod2 sFGSRIkI5GPkCDXy5K/MGsho/7iI9Fr5VzA5657qBYrIrRsq6mnBU/cHdCDJZSyl4Xy3UR27Qrg XIu1LODt1Cbeo/AKTsM6bV20BqbydKMKxLVtwO5s5k2/9ExADdOmtNc7xR3/cI4SJj858r/ji97 bt4IKSbhk8T8XGcr1iK5VgGacFkZLV/jCo4fBy9qNoV9itLzdwSzGA/YVMXhQXWx8eIiDUcYEF4 +oNsxlkU4BzXfduNFlfeunmo8hc0wX8ewtPPXKG7Z5mEF1W8GynDd656lTWm4VbbiO3E7nbxAfJ E+VT/Kb5T4S8gFizICWhOgdQqnvd3hLhNsXLxplT5hxRO3LtYKXzHsA07Ts9bicrFfM4LH X-Google-Smtp-Source: AGHT+IEssEmLNZcem/aKdLWetF1Fs16YPcmtFsn6hozzBuZs4Wn/CLmfl+Df8wHKJRPpg5SfyGzrZA== X-Received: by 2002:ad4:5deb:0:b0:78e:c5c7:1209 with SMTP id 6a1803df08f44-7fc3e015bc2mr57974806d6.56.1758808499295; Thu, 25 Sep 2025 06:54:59 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:54:58 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:55 -0400 Subject: [PATCH v2 07/19] 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: <20250925-core-cstr-cstrings-v2-7-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=2297; i=tamird@gmail.com; h=from:subject:message-id; bh=tEhBaBJnhQFO++GmUh6w8m63Mr6JSvoXu3wOHmq14e0=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFEkzUjb+lD/w38vqtw9O/htNaxJTX/sabnw4QloRojDdlHFE7uz1iz3IfwN44ls/ZjS7SJYOQu /SzXo2WM/nAo= 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 Reviewed-by: Benno Lossin Acked-by: Danilo Krummrich Signed-off-by: Tamir Duberstein --- rust/kernel/device.rs | 4 +--- rust/kernel/device/property.rs | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index f3718da11871..242286162c8b 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -10,8 +10,6 @@ }; use core::{marker::PhantomData, ptr}; =20 -#[cfg(CONFIG_PRINTK)] -use crate::c_str; use crate::str::CStrExt as _; =20 pub mod property; @@ -378,7 +376,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::(), ) }; diff --git a/rust/kernel/device/property.rs b/rust/kernel/device/property.rs index 3a332a8c53a9..3eb3f36d66d0 100644 --- a/rust/kernel/device/property.rs +++ b/rust/kernel/device/property.rs @@ -178,11 +178,11 @@ pub fn property_count_elem(&self, nam= e: &CStr) -> Result /// # Examples /// /// ``` - /// # use kernel::{c_str, device::{Device, property::FwNode}, str::CSt= ring}; + /// # use kernel::{device::{Device, property::FwNode}, str::CString}; /// fn examples(dev: &Device) -> Result { /// let fwnode =3D dev.fwnode().ok_or(ENOENT)?; - /// let b: u32 =3D fwnode.property_read(c_str!("some-number")).req= uired_by(dev)?; - /// if let Some(s) =3D fwnode.property_read::(c_str!("som= e-str")).optional() { + /// let b: u32 =3D fwnode.property_read(c"some-number").required_b= y(dev)?; + /// if let Some(s) =3D fwnode.property_read::(c"some-str"= ).optional() { /// // ... /// } /// Ok(()) --=20 2.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (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 1EF082C158A for ; Thu, 25 Sep 2025 13:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808509; cv=none; b=qGQDeG++e0eGogu7xP1/uAhgnP1i3oIW5KkmMzllVYR/G53zZUm/YU9put9/ITppcdS0f6M593PtOaY6ta9Z3pwNjTsI2d7MQotHCigiSmxuYqgkuYCybrHmJ47DxW8ugAzFtGNmo8HBez3FvmqwBLfOT6vbSm8q88BZ1BnguDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808509; c=relaxed/simple; bh=bPZeninN2/V/7zw/PYEF64yfGflgZsOfq0JcAWxkVI0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FaOKWV9xK8MxprerRGZmmbkREPYVX1UKzBHQlp3loE2iXVQTg7FDqyrzayWSi9AhJqiUbs/d9fvlOx13z6lJuvYlicxicNf8CVf7ywX4MSb4NoOe+gvwd2RDb4f3uJIrVIcS3c+wDMRYF7uYpHcGXeQ27VDDenrhCnkDvTq+iGU= 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=jxkifYJo; arc=none smtp.client-ip=209.85.222.170 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="jxkifYJo" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-84d8e2587d6so68342385a.1 for ; Thu, 25 Sep 2025 06:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808506; x=1759413306; 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=YqTcvT5yONUFeYmOIO5vRSTnodd8gLQVUhuVrtBW+JA=; b=jxkifYJo+Hqlth5IMZ0ckwB+jZMkZSY7/ck3+l/fKdQym9jDfHP4sSFZKL3pvqeRVy awcwEqkjMfFXU73o/Z4iiE24UnZLQWUIkspE+yT8bPfOvHAT4moOiRhPbvEC/AB4nv3+ EkhWXjtyngWTJ8QdHxqg4fDZzCFPidm3Aum92Jd9Vl9dByKlV6FevWiCifjohsT6U81i c8v/gkBBw7YKw8IWCXxoYydPQNCQQd3kNwhRUGjjctRRCCAnL8UOkk+xpAn7yGE2Z6XN /yBnCbL7jM488cln8R6ffaHIvIU+50M2t+2diyUEf2h4HgfnryJKe2cSWwitVa5HYY8M AF1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808506; x=1759413306; 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=YqTcvT5yONUFeYmOIO5vRSTnodd8gLQVUhuVrtBW+JA=; b=DQzLL1n4d9503V5AJsrTz388MHkrhwW8c2X32zYrvncThjnAeuGpNJVwD3NSFsjRih ilYrmZDJLzU29HKJFRhNH4lz5CNszuGxEjJ1eomcIa29KNv4SH4Z7Pr/dNxDLD+zwmpq dwDPBAA9tR9MqgpRL3P1Dw7e/furXjhqcDbJbMaUdPR+IPv+GC4YXGwPXW62W+Fuu1LP JsDwxYhpgKWOiTSCkyrepDwgk0gs2cDLy27vHeThHJ9n837ljiSDyL7u2YCcD7Pnb/PI FccMa06Np9FwI4MZz+w3C/6YSN404kmr+eoLXFVT7/Mzdk54jD4kiWNSiImZTCdHQVhy d0Vg== X-Forwarded-Encrypted: i=1; AJvYcCUm77zII8FWax/BJ/5xONZLF867ZDPYqe8ybdIAYYKy1C5P1XdyjDZKoJ8rtRpX0iU1UYfuC9Vut/kgCc4=@vger.kernel.org X-Gm-Message-State: AOJu0YziFoTGnH6rKGpOq3FY7WPFaAUc8MIGrlHPoZWvzR9Ge2isrO1V 0+V+pYfv/qoDde6tF5KFbZlrPJfoNZaRC3UbG1+s87n7BQDWleI0LhA+ X-Gm-Gg: ASbGncvHq2nx9CAqxvkP4AA4q54uKWZqAQcMogU50+Xy8oKH6f51vGTtD9jWRGGUDvW afxJYitrHBOJz83js6xZFv32VAAd+8HmsrIM1ZCgTIDMvc1ZGGmIMMwLPQ4avdC/IJvsmm2Rkws HTOrBQKKUlVgClkI2mV+mmDkLZ9RKxgn/7vmuIPHZS318UF8cW/9mUMsPVzm84VHRRh+syy8L7b JRV3SVF38RJnuG2SIWnnneNBD7wzl3gF3RPM5A+XmSTRJbDxhOLc6ztmIPADTdjoAgxeTl7kS31 RS4eS/FSIbX1pKetknW8JVl0n8VIS2+GkuWf0l8npm3/NFzIJ0WaSGzpVMYZZAjkDx8MeCs6Quo EVGR4cR0XIEHf0UL10i91BZRiny0bQ/cWX0Hi3efmD/BDIYGkSNN67I13+sBhukKO54KMo5bbeI sJ1E0wclBLczr/KVQUKOSoAfT/TVxYIfc4EHPWyhkETBO3hIg7O62qoUdMugJogNp6qjqH X-Google-Smtp-Source: AGHT+IG6EzTyEA3INGOgld+kkM2E6bSTO6bhB+H8gEAN47wRnZax/H9RzJp1nvFdm1VelrmNbN2bBg== X-Received: by 2002:a05:6214:765:b0:809:5095:4144 with SMTP id 6a1803df08f44-80950954186mr19841926d6.67.1758808505713; Thu, 25 Sep 2025 06:55:05 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:05 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:56 -0400 Subject: [PATCH v2 08/19] 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: <20250925-core-cstr-cstrings-v2-8-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=1629; i=tamird@gmail.com; h=from:subject:message-id; bh=bPZeninN2/V/7zw/PYEF64yfGflgZsOfq0JcAWxkVI0=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QD4rak/xDK1Yk5v1duIKSYGyXctY6/oZ8jehaiqaTOxIbpGhy5zl8Kext0tE9Jsy8CWrpsliDV5 3U5gCpsnnhAA= 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 Reviewed-by: Benno Lossin Acked-by: Danilo Krummrich Signed-off-by: Tamir Duberstein --- 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 376e7e77453f..71168d8004e2 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.51.0 From nobody Thu Oct 2 00:46:12 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 2EFB32C3258 for ; Thu, 25 Sep 2025 13:55:13 +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=1758808515; cv=none; b=ORYva5nmv/itpCv2iujAaA4gCpjHen1siKNP5fjv8kFFJBwcrPwtPskGaq3nQSBaT3uxBmQHAzYPURP0RNQUSv8wpiRHR1paua2Bed6CK2ozD8A1FHZSPmDtb5fIJoPcMOachM6clvZWUCzfpAyLlutJCzDwZItyK0d1+Fp82CE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808515; c=relaxed/simple; bh=300cxburWPWmY9lTssmajDxSN3zcFF24g06h9nRYs20=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nxGGNmkLZ8HJ+/XMb0mr3ToaStalUZZ8AHm7c+fODoRFwKAuSMEqnS4Cs7HmBwpuA1yurybYMRSiTkEIlu0fZ6E1I+nYGhkaFSnzFi2ZtG1lSQXy7GPdlIRD7C2fFxH/C2oVvcBuz2jMM1ZM3u3hucZmMDRVfhazVJjrHY/DqdQ= 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=R7kK8Qey; 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="R7kK8Qey" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-71b9d805f2fso7561696d6.0 for ; Thu, 25 Sep 2025 06:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808512; x=1759413312; 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=U63Q3tKt4yvUc7kEZBTozLak/g9U24aoTdz7wTOUUn8=; b=R7kK8QeyCq/GNryJEpW9r0RObftk9S8KCWumPWpZzothsIpNBzRnlxRREuiLSEtTZ3 VRXoU4kg4U+3bbGwKFRdVJPZFtc9A0p1ymsvEfxiZpS2g9XOZfkrueX1uxlQ2Q8PFfbp AI747GJFqPXqPR+mCUfls+h4UUamRmaYEKjQCbkWuWCkUy+09QyJFpR6DHlMk/BvpdmL gt/8Vt/lsMvnNnZtbHQNeQKY4VOyTNYhTj6tCXhvZUOgNAZS4UF3nHlfyBQKUYw/BwSs rscYRNJRz/JO7pNegR+VMKoUBc+JIhcTOuQjV+q/xHksVXkVd+IHTEfZ963U0rkyshRp U3+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808512; x=1759413312; 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=U63Q3tKt4yvUc7kEZBTozLak/g9U24aoTdz7wTOUUn8=; b=kQZoWNnwDv/cYNcMNWgWfnvitBhSvbRCssG/Abx8T9unr2ECXRIIHVN5DCN375cVx0 xv2XEC+CQAh6oLkcs+v3iO2hTrYYGlMDFpGOrpJXa3qpVxq3AnPlnRXadicYLxXvq+sL xkVmGbAv2EYVvSB3gIZNR42wkLVqfatBXLwAS5n586ZBzZb8uC8jy2nmB9zsNl9FI+x6 0tEp0Lz6Xj0/5uvwioMNizUwBt0PNPHqctroX/P/c6T5rpfeFsqg7W8N1SFb5c60Vvjo 3OTHhkztyw37QuG3qJBQeeV3+hAQoL0D2OBzBFGbAc6mbk9whUmFC+g0vcmbty6Z69SR os2A== X-Forwarded-Encrypted: i=1; AJvYcCUwjhnYnwbXQLnVjZs9oKhtXOYuWXSgJB5ZfrwdMkaNMYdvsMyrOKYbZXZaSnOM8q8LyXbmAWHcrQ2g4oA=@vger.kernel.org X-Gm-Message-State: AOJu0YyW5p3tGSgl3oQCI5JOxFCWqv9AzUuLDLLBqKfma4KkEFK8hrjE CBBrZooGdf2B/u94Dox3kHzPYqo7Z7RBsztNoCPQIYar4n9SUqNyWcJq X-Gm-Gg: ASbGncs8Fgj5yepueVcmwdyP325wU58r0+2en3XJQCPeqKynPYapnic96vEbUPRbDLT QINMrI/ZavMYMQVKehdbhChVAbXzLRc2/+FZH77pbQD9W97U26csco+6ODy1rj5Yp/1e8x1RK6V ecp6mcNdgqqbCJEc3hEINOT0JrN5rPGP9KVHDRyC9aAD583o/l29orw+r+7a5uzWwVPnhTVCOrJ kWBAOsWkiXkEb/cjZATvl+HEYTH9YRBFJpqh5wSKSZPw4fjtAWefYt1lhBC4PmHGK4Z+Gw71zK4 ugHC0dgaeK2LZFdRgp+Sp0T97eNBGr+GT1x2MAS+xB/Oi8s7cMdG0vdIy1EdvEvjKF58uEpeepJ xgMc+Qo/WYb12GEEEVGPGtE0Sc+3sTZdKe4/M6XWZMEfYLZIlMBSlmRjlYu7kTW4YlTf8VDvNjD cUHed06GSoGHL+g6v68ZwMsbkMa2eCcuAJhtLyrwFhMMV/P86T3wa6UETYOydrqBxu84W7 X-Google-Smtp-Source: AGHT+IFWMR0iD5S1X6cXwZlRMEtzfoP6D2Qm79oKix9BQEH2yFaei3OpgngEmHA9hP1GVazSKMs5EQ== X-Received: by 2002:ad4:5ba8:0:b0:7ef:f440:2b40 with SMTP id 6a1803df08f44-7fc400b2becmr55283556d6.53.1758808511621; Thu, 25 Sep 2025 06:55:11 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:10 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:57 -0400 Subject: [PATCH v2 09/19] 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: <20250925-core-cstr-cstrings-v2-9-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=5270; i=tamird@gmail.com; h=from:subject:message-id; bh=300cxburWPWmY9lTssmajDxSN3zcFF24g06h9nRYs20=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QF54YtyD7aRAwHefr9LP1bPC0QTAqFHSUYTCpwBSPQUvl7eHVoDyM2m+1w0mdq8s608UqPwa3aB hTCM+d3+ziQ4= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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 3a43886cc14e..6223a5ac801c 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 c8f9dc2ab976..b0b70a3d0f54 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -174,7 +174,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 ); }}}} }} @@ -184,7 +184,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.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 BDD882868BA for ; Thu, 25 Sep 2025 13:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808520; cv=none; b=ajEhyoO2pQ8I8pmzCm2rNRRyNqO1EB7XxCRbFeRKY5Jr9wv0qu4j0SWOw7QNI9irskJkPScZqDsljD2bImJ/n+O4E8NjD90biHGb1IBDk9/nvsDcZCCbD8ECxmfe5J1XNLwBXy5KXSUaIjwkMAp/j0gG2U7WJ9Nq630VbtAvBPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808520; c=relaxed/simple; bh=zng85sA8+SsVec6zNo4TiEoP/H6f+tIcV689AAppDzE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KtYIref3aZUPJQK74Yhi9G6RAGouzzrl/GEbf8HQprztWoZTxjP8oH9qCqH14DNXuM20wjDKQ1+jz3Spd2rffew4geGTXhre5HweSVPGjeCQVnbTAcDAqmuzJZdtwEbDrrtNXDubH6kp372r9qIIqNJvduzFFqAIZQVgUORtU8I= 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=EcYXPhQt; arc=none smtp.client-ip=209.85.219.54 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="EcYXPhQt" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-80ff41475cdso3227256d6.2 for ; Thu, 25 Sep 2025 06:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808517; x=1759413317; 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=NYha/ksIy3nvgxYlzdJIQEddJjIGfcGOB5STOc36XYg=; b=EcYXPhQtkXXRN7OTov2ez9YRzmFF4pdKpT+1C30EZOesc7+986YR52Y2wti6MkR3c7 E8wqFyf8rFflFZMsomMVUqAqz1qa0lDKweu8x2Hwoi6G/KLwNmWUHtKHWknP0LAKERIB qMqkB3kyT1A+QER7Kwr+6/CqyEx6z9jkqLgfoFYHFadzVK7y7OSjSIg98jsY8qrT0iKu Jq8vHlWdf7tS/YJ8nkzFo6oKXWOe71Th1wxLuNx9NUXVG9DVNzfkDe4ESx9qcFPB97zB lGGXENCy1LWY6NV0oA4kkcAspPFsx5oGFhffY8U2rg5Sdkp6fhIg7Es67gPHi0HRhYVb TcXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808517; x=1759413317; 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=NYha/ksIy3nvgxYlzdJIQEddJjIGfcGOB5STOc36XYg=; b=ULw5OOy0xXsj8hJHvv4uujdR3gF6Uvq/EKW66YusldUuvQ5EoqiJShi49LyYXAUMY8 oPSf44moWbKLrU2jrguG3nSs9YKUiyti5S4CXQ0SuXzZge/IWkIroIxFlqCQK6klXwOH S7G8Gnh1faupN4N1HZ1ZGm1vvIlqzp22HdmVwm6yQNty0LvfBNYK/Ymxqj/rLVUNYSRS w2Xd9Agy0P9OHS5khibDDdaxNNl0Br2N8JHfeAM0h2SG7yMu19AbGDjO429Hgl1TdXsS jBfsb7AW43JuozfzV1Hm3vyxM5EZk8M+cHEg95QgQrrLzQVUZFC0io7pLgyfs/cgufvP nSrA== X-Forwarded-Encrypted: i=1; AJvYcCWs4JUP2xY682S/KMeEmDaaaIeB5MP+34eDrLuzmuKCQoTdskfS+spj6oKa+OZNSSTntJGewtuGq69wfNI=@vger.kernel.org X-Gm-Message-State: AOJu0YyQyBfLckn4g49++yrbWQaRyHUfJPwHvB2oRgnAXqyBWakvJZfI S+rTlcZoDs4O7ZIFZ+oHsc7DkANuZ8hd79Ek589dGjuZWby2CApuh4zj X-Gm-Gg: ASbGncvLPwtisa26zSczJbMVx62kOlbTSJRDoM/BHM0uXJQVZ9VsdjBqdyWRsmXLEPn GoySpUx3ggzq1k0AENS7XFdbKSPm0RYbLKQFrlNm81AJLHjBAijL48oIKxU8vMypE8dtYhnG9Hq hgsHCDpL+hmi+o8h4EbRZ8fDy9BWEpVHMQerkMpdVjCwFEu8gVimAvyyBtp/MF5wtgNh/wSO5ZX VXKhvJ/BWN7R6DLT2Qinw8AHPLwMcB5qgMsvvpVKUVqZppLlnLmwhh7lrwLbN8/zsco+mDdaNDV CSaLPwWFFzTRFlngoFjZjEk7qvPIkbPmaq/tLBTj0lGoh6ApxmFDsGsqCnxxAaW/aOlKcoYx14f BXdbcXWLeyrFNEr0+Uri8m5Ye8FP8T5Af2wyTSBbCgcynCIHgkwMAtj73eD4qWQf16YLYtmjWT8 vdYviCwEitKyabEf9jg5wc2HiYqAODlAKxzYky+dZ61s06QaFzN5n8ZGXrAqaPhCd2c+vp X-Google-Smtp-Source: AGHT+IEZqYEZb8mISdLJuHBwRf4k0Tn3piTiphxdju20VgZskXS1fQZSSYTbb7BgZgibnFeCDmQS/g== X-Received: by 2002:a05:6214:27cd:b0:78a:e10c:1f6a with SMTP id 6a1803df08f44-7fc2864221fmr42029446d6.1.1758808516914; Thu, 25 Sep 2025 06:55:16 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:16 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:58 -0400 Subject: [PATCH v2 10/19] 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: <20250925-core-cstr-cstrings-v2-10-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808437; l=1049; i=tamird@gmail.com; h=from:subject:message-id; bh=zng85sA8+SsVec6zNo4TiEoP/H6f+tIcV689AAppDzE=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QIVNC06tKtgyxIKxAK3EObC8MiCaZE3yn180AX/LsynQ5F4vys0WrFsiwfjmzPM+0UA7iPHoZU6 G25wrGtAh8gk= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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 5ee54a00c0b6..8cef6cc958b5 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.51.0 From nobody Thu Oct 2 00:46:12 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 EB4B12868BA for ; Thu, 25 Sep 2025 13:55:24 +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=1758808526; cv=none; b=ajpBi6VqBf46YTQ8ZTE9mk+bNEmxYeFiaXjteVrYUSa5bnO4wHCKkHgtc1d4biGYL69HEAQ3lPARQIvzokdkjNIuDZ5NnUcz0I2IDkZ+3Ea/ILTbTeKDOOvq5yGhJGXR+G7Xi3CI6GliSUQb3OZ/kXAEj+40P4uCEhklhUMW8BU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808526; c=relaxed/simple; bh=G1wsZhjB9YFMrkpz5gcBxDMgotSl9l62JYKqp+2kvv0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j7aSAVDOOfbQr+q/JbAzIhgDcXnN7VH3BZTwYmG+aGXkEIw+la/QmOxcM/aGWXEcqi8EoksgzMZBay+bURqIO1xG5AnCAYrEL/FIFH0XQR6s3ZTPpyF/UlWjyCJS4oMf0YyUoNJtOO5jRMkac75k4k+oWrjWabD9JQiH87ix1zo= 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=cbV65Ngf; 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="cbV65Ngf" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-78f30dac856so8918736d6.2 for ; Thu, 25 Sep 2025 06:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808524; x=1759413324; 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=9F//OQcCcTSCVUN93IinXT3LeiwclsyrHd76W2OsUHM=; b=cbV65Ngfv2wRlEQycfdgsdZ4HyL0QMsjiUgFkW3x6wmAA4RJNKRWCzbOWivIDV3PsC 7b+sL8NR+96IIeE20jn88m12eoaaT5clg/qTv76iOKiW2TNEx0WjLvHkS7tFU14cNsAQ B0LPn3uFZVOm2LLgF5xsO1es5hzs+DTWEyhe3ufC0x3dlZzGvCFUSbEU8Nf9JEydJMJL mgkgXp7ydD7pec4+bV4VWpSLqAsIYhgFBAMNaTC1and1dW7vfAk7WLilJkUTb3rdF3mC 5EJjUMqF5AdTatgsWuHsKenJjxu89sJW+zn4zQUwjemPdSVpx1Cho6LvB5I7aWyGqDQ0 p1rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808524; x=1759413324; 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=9F//OQcCcTSCVUN93IinXT3LeiwclsyrHd76W2OsUHM=; b=PejfnuZnIzUtp4JHkVuXG7pscJ+6MA3DAshZmjyKmYenRH1Cbeefv2zxXccyqAeyDi PgrarHVjfJiVwJGCPSAX81CZ58fFiLzKUkx/mhuWJTmZgGjzP8MbAQ7I4a+rFh1ugIqp GYeM/vw3uMlXo9QXWvthUSfq2E6Vy/0YoFnSDJC/aNS7XFkdKEnflX8Zw6iTpr0h9GxJ FI6D1HM9y56GqIT76VnEifenryakNkZ2hMtTVMiqJY9jATWoTeX0daC1hOUAvaDI6d69 oMPtmMVk/HTKnvXGT3/MFdhdUinA56VjCTvMSNSOayiu4P3KNU0ViPjSyWUqR77qq5i2 OVuA== X-Forwarded-Encrypted: i=1; AJvYcCXswHBqgnAajJCVOXKkuEbmIk7pMhMz/0TDOBWTP9kh3vPlOVYnOwC7jjjWyxjA4bst1vqPjRdPmHbjBOM=@vger.kernel.org X-Gm-Message-State: AOJu0YzNJ+q8/VtAAjFjWayedyrTcMIzCxs38+RPg/FqZSFNyEML19l7 lRR09vNsgH49OccYvAF6bLnHsu+vAeOByILLY1ub5wtqMkPufva/9FBy X-Gm-Gg: ASbGncvB4mWSN5CGEHRspwL+W4tJLSj8Cex9xrhLoRqMGMFw1+aAgRPXIAIpPRDzD0x PVu7M/pG9YLN98ZdQckzBQGIDIAm4cfUyfzY16jbedT5CHulTixoKgkO7P2DL7bYYrCaZs8kDU6 RIOdCNIbKFdPaEgJc73YMJQxZiqiryWAFck/QrB62fdATJjMgHoqj+J8aU4aIXoZhYqXolOME9U s5c+RGYVTgWD8CgW6ooLsepK9lT9eL89kLdYkfkNStzQ99CfyvyhLTvR6NkulYqVK0VGiiVruZE KR/2mCW7v082mGezx7IKTCfGENm0I2Bq7HNSUcxV6cGcD0Pq2QL2F0SSdp1eRoluTWcvnW0DK/5 NGuevSALrSgK2EzfnoLwseFdBPxHOL/SD4baXBKmTqntMnZ1WKNOLff7BscnG37C7D2FYSuG+xs 77OjDCLVfGK5lOx2uIujZEKT4BFDRJ+G6LW3ovepDuprQlOq2i5PP/YFyUY4EQAlBMf092 X-Google-Smtp-Source: AGHT+IG8Gyrq/9aswoyGrByufUDOEDDpB4vAZLNl1cBk/1ws0VqwO4eeWj7YZE4dhPO66F/wFvg1uw== X-Received: by 2002:a05:6214:1d28:b0:7d6:c615:ecd1 with SMTP id 6a1803df08f44-7fc4ec0e7dcmr46038496d6.61.1758808522761; Thu, 25 Sep 2025 06:55:22 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:22 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:53:59 -0400 Subject: [PATCH v2 11/19] 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: <20250925-core-cstr-cstrings-v2-11-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=1136; i=tamird@gmail.com; h=from:subject:message-id; bh=G1wsZhjB9YFMrkpz5gcBxDMgotSl9l62JYKqp+2kvv0=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QDPHa5h0Ln008NycRhnUYHSwita6ft61YpP6UIaouguWtU37E7gPYJQE7EoOJeFshI2ze3iWBrO I6yLKReNrlA0= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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 e7ab77448f75..60ab10b02574 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.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 14DBB2D6409 for ; Thu, 25 Sep 2025 13:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808534; cv=none; b=iIHxEkBraCMT+JLEZGi95CSlqyKCkfGHYLUzQeKfWmko3ZEgIPWQp9QqAhYK7hThkWTjmlmNQh47xqSbEAGQvISd97PSR72yfoqJMhiUXbLkNJS65RFTAysQ66delURKQHxDrUXTVJUBXzSYW00gH09qfZEQgvQjPfF3GKXwVJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808534; c=relaxed/simple; bh=D/F3RUnYNMNKrZc7ezIrEwfyGQmWHVwyjceS6shQSWA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Xhqr8edJEqu2N4P9MaXFfOH1ONI34/9gL72uKVt+0Om1TfEfSFVvJhALfjBBDAr4LzLiQEhcWFbSWzswvJIOVZPbhwg9CMuOrF0DUeoKwdvfVuWHqYf9rjS+dih59NsvdlU3BZ2WoDk2Y8tlgxSYHcNsxqhplQokNy+8e6T6hyc= 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=gyMXbrVL; arc=none smtp.client-ip=209.85.222.177 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="gyMXbrVL" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-84ab207c37cso75522585a.2 for ; Thu, 25 Sep 2025 06:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808530; x=1759413330; 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=ovaMuoVhmWcLonjnTl4MFtKaHR9pluhUoUKBZs6ASUY=; b=gyMXbrVLp101h/tQHbeWqrn9fQ3voncTf+fRhGlhOrd8SqhLi2ljfdqXUG0/MO0IQe s1m5AzsWY7rreX5eh4Oi8zLFAFNpdwprKWu6quAe+RE9qoH1ouf/hV//HrU2k0J9i+Yg V6G65nlSuRBEfJBQ/5Y3vkd6/lrvWyu5CoTLeL2g/OsQ/CLlQyMnAYVrWFY0L+/W1xOW 0yt+XVJ3rnN2O8YlLnQM2WMnGZhYbP+6LbwPN6zia3AHc4GmjSgNKiYHdotRO0Ecpjd3 /QPkpeN1j64pWep+kZJkHdlrdjg2q/Y77RxCg47nUbl53ihGUJ6QBg1XDQZowveaqrPu ulkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808530; x=1759413330; 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=ovaMuoVhmWcLonjnTl4MFtKaHR9pluhUoUKBZs6ASUY=; b=IZ2JZmsNFX7cLPD1GfGBMcK1M9ldjed5BWcZOdby16bjttFRn1AM1WXFtIqEFVMZNF XpIzD3dweomAzh31bXaPkCyScewjD91eYpH6xLbC4RCrAtyHaoq8a1MOL+bF71E3vn/R ljMS2e7+64vfmoSFFw5I0+WybjeBDq82kpRCKTNao0vEYaUQK95ovIZ+Be7qyGDJUkVS Tct+NpNC5P4jYSG7w6avDuQHHv75Fjk2rgIqaQPwS2nU28u7q4D0M/X5qNTGofmJa8Hm G7r21zKjB+2l9ADUKdwdWab/4rqy8vLkf+aZur1BkPlKzBzwp1DmDd41yXTgUPhKrm4G bBrw== X-Forwarded-Encrypted: i=1; AJvYcCXPJJ+hPJ9PqQmRxALVyzzBJ4/FEra/nC5sEtuLUquzEM5qBTh3ROntF6mKOFcQ8rHrh3lfs0t05eYrasU=@vger.kernel.org X-Gm-Message-State: AOJu0YzPkGuMn4hnL1Jlt1ky/wlmRPcOUH9WmmIpD8QYr/cQT9h27bOf eq340lDjLx1sjfE9vWqTeTf3wiTtuqcdoLQz8r26mjnvVxrhvA50c1C9 X-Gm-Gg: ASbGncv/EEv1l0BQxI0pcGHnJujCEatY5LFytCNhq0dn94IoyN1o8OvhWK1TnT5AInK nX6OU2bQSd6tXy4J51jEPIV72qasfVbHpD/q/hvqaoELHTrw7Q0cXh7TGgMhUuB+J7LA5QXXHN/ 6mesuJw6I/YxUD4+06N9AFLnW+Ihh3d36Ed89JiMtOVOyX+6WBckfg+qdym2nim9TPKFfVdTYyq jzn4w2IOI6fmzT4IfXGpL95DIK+JyEi4poG3ZUNp0374Zh2Tajq+rXcv5jedTONtxBVGSrEPqww 24Zo5DpXgwEts6ZyeW8Yp4edhmna6pGjwTMRFMtSPGjEGS0eTiyepbgWVwglZGvp/dTGeJqlcHD b7eN6LH54RJI4QnWjBjN+vsj86RuotSVtXiqg/1eSFyPOVs7JqIbAdTOmhC0pG0LNHp+zawhUS+ 9lmC14Jho8YIkCnQn2l/vBMvSpr1yRkqyZp8ahyN69698iR0VZLb4bxMe0cwy5SeOuo0UM X-Google-Smtp-Source: AGHT+IHcH/Zjn6brKl+FzN0cM+iQubEhxUKmnAUgz27UdizV+uwHwEDx4WTup8nJvc6pXzFU23iTKQ== X-Received: by 2002:ad4:5dca:0:b0:792:50bd:2fa8 with SMTP id 6a1803df08f44-7fc30ae34e5mr50026206d6.30.1758808529557; Thu, 25 Sep 2025 06:55:29 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:28 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:00 -0400 Subject: [PATCH v2 12/19] 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: <20250925-core-cstr-cstrings-v2-12-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=1712; i=tamird@gmail.com; h=from:subject:message-id; bh=D/F3RUnYNMNKrZc7ezIrEwfyGQmWHVwyjceS6shQSWA=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QLl+bRXWnt5oagOInMjpq0Q6TsOND3CIu30DW9zld+zzKdTSHrUu641mOBVFK+TECUsf9QEq85h /zu5kdzwmPg0= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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 be1027b7961b..9aeb2bd16b58 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -780,7 +780,6 @@ const fn as_int(&self) -> u32 { /// /// ``` /// # mod module_phy_driver_sample { -/// use kernel::c_str; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -799,7 +798,7 @@ const fn as_int(&self) -> u32 { /// /// #[vtable] /// impl phy::Driver for PhySample { -/// const NAME: &'static CStr =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// # } @@ -808,7 +807,6 @@ const fn as_int(&self) -> u32 { /// This expands to the following code: /// /// ```ignore -/// use kernel::c_str; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -828,7 +826,7 @@ const fn as_int(&self) -> u32 { /// /// #[vtable] /// impl phy::Driver for PhySample { -/// const NAME: &'static CStr =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// --=20 2.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (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 6146A2D7817 for ; Thu, 25 Sep 2025 13:55:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808540; cv=none; b=KcCJe117mnrLgbJMTqZbHheNnPmxpdC3zw5LSLmjY2K9bOSLOqtA2K1VBVpGi9aaoUBUGlXbKr9eG7MzGknN2Q6z18W7JM7vePnDJY2ARucQejwHvrADfsOrGLbSUvPKFEuNnXvYG5bL2p6uMF1zTRXRYBiafMmRE4VTmmc1RU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808540; c=relaxed/simple; bh=9ZmEu11QXJ8phGJATObrsBrPngKGUQeOptVynfUL8WM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YJ/3feZ2bqlg+EqLJ291K5pC9ag8yHuuyz/1KxfCsVh4DLLsYQ6BVkTJCpjzalWHUiCQq+VnB+YggCrXnLCFNPk0jgseq9GryK9g070BApf2HGeh0K19sjQWSlPgk+Deanr99cmW9YYTwae8maXXYbr5/CpsjuRnijJtQa2KwUA= 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=OfosiNOI; arc=none smtp.client-ip=209.85.219.48 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="OfosiNOI" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-78ed682e9d3so7151436d6.0 for ; Thu, 25 Sep 2025 06:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808537; x=1759413337; 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=mswzqg1rIlmw6HicVVCtXv0e5vufLTaFX3VKtK98wJ4=; b=OfosiNOI6HdmuS6bpjzcl5fODl9n35fCh7xdTjfT2ExCu+lpF1+YgVYf8Emnwzm+oe +aVYsc2liL0RJevBRu8j8atyTHlxwgscCJvnetkP8tqejNrdr2gVgiWVukDe28fZ/qX9 ymyEZ9QZmXmEah5zJTTcF7n7DpNK3v59CsrU635x0fafsNef7B4/zMdU/wsnzaaNEsPP C7P49OuJpFFwOyuU/T6lY/eVYwY9TCEWc32ekvJKVLxqvwEVTaw9b1DWXZv8bJIErqA+ JvbkXnwOQPZAWofUX0RdilxVZdsda2j7e112eYDahXdSIo8LEQtJjj1pdP981SVGPGmr iSxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808537; x=1759413337; 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=mswzqg1rIlmw6HicVVCtXv0e5vufLTaFX3VKtK98wJ4=; b=WK7uPEh+Al3fbSgWt2vk9GvSPsSI8YTFFwtdlGGtp/U7HweF54ztTl+it2xRJNne3J 8Ol6GO+OD4z4REDiA2O9yEiPFhK1N0FVS0q6MbP1HVmcCPEa/wGG6G9WUNjNhjIzWLBu boVu+EezOCqSrKFEzgLua/SHmVLZfMFyRbtoKU97afoX9WXHoQmm+XOrckD36brqVFxE A/a2HeoGJDEOEQRdGAeuA8YSvvwa9RcwvyEJzthEGI3phccYuv2qQL0nIYoST2gncDMw DWvuECiW5sPvMRW8izSq7udMEopHK8COeTGuk1bNovJSnWbQGCJX6p0GOm5mhpgiBpu0 wj+w== X-Forwarded-Encrypted: i=1; AJvYcCVqFHi37vo+fiZKebTfYuXQ7csfLYsajgirjnjgfTuTKXG1sC4+MPTn1sCySk3hgVdUILfEs7qMi77dHCQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzoIfE2c25v5yUjl5uNLrck0Hta5mZEeyoTxpypLSjoCynANVBI AbShb1yFeJ601v+VSp82dSTrxIhJyU5/wyRPBFNc+0SvAP53+4irf8xH X-Gm-Gg: ASbGncvucxa7h110Myiucjmlt83xlNQMRjmu3WEj9V/kVesmffjWZuKvHjJakxef77Z PCcygmrJbyiryfPyD9GFvpVPLuv7KD+FNO8d8HwDsYyBgu/mfpejoUkbPggFmCa9k8z/TOJ9aQJ dp9KYWZKcZlBVgUMCGCiRR/GI5ejMKQn+aCB2hru67dGxo9h7BDVCGhcq+IeFG3Rq2/yQWiwaP7 3fibMnqO7iN1nJOO6dXM244l0M8h0k8IdY1VnCLCwKbOHyNsUtj1i5cFRlg9DxcT3N5QdcewaNx YiDxSCMUIsOuXgdO4tacsJ08mw3DoJEX28eMbApHESMbmWaPD5CKIrbz2Esxzp7zOBBkhCbOmoN VWNkGvvvW2oP6Gk7/bNeiqI3UIxdVFvZerQXI69tpqsmyM4CClvAz0t80bbmuNbb6nyVoDJeiZM CKVAt9bFLRINIHn/HKxK2xCuQJmVV/Ky5UuiHVbt3LSNfqeCfRf/tUVFmpWCy7rOtwR/ZO X-Google-Smtp-Source: AGHT+IG0JSBlGu1RB4uMilSaBh7PnIkXhnuatHF4cSQpYwaqP/zzSQ9G+tSnzQTTn3K53FoLTANywA== X-Received: by 2002:a05:6214:4001:b0:70d:6de2:50c0 with SMTP id 6a1803df08f44-7fc43a4e9e0mr40876536d6.61.1758808535790; Thu, 25 Sep 2025 06:55:35 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:35 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:01 -0400 Subject: [PATCH v2 13/19] 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: <20250925-core-cstr-cstrings-v2-13-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=1469; i=tamird@gmail.com; h=from:subject:message-id; bh=9ZmEu11QXJ8phGJATObrsBrPngKGUQeOptVynfUL8WM=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QLLvUlNLZLAaXK2MqYDhZdBweEQ8R3sKV9FI/C2n7BV5P0I7OA8y5a1a/1zJuYaQ3obw7TFfFmi JTjNJLSMGawU= 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 Reviewed-by: Benno Lossin Acked-by: Danilo Krummrich Signed-off-by: Tamir Duberstein --- 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 606946ff4d7f..e0e9d9fda484 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 @@ -79,7 +79,7 @@ fn probe(pdev: &pci::Device, info: &Self::IdInfo) -= > Result let drvdata =3D KBox::pin_init( try_pin_init!(Self { pdev: pdev.into(), - bar <- pdev.iomap_region_sized::<{ Regs::END }>(0, c_str!(= "rust_driver_pci")), + bar <- pdev.iomap_region_sized::<{ Regs::END }>(0, c"rust_= driver_pci"), index: *info, }), GFP_KERNEL, --=20 2.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (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 C98662DA767 for ; Thu, 25 Sep 2025 13:55:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808546; cv=none; b=mAMlXVa0AvRdwERtCaZJjjlUw/72nxapygToDC5bwFQnWPc0AINoh1oQX1k42lwVGEEb5r+3YT756+SOVt0X25XdJ1SELNjOWkpx4qxrJ/yVW/glvNkHHtaBQuq4WXC9lFjt0JB60Fqrq311/zg4LBFpMwrVBoDqko1MY5bF89Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808546; c=relaxed/simple; bh=cGT2p8vWeMd9yhCscAqtKB14P0MqjieptZpD6VjuDnQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ppr+JIiDycu8ohwxTfbl3kuwG0sEWV2U8iz/TCVY5OnyPfqkmtuM0ELiMHK5W8HsGsyjYzFKVLKPMIZNyWQuAy2CsPB1rqPnujCeBiv7iz0pUQD6+9XWqicl7r295Lbb8WjezkP7sxQiV+XB+7x9iSrv+HDUyAu8GOGYPXHF2go= 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=QNKnXwyx; arc=none smtp.client-ip=209.85.219.50 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="QNKnXwyx" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-792f273fbe4so4557366d6.3 for ; Thu, 25 Sep 2025 06:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808544; x=1759413344; 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=WAkOv1RieyKvIfCAhJItgJq0V7Rg1TFOU5lVc6t6PUg=; b=QNKnXwyxRNLHaB0G90cg4piqi+WLlffVo8gyhXvBR0dxXTRIJyhZ47K7ozqeszP2Gc 6iZ5dHqRU53CX5dwNOX98mUQb78HSBEC9cBUAYmlWHLDvE+/qIyBiGJjgFEAJ/PSVWIz 2dBfhUIFx9pZ4xMclW7yje4dGxt8pV/gXxZL7ynDXmarqR/OGueIIQEppDyAPqst+SKK ckWkTydWSBFrZ6GltJedHN4ms/EuId+U1MlEBk2y3IK2eSDLIAh33O48BxxUK/4ZPega i4v1X2yk5FylPajjOZO9eEpBfzWQEu5pKQqk9S5rbXvyW3hi1FQRg2gK2wwsX3GzXMRG 7x/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808544; x=1759413344; 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=WAkOv1RieyKvIfCAhJItgJq0V7Rg1TFOU5lVc6t6PUg=; b=wxIYxhyNh47EthR5bwCrFhmOdFYuEpyS7xFxUxAHXssaLn0XRAJl0Wo4qySnC0wSCK SuW0ftxMp0mxpm2b59XSsqqS2476SV16iqFtzrL+K3bkbb8MBNOunfSL+K1qyFerVkNk boNKm+rSmcflC5Jt8zrHEJcddhXVxfToewTfoxHLslRXfK5dSNFLvywEKWAU3kwCSmel 2LJi1FC8a2YfhtjPZ63UwroX6a4DnQ8caXS8BvPsJOsd+DpN6Iw1twzNmN7GGYPANmlh UJuqCqDPJloJL5gI7CfnBBl1xEK3jh8c47XPjSoXOPz+/JV2QdOM0B0oXadRC7WKcqcq tJPg== X-Forwarded-Encrypted: i=1; AJvYcCVGhplmgh1R0FAH8/ejqeN9s9aNLsFIbdC86MJUT8THnVZH6nhl6He3ptY11UIl1FO5iJP/SvBNgz/hTeU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5ioIc1/+76QlvjuESCWBDOLd1BlyrYKGrU5IMYcnQnjnP5/iQ QP1TdF4ZVPu+N/xKKp0QaCkOqJA9n78ibsp/Ph/72+bUBXXupuiaIgQy X-Gm-Gg: ASbGncvr8+GeRd4jrBDgQKpMD+uqQ2BoJCXxWwlzGgKSq5n31FdTYHy16S/C/aPUl18 dbs5ROxskHMBiIXvakem3XhXV04fVI8UUNNbIK9Dhbi2e1lH+IekC0DU2Qx3J8kc/yfDGFyyrVd iIyNaO4MhpUCccAbEpeVzyu/TdNKlXnLbGibJktGkQPhwqqcd8WsWWJTEMv11NHTEkKAHAjR8Li BqLMa77cfuDIPHPoEYVP08yc+8tNu9jpsL01e1/XgtnRS+kH3mXR6Tjimi5LSruuOYK+cqTfmZ5 LBZ/c4UbkC/8cvSws98k9ADVNVE5y4Q8gvBRKi3kkQwNkwPEFbZaQO08iPR4rFd9enRCXh3SjtU SC4oKkkfescyAQAqGqYrsH33hyIfobjpqvY5NSo9i8by+KWvq+muFLW86Xjxpd0dl64rXdzBC6y DbZbsht3r9qBI4y+hnJscfmWLcOovJpOmc8I7d5VHBJtlDmE0c3pUs9ps4bww15+VE8awi X-Google-Smtp-Source: AGHT+IHF9UuB9For1/7YW0Qxf6nPTFMieeyDSqN58eT9nYnL6TeBAODoPScd1hJnleJiIi565hDfTQ== X-Received: by 2002:ad4:5bc9:0:b0:76a:fcee:97aa with SMTP id 6a1803df08f44-7fc309ec826mr47856686d6.29.1758808543310; Thu, 25 Sep 2025 06:55:43 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:42 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:02 -0400 Subject: [PATCH v2 14/19] 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: <20250925-core-cstr-cstrings-v2-14-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=6208; i=tamird@gmail.com; h=from:subject:message-id; bh=cGT2p8vWeMd9yhCscAqtKB14P0MqjieptZpD6VjuDnQ=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QAqXnSTSLC5DSGmrQ0rUUvFP5bu0JMFwcjJ+FLO2nGEH20VIfZHuQ47CF/8jOiBsSKPADtt8TtP 7X9bJlhhLGw8= 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 Reviewed-by: Benno Lossin Acked-by: Danilo Krummrich Signed-off-by: Tamir Duberstein --- rust/kernel/platform.rs | 6 +++--- samples/rust/rust_driver_faux.rs | 4 ++-- samples/rust/rust_driver_platform.rs | 30 ++++++++++++++---------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 8f028c76f9fa..d1cc5cee1cf5 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -135,7 +135,7 @@ macro_rules! module_platform_driver { /// # Examples /// ///``` -/// # use kernel::{acpi, bindings, c_str, device::Core, of, platform}; +/// # use kernel::{acpi, bindings, device::Core, of, platform}; /// /// struct MyDriver; /// @@ -144,7 +144,7 @@ macro_rules! module_platform_driver { /// MODULE_OF_TABLE, /// ::IdInfo, /// [ -/// (of::DeviceId::new(c_str!("test,device")), ()) +/// (of::DeviceId::new(c"test,device"), ()) /// ] /// ); /// @@ -153,7 +153,7 @@ macro_rules! module_platform_driver { /// MODULE_ACPI_TABLE, /// ::IdInfo, /// [ -/// (acpi::DeviceId::new(c_str!("LNUXBEEF")), ()) +/// (acpi::DeviceId::new(c"LNUXBEEF"), ()) /// ] /// ); /// 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 ad08df0d73f0..b3fe45a43043 100644 --- a/samples/rust/rust_driver_platform.rs +++ b/samples/rust/rust_driver_platform.rs @@ -63,7 +63,7 @@ //! =20 use kernel::{ - acpi, c_str, + acpi, device::{ self, property::{FwNodeReferenceArgs, NArgs}, @@ -85,14 +85,14 @@ 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 kernel::acpi_device_table!( ACPI_TABLE, MODULE_ACPI_TABLE, ::IdInfo, - [(acpi::DeviceId::new(c_str!("LNUXBEEF")), Info(0))] + [(acpi::DeviceId::new(c"LNUXBEEF"), Info(0))] ); =20 impl platform::Driver for SampleDriver { @@ -126,49 +126,47 @@ impl SampleDriver { fn properties_parse(dev: &device::Device) -> Result { let fwnode =3D dev.fwnode().ok_or(ENOENT)?; =20 - if let Ok(idx) =3D - fwnode.property_match_string(c_str!("compatible"), c_str!("tes= t,rust-device")) - { + if let Ok(idx) =3D fwnode.property_match_string(c"compatible", c"t= est,rust-device") { dev_info!(dev, "matched compatible string idx =3D {}\n", idx); } =20 - let name =3D c_str!("compatible"); + let name =3D c"compatible"; let prop =3D fwnode.property_read::(name).required_by(dev= )?; dev_info!(dev, "'{name}'=3D'{prop:?}'\n"); =20 - let name =3D c_str!("test,bool-prop"); - let prop =3D fwnode.property_read_bool(c_str!("test,bool-prop")); + let name =3D c"test,bool-prop"; + let prop =3D fwnode.property_read_bool(c"test,bool-prop"); dev_info!(dev, "'{name}'=3D'{prop}'\n"); =20 - if fwnode.property_present(c_str!("test,u32-prop")) { + if fwnode.property_present(c"test,u32-prop") { dev_info!(dev, "'test,u32-prop' is present\n"); } =20 - let name =3D c_str!("test,u32-optional-prop"); + let name =3D c"test,u32-optional-prop"; let prop =3D fwnode.property_read::(name).or(0x12); dev_info!(dev, "'{name}'=3D'{prop:#x}' (default =3D 0x12)\n"); =20 // A missing required property will print an error. Discard the er= ror to // prevent properties_parse from failing in that case. - let name =3D c_str!("test,u32-required-prop"); + let name =3D c"test,u32-required-prop"; let _ =3D fwnode.property_read::(name).required_by(dev); =20 - let name =3D c_str!("test,u32-prop"); + let name =3D c"test,u32-prop"; let prop: u32 =3D fwnode.property_read(name).required_by(dev)?; dev_info!(dev, "'{name}'=3D'{prop:#x}'\n"); =20 - let name =3D c_str!("test,i16-array"); + let name =3D c"test,i16-array"; let prop: [i16; 4] =3D fwnode.property_read(name).required_by(dev)= ?; dev_info!(dev, "'{name}'=3D'{prop:?}'\n"); let len =3D fwnode.property_count_elem::(name)?; dev_info!(dev, "'{name}' length is {len}\n"); =20 - let name =3D c_str!("test,i16-array"); + let name =3D c"test,i16-array"; let prop: KVec =3D fwnode.property_read_array_vec(name, 4)?.r= equired_by(dev)?; dev_info!(dev, "'{name}'=3D'{prop:?}' (KVec)\n"); =20 for child in fwnode.children() { - let name =3D c_str!("test,ref-arg"); + let name =3D c"test,ref-arg"; let nargs =3D NArgs::N(2); let prop: FwNodeReferenceArgs =3D child.property_get_reference= _args(name, nargs, 0)?; dev_info!(dev, "'{name}'=3D'{prop:?}'\n"); --=20 2.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (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 5FAD42DC346 for ; Thu, 25 Sep 2025 13:55:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808552; cv=none; b=r+X1TXXJRw10U7j/unE/fBQCyaLnXKSWK2NS/j5DtkKh2vPHcxj3sWt+bjTua+EaZWUOTw4zxIcH8jfnjr+vKJ1EvQE0f3bjZaGHC0/1vOBpa7aEjtSEW/HYDFMk8f+tsxLcYp1naaqvEZ6iEAMVDycHpc2R1/eh4KfU8cK5eQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808552; c=relaxed/simple; bh=/zHlMKa0b7Nk9siO6gKcN+x/h82Zk8zkURVvpzNt6AA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bo/1ap/3eqKcOzUkhA4lTiUsLP+x+IPMiQBYHmR/ZOiUIdmR8LNtJuqQdEsCnF8zSXnOMqchXuQr1ub/ITm+P19DnpI2ArseN70XMWsQUSXjAM1yNNxvbQqEqTM/SQmEfegGG6wexuCU5k9ZopRQS8++QHetqfHecwMeZov5F20= 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=KeuPt+tL; arc=none smtp.client-ip=209.85.219.53 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="KeuPt+tL" Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-78f75b0a058so7327326d6.0 for ; Thu, 25 Sep 2025 06:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808549; x=1759413349; 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=YGNwJdiqffAB8BrNoFOc3im0f57lc7sAudNYea1lra0=; b=KeuPt+tLwr0z6WDSP3y7Sd8ARJjyqhBS+8J19v53/oqlcmaVyTjZxFiSaHYUc0eDWv HXtJzPM1aKkv/FaVdl0+9Dg2K1BDc1e+3yquSp9hskiLhew3+7oaC1lAXRBrVixuzxZX 2pjos2w+kAiFtnlfKbsuBkq//yKRfyGhmiZuxp/m8RBzcKsDDyzd5YtXMqmH18RCBzpE pVrGH/KYTlH39BJblDgoplC2+0SetRV3N1H6glaSSKPK38tCBu+1/D6Dmnp9U8vmqJLL yQmSg1knJMR6xaj4nUnqodIGwo3vS5nx5G6/+UknyfHYGteUeiVMpFfvIJQRbUqZfm80 yDAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808549; x=1759413349; 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=YGNwJdiqffAB8BrNoFOc3im0f57lc7sAudNYea1lra0=; b=wET3f6ZoFUSJH5tn1naBp4E/9Wfi1NVT7Hrk45g+V9x1vLasAezQXuDmDWhx++RX2y gUU9AuYOlERKSjNBarc0hpvOisVBr6jcpDPwJyIxozL7SxQzfj/Vx124BRPAYFV3qvVE 7/3IPyCqrtyBx64mGbQ1KZycP01equEfB9ESVrO+0AogmLoMn/+N3YTlQdojR8OKmhPj 4iIhZf42Jf9KV8nAWUTfW+eTNQMA6iD8/rhBgNL2BOKdXUu1UZdOQFgAB3AT4XST4Yde n6Ke5CTdm5NEN17j2W4eGzBXHZv0s7NRPmptp7JfLUYwnyUtxPN78OoRYLYA0hX8iyKK /BXA== X-Forwarded-Encrypted: i=1; AJvYcCVwTR1p7d8uHGnS6f6dOZ4B7dh++grnRM7zVc5S4DIIwDJs+MpCdLlscKEfBh/Q2VDUWscQzkETxLu1wSY=@vger.kernel.org X-Gm-Message-State: AOJu0YwTAGcdC8ZDYvMMGpcEwWuYDPn5hQ5hgBconVi82t44hRjEInEX VIG2HDe1jNQLTL1/CuQlJJ6luZacmGFZJ6i6yeHvS5BS7QVnO3JnICbF X-Gm-Gg: ASbGnctcJFmSWgLbvfLYjwyw0Z5hqiJACQrxD0XZJe5Ps+YP4C6f3v7Smh4vgd3c9wo Kda81Q1UQJerHj3ZomIbdq4sooFYPr2wqEQxPHIpc18SduBRfniVS1e+JypA6r1Uzf0Vuq0jnWz pFjXF2tlBM/ei0BcTp+EnwFpj9C2l+UPCgHdPMTaP8pIOSlLSshQ6ODWiY01LWa3c6ml+iIXbBC q0VyA9AITzSSnaE2mmW8v9crhZAQoKw4MCQH3nxyD1cYLKqbLfkz7yKfeJmjgsF8HIrGul+GJcp ic2OBqTthqp2Qd9nGWNDi9QZ+P6nl/SjCBb3iFMsRqxHxthg2n/QBXo6RSBdEpXzpPeCHEh18Kd s0qyq0cmDmzWqhHbw8CzNsKMqO8s1GojhPSv4T8JQ6s4mA+d86ruGwFDCFaynuIToR0QBki7fqK QyosfXa2nvBdmj1/XvkBZkxy70/QH3PJQbgfEr0hnGOPbvbfjZq2s3z8L9RCbdx+Xt4S90 X-Google-Smtp-Source: AGHT+IHxxrN1qiYt8CkNZDH6mAY2ag9p3EBYWx12nFthYZnZa+rBx1Nas4oNQjITBFEWvlFgd3yNGw== X-Received: by 2002:a05:6214:27c3:b0:7f0:e84e:b2b2 with SMTP id 6a1803df08f44-7fc451680aemr56106776d6.57.1758808548877; Thu, 25 Sep 2025 06:55:48 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:48 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:03 -0400 Subject: [PATCH v2 15/19] 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: <20250925-core-cstr-cstrings-v2-15-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=1328; i=tamird@gmail.com; h=from:subject:message-id; bh=/zHlMKa0b7Nk9siO6gKcN+x/h82Zk8zkURVvpzNt6AA=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QAXSvElYTE8YxZCsGrWl/FvFn0PcrKAZK3BdoNzxQTxfQ/m2OpN47pZ17tScZDRCYR8bMK67o/2 oeQSiKFoeSw0= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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.51.0 From nobody Thu Oct 2 00:46:12 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 D62562DE70D for ; Thu, 25 Sep 2025 13:55:55 +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=1758808557; cv=none; b=bGbeemFh//CL1l8nwKcyStZxmrNFNx0zL2p2PFUDiNISs3hDcqkOrWUBQwUSdMdgD5rz/KVdIp9rVPU2q9PAsDY30jZBBB4FwxYJ1m/xnh4mn3o0bG6fEzEYNU481z16htOFkUCY0KGK8a/5AfzrRUAiJexRw/+uqp2vabgiRlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808557; c=relaxed/simple; bh=TE76Xl7EtGwiL3k522JoFNelrGIHYPV5uXDUZx193fk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=btJzMGt4cvs4igt9ZyBv7NtkdXJB6Lr23jMJhmom/UuAOx1il2oljt5aEvaZ4brARlpdkKE2rP1hiULDXGocyxfdxIxEj7fd9CoKv8emXAwDFZeDo9JdtbsBYh7GSTh080crrJiuSJTo7Ny5wyT+J3cBCjN/uxNqwetxpreqvhs= 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=kJ1QBzQQ; 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="kJ1QBzQQ" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-84ab207c37cso75568385a.2 for ; Thu, 25 Sep 2025 06:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808555; x=1759413355; 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=IbRi9B/DaIaW8U9NAWZIVdIpXCsTnUCErxxV4ovxvuk=; b=kJ1QBzQQnod8ikaYW54XssR+CBE3xeOc5hPHb9VMVkm40EXVbG2yI0I4JTy9k7v1V2 xPJPBZLVEqpXdWn+b+d+yi/VR3bTT3A8qRWqvvbLrlZC0zK4EMU6eQB6ocCdJL+STxG8 rGtjFKtaxLVHEkxVjFk3hqKNTf53DOdJ/cPB31CF3iu9Bo4Jx7+FJJRXun5NuVDK5R0T XEE+P7wWItGg7cidouV0rTIv1sdBr/NZ8eT/ErtQPMdbjvPQ7EMvq41rnAmJkvHTqQpM jsXPHNd26pnlqGcpVzITl7z1hZ4Jm5dKwib+hGhygoPE13itEfZhletKi6i6fRZtxWbx sGZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808555; x=1759413355; 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=IbRi9B/DaIaW8U9NAWZIVdIpXCsTnUCErxxV4ovxvuk=; b=fjgfRkPt4aIRrABZn7cETd5K+IIcq0UX8TzcD/a9BNWVz9TH3ZEEUfvJe2lSf+9wWw bCr2fx7Hzcwcxuoh6zk6PodC4BZNRRMSkJ99yJhH+GQjr/gjzC2loyjpj9GvZGNhGuE5 G6GCWRGJWryBZr6kwJ7X1p6GafCozQfh9FUxEFVhmH7A6I0aCqf4c3az+sTCVjg3Oq25 SOxGtuTseEDjA6WPk0st8FoVlEyuLbE3e6q+KWL22ma1FPxbIhUIjShPQQPNRAbL1kNh ef/1c5tAr3SUwKNuOdlfXXk6/QZDAUY6kj0uEliz9ZDUiVud8aAhT658VO17rYPaO/0B beWg== X-Forwarded-Encrypted: i=1; AJvYcCXff2ubUClpl72ZQgABBUtWW+4nCNt3aqHCIjz9a7cCTYLeD/DZvpUVRgke1yyGhJzd2HQGLezhXwPkwLM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7W3kspejh27a2pI1M2nq7cztM05IJPcWw011UGJSCmGIWlnHA sXeBkN2VPkjCExq6c3/iq/D1NIDAD8X+9BRQeCOQtoNDVKqfrmLyTQ6j X-Gm-Gg: ASbGncvrxt90wGITIE7WzrggKJ4S0qBVJsCabhKEY+r66whheesiB/7jC65DvN70EVj 6cyb7ADSc6NT0taXCc1ddAiRIDoOL0k27OOabjIIspb2pnNekKmbmN2C1xtH8Z0oibUbbq1c0zk lddbX5VbZUe3pibl/jXDWDVaTypUjEdQChEXZJoo7XrspW6iKe5mk2pn7T7nk1gpwT6OB5W7tw9 EDymxl6qfRV6k2SAmUCvmSkf1yNUF3+gsM4nPFpYhhoFQU62iiKpfFB2ubdZpCWsK8+ULgpzkW3 yRy0hlBnaCT8A8+3aOVsJPK/TTSt2im61CHcMdw9AfLJnbAXspmZL4npCHcHWBA7YmPoHSqgPoP 4z/Ag6HBXbr6DADb0u8IFAY9dGFr1t+UIpylSxFA++StDEw5lm5nK0th/ypQQlVxvHe95sUfRzQ B7uVHZSx2Q6RkZ+t4zwFk9DmwO3JqDH5DFfah6U3UE/mpzqD0wcpk5i8u/1cn73XAyCAW1 X-Google-Smtp-Source: AGHT+IG7SCiSfqv22MjkqMAx69OdDcsv0d2XWfzHnQ58HqF/5wRLVKKYuW5rQhqneJzNL2eu5F8jIg== X-Received: by 2002:a05:6214:5198:b0:77f:4415:6d8b with SMTP id 6a1803df08f44-7fc28076ae1mr36287846d6.8.1758808554316; Thu, 25 Sep 2025 06:55:54 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:55:53 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:04 -0400 Subject: [PATCH v2 16/19] 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: <20250925-core-cstr-cstrings-v2-16-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=1351; i=tamird@gmail.com; h=from:subject:message-id; bh=TE76Xl7EtGwiL3k522JoFNelrGIHYPV5uXDUZx193fk=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QNEkH2K217WCJVB+0mC1S+mvJu9BnNI6eCwPt0AKaTiMW7gojiLm71MaiB58vh7llyUCTN8zCSP N0RCtgv8pDgg= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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 624386cb07be..4203ce34ce98 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -272,15 +272,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.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (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 3E4752F5463 for ; Thu, 25 Sep 2025 13:56:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808564; cv=none; b=VmxAPRnmlMdklzWaUNR5rNKuDeJGb/yW5Dul2T8hdW12tw+Xb1BG6tuLFwdNksFCF2xDpB3bN4sMMGdHMI+s3GrJrCuxkhvWLnWy07T1kaO7vKaDY5NLaEIGPAifR0KaDDUW9gaoY74pPwGYLXAAvkU+Ss1H46MKWhMXGpWX0s8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808564; c=relaxed/simple; bh=VECNpd/2fGBh3QJ0YU9rU/w8zx6qBuVEWTaPGNBZjLs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JTU7KLJcU0hj6N6vBtfOOL4alkkSqIRopJfdOpPxjGbl3JAjyIaKiPuzYMeMEdVuDll8Neec4IXCrhWfHh55G3amXPS5S5dWSZsM57wypS6YL0JDpP5yyfbQmYFMS1M5kS+TMeDxjSQbaXo/d9dohgwiTHkJMNW3KlFlk4kJzTs= 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=k2VE445r; arc=none smtp.client-ip=209.85.219.53 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="k2VE445r" Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-796d68804a0so10070946d6.3 for ; Thu, 25 Sep 2025 06:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808561; x=1759413361; 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=Su5ueCqg2TI764Opf/rKiovLX30DsPsrljKG6JdjfP0=; b=k2VE445rOPnr/IodeiXz8q8/c+/Cy5PRcVlHn3oz75K1Sse3rY6ZkGN08NMPO3D58I BG7N+eXuBBtEadaMuh8aLIMwwotZQUrjiwtlcSFfc3md00qVL29NOejdRzClLe9tjY4z dBDnptn6bag1eTB9Koc5atCOhYRDlPVa8Wkg+JCoohqeR1W4Kc6CtziC418hVTTZQK4M TEZuECtrh1rrvy5Je+pSciglq3oJGV1+8GsY5rLhXwU61qZMQvLxEgeZ8pFmc7Lyv9rz SdPVqrGHBmdm2wgFAz8X56Hi5vPravoPh2yjQT3DaAOvoukaJNvDyQ6xRlzX6Z+Ms7Zf +ANA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808561; x=1759413361; 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=Su5ueCqg2TI764Opf/rKiovLX30DsPsrljKG6JdjfP0=; b=a6zexzWJ208nF1jFhx33+i7X4cROKJxeImD3F5DNkZ+zBy4gsCv6xwhgA3/XhqV2F3 OsRyZMCKy48rAmkJ7jAf6Bjpfh2Qi+rc9I/CQi3NDAmecwUNYhhDBjPNjHR/tPO7cTbO eIKD9MkzrVTeEM2IzCr9M585e0H1tp5fn9ceb4ls1eKrZIVGyxp3VDRHj0DK7jGkwN0O 7/I/5nW/vZe9XnJYiXtpxfRYJT0BzethshamFcgABr04YqVrOxdPfZzNxCJYx1Yq3xPB PnI/ClhNfAK7+mGlapH5Bd9d5Ue0Y8bp1RNkENvTgC8vXj7bmzq/xi7GDrDW0NgHGCFL bI+Q== X-Forwarded-Encrypted: i=1; AJvYcCU0r5T3c3rGltaPWa7EWuAXgV4qTOdf0atfOsbDutgyjlZ1bttes3RGeO4AfoMynysMXzrzFD4hdpAiWo8=@vger.kernel.org X-Gm-Message-State: AOJu0YyHDLV5XhnQc4UwbJP8kZS5djR9ipnQ/EItE6H01ElQSkge2udV kqvbWPcTAPoLoh4ZNo8B6rhYY981cd9cpdz5OgJdIbudTwz8qh886oWY X-Gm-Gg: ASbGncuLnqpnNVIsbECSat2aE4HOsPg2CDbcCqlM6/x4RxhMkcyuYapSvW9EIXoqljC FVcoehe43wyL5/6UUqCIvlcSzw0vqNVj9EGrjmRk6jcHxIUgXaST1VYc0kOImiNQxMriaTpERmO /YfVKvzIjFMf/iu6u2Hykx3A9b0rAUUSdPO3ltubVuZ80Sp36uRnRqfi+f3s9DDeTNPvDqCdqyc hGVoQvuePZAnY97/d/qJWrgqbPLh4INLigG1BpnxF1hztq9kQJ4KHOJKSBTs5XApBFvAUQ8Eak6 7e6UKioRmBTgRnjmsdamNgIjqSlz7HE0s9owVrvjrk5RdHHsrl8waYlkEhUHXLaccp9k6oU7dGk xmbYSlCp4X0tQhLcC7MgoIRXW+ejJ5eltjFvjWhEtaf9u/eUd80yrh4A/CA3p5X8ZVWaPf1ROWS ysTKkF0pxTK3MTyFG8Rjj4dKxiW8PF6Ip+sAPQjR/uaXkRgt0toc6fuoL90/oUdWfVXf88 X-Google-Smtp-Source: AGHT+IEKGM1hlb41qJ9YisDvGGBXEq7SIWXMU0HV+6pPjw6gZQj4cUtrGlxKA4Eejw5JCAnnmfC1hg== X-Received: by 2002:a05:6214:2aaa:b0:7ef:4bbc:7767 with SMTP id 6a1803df08f44-7fc400b2947mr55121666d6.52.1758808560892; Thu, 25 Sep 2025 06:56:00 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:56:00 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:05 -0400 Subject: [PATCH v2 17/19] 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: <20250925-core-cstr-cstrings-v2-17-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=3839; i=tamird@gmail.com; h=from:subject:message-id; bh=VECNpd/2fGBh3QJ0YU9rU/w8zx6qBuVEWTaPGNBZjLs=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFx8Jxi6AjT1YSsescfenvnVsKv/V+CsWmgyG9TWGf4peefBqx8sfDGAJ3fkDpsXNUJgJQ5G9qv 456V5li7HsQM= 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 Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- 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 00f9b558a3ad..672411058a92 100644 --- a/rust/kernel/sync.rs +++ b/rust/kernel/sync.rs @@ -44,7 +44,6 @@ impl LockClassKey { /// /// # Examples /// ``` - /// # use kernel::c_str; /// # use kernel::alloc::KBox; /// # use kernel::types::ForeignOwnable; /// # use kernel::sync::{LockClassKey, SpinLock}; @@ -56,7 +55,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) } @@ -115,6 +114,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 b9343d5bc00f..261b827235ae 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) //! } //! } @@ -337,7 +337,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.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 D38FE2FD1CF for ; Thu, 25 Sep 2025 13:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808570; cv=none; b=tp6StmhnzW5JT8dK24ETX2HU3qmSVUQQrrQLn90kLg+mHwc/XaXv2s1kUO5T7ltKgfXFRe9S5d39eFKaPBKbav8nF9kRAZaAg42kBwGNhWFnG/uuqOxSRNynsrofxSTCKwAr8H9iUs6CXPdnr4DSeU6jSHzrx3NJteXnTUgXfJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808570; c=relaxed/simple; bh=cd10vY+LdNFm15kjf9buohLVZDsgfigdMJZaOhvjUZ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dA5ZhYG6/FLhaGcrzFAtG26aYFQ2TPWMKYUd3FJa3P6x1j1vMoNBflUUA/RL//bzLQ+YchtrB9ab6VxAvibbozL0L0nKCiOCKDLFhyUCp90x3M6DY0K3KfiotJT1uSzuR3uagSrnNXoOyNJiqMWoNSuj/IpitYfpOeTBXlGDFbs= 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=kHFNSybA; arc=none smtp.client-ip=209.85.219.45 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="kHFNSybA" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-78eba712e89so7111076d6.3 for ; Thu, 25 Sep 2025 06:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808568; x=1759413368; 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=Sq31dC2vDN2a94utvC/B02Ptv/MXvCOxOItQtZFE3ic=; b=kHFNSybAgLMmKvNMEsbdEliOxzUGNfq9vagPqAa/2P2ouxseJFVuYbQskZ+4fD8YM9 9NIt3mmdbJMC+i3qWvQ08fGJ8MT9hIqSisd4lnXj5EEj6rC0nyJF4/rRHWEqGVdMJ5TL gEoIayc33yVrGOkqeZtXbi0WrcUmsIFnAkJ5nPhsZg4FZWVokLo9MqKqI85+ltSjprJy 5PQRU4ClR3AHlJGgrE4p1TO/3VoLha0O/Nxi6ls+OYPcDCcsvgCCn9ibTvMFoc3nz5wB YfKsEWSRaFBxKQW9z03Jvmyf/Nx9L7D2xx/tZWHSPqvJNdBIGECg11eC0myYQxueOI66 jyQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808568; x=1759413368; 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=Sq31dC2vDN2a94utvC/B02Ptv/MXvCOxOItQtZFE3ic=; b=HnPW9z8//M3v5lLknWJQhDNWToxPIpRMFu1C5c6S5c4tgorD8LEsh0hJF8R7oHfb0a ud8UGdBp2QT+oN1217iaRnQxR0vHi5viT7or8YuJCFtqVo1tYhOPn/B0bHpM2z1VdNl2 hKx25iwYRxIVDHKz/xsMSExhsPtZhEP4VLp7fWHjnA3qMuJyMcoAl62h2sYKRfNWoA/V X8QNd69JSJbUCST7jQfvSsNzPp2tlbpvZf9VDyExm468vVyV9lfmuEnGsty/sCeuHPFc 5SpJfmXL5F/l9rLWYCclic7o8XD4Pps75cpJ99kU3dneDZrU21cr1XHxSK7hPM/jDcKq 66eA== X-Forwarded-Encrypted: i=1; AJvYcCW7bFZzbL6J+wB/RQqI602+YMaZFKzAWDjdzcmqqkbhO0zo6nh5D5dtm7iCzjjO0fPhyqLiCjDXA1oMydA=@vger.kernel.org X-Gm-Message-State: AOJu0Yzxw74Phe2GXQMnpl0ASBLs3MRla6FMrjwX/yavd0SUho0wcQeY oceWnwa80sQrEdZRBJ/vcVajbpzKQksyS97ueuLyFrdJhuZlXOg18ny7 X-Gm-Gg: ASbGncussGRE1gWkFbmcMvrJ/hFWbEshvtOkFz7N1MeuLjeUKOLwEdKvzxtb1fKQBfp 8LmZY37FI5ZFUlFOSsZTNSK1gfyptG59jNF1UlX63RdiuBYwIAXPQimRdXo5o96Wsj+2Rh9ecty 7bChQowJOtJPV9tBCGncusA+SPiQPLv6x4uaURxTZbpXYycDvKtHbpIqA5tZNPL7KjscMOp5q3o WZyETNUY3T/Inb38yFTSCibtBXD9IxGIQYa357ILqRiEerU8cEuTBRFdy1+SpjnnEWjJuAv351a wsYeGGEyYyRSTOhQ/+9pRxYmNTjF07S+Gux7R1U4FMebKfOHd3RKm4S/GpnmNzfMQ7IDy57f5bP oTWsnaAyKinMseqQo/1BCZTnGOxZMJd15zMrVuGUqTeSkMlD4z+DQ88xrD3gLA9sCav2NaygAqE P5I09oDKEasbSIHsKWld1RiJRkCfLkj1h2n7sF0QTVepIOKB+w/eTJQwC7pOYDrfkhJhxbeL+aA sYuHIA= X-Google-Smtp-Source: AGHT+IEZhM30AGXNdbFILEQiyz/kr05nZm4O0BE8w754iMuzz8n1eM1enRH3Kra7C8BiuYUbQtPrdA== X-Received: by 2002:a05:6214:3014:b0:80e:4f6d:23be with SMTP id 6a1803df08f44-80e4f6d25a9mr15832686d6.62.1758808567133; Thu, 25 Sep 2025 06:56:07 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:56:06 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:06 -0400 Subject: [PATCH v2 18/19] rust: io: 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: <20250925-core-cstr-cstrings-v2-18-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=1724; i=tamird@gmail.com; h=from:subject:message-id; bh=cd10vY+LdNFm15kjf9buohLVZDsgfigdMJZaOhvjUZ4=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QNf162nJINfyau54ApOtSNUKBNqSEvAN/RUj/VaS1rCjXvJ9mtYy/yqZWgJQlP/HSnYEPjCYYdQ IPwDjgyMc4w4= 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. Signed-off-by: Tamir Duberstein Acked-by: Danilo Krummrich Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin --- rust/kernel/io/mem.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rust/kernel/io/mem.rs b/rust/kernel/io/mem.rs index 6f99510bfc3a..2e42eb906061 100644 --- a/rust/kernel/io/mem.rs +++ b/rust/kernel/io/mem.rs @@ -4,7 +4,6 @@ =20 use core::ops::Deref; =20 -use crate::c_str; use crate::device::Bound; use crate::device::Device; use crate::devres::Devres; @@ -44,7 +43,7 @@ pub(crate) unsafe fn new(device: &'a Device, resou= rce: &'a Resource) -> S /// illustration purposes. /// /// ```no_run - /// use kernel::{bindings, c_str, platform, of, device::Core}; + /// use kernel::{bindings, platform, of, device::Core}; /// struct SampleDriver; /// /// impl platform::Driver for SampleDriver { @@ -102,7 +101,7 @@ pub fn iomap_exclusive_sized( /// illustration purposes. /// /// ```no_run - /// use kernel::{bindings, c_str, platform, of, device::Core}; + /// use kernel::{bindings, platform, of, device::Core}; /// struct SampleDriver; /// /// impl platform::Driver for SampleDriver { @@ -164,7 +163,7 @@ impl ExclusiveIoMem { fn ioremap(resource: &Resource) -> Result { let start =3D resource.start(); let size =3D resource.size(); - let name =3D resource.name().unwrap_or(c_str!("")); + let name =3D resource.name().unwrap_or_default(); =20 let region =3D resource .request_region( --=20 2.51.0 From nobody Thu Oct 2 00:46:12 2025 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (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 632BD299931 for ; Thu, 25 Sep 2025 13:56:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808576; cv=none; b=f+r9m9hjr3PcS31VqHvJStft+aUIMSnwt64ICp+IEv8DjzUtxILlaOtf427oBsui0Zrp7GfjBRmHtR21y45UbS6lSg4mnvKv/3f3afLKyD1ONa2PXjzxUkwECeJLNROLC2vstxmpmDbNYlXantVAXy+AN52VdQ6A9wFQJ/aKL+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758808576; c=relaxed/simple; bh=O/wu2Lf29nUdzSaspIKYEix0WPxikVmVfF3mQ9scbuU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=p3QLYPKquKxIqOwxhOMiMUEmTO3R59B4T84vhvJI7m4PFzUJVE6/TlhEg2qg+G7XuoK9yI9CcuAchxUeqrg9qH4za2fLb0baxUM9ySQL9NLvT3LVkSg+eq4cBILk0DVHOobMV/VaJuQ/PB+UV68Nyx2aZ3+BfcIQ0YWBmPMFVtc= 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=MB0/rmK3; arc=none smtp.client-ip=209.85.222.174 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="MB0/rmK3" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-85e76e886a0so26435785a.1 for ; Thu, 25 Sep 2025 06:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808573; x=1759413373; 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=67z28WQrX/ogTxUcpWCJ1GAunLtCBeF3o3dpHhKNjK8=; b=MB0/rmK3l+ZRaaJREG3duYQEux480HIjS3w7cDDn9IykqdqjNqzjOjDqQVDV0/G/4s UPQkg6GOHh6MdmyUN6KUCiYfeHXt7DkQt1w2k0lMIuHYcsWvF8ztNoFG/9gzlWWZH+F/ bvdDMJX9OXV4YCVBRzPmCkv84aUyg5kQxj24i5gOa0jFxhQ1URlSiQCapmMwlPYF6LCG aEEg39hR2APw6sgoqVJt4aYQ7gpqspPtBL8ekCXej+8wDl/h9lDuCqJ7XJWYmbiOEbg8 mgv7+3GJPG0OhDg7h8khmsT5dex/FwZGLyfFAa3f90dGucAi8zN50dLJkhBTAHTQN+LR wgnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808573; x=1759413373; 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=67z28WQrX/ogTxUcpWCJ1GAunLtCBeF3o3dpHhKNjK8=; b=gLW0GIj4knPGO10da0ogo2gqFJFNaZ2GyW/1lAGoj1hbRM+9oLwgfc0WnuE2dYtPqU Izy7H8gMS2vGhxGlNLg8tIsRiYizy+SnKE/DXVoiaKiPtEYVeI4nF0tU/jbCW/zcDpm0 SL4vUok4ks+6zzZK+rewexdL3qq6w+2a4934mdU7UKYfkRIWgRQZ4Kh56sCVzhVfKA3K 2Y7Yr0v3OFFfF9wSdj5/W5DjWQ/VWBONaTa/Q1YHFyOPw+uSHh6Mm9zTtltOVzyILt/M H01Nlr+hRsDoKlYYSiWis/uGQGMlBZz6ULIFRWNHfgfnt+fkwkzK+8h/+A3AVavCE4NJ ROgQ== X-Forwarded-Encrypted: i=1; AJvYcCWfXl8lDbdLEX8iRI4JEMi/7EFRTqhePu8+Q/MrRL7E+k4Dqzk8930pCf9NpMEpA8/zdXhPiqRxiz7vJ3c=@vger.kernel.org X-Gm-Message-State: AOJu0Yw250l16T+ZQ47kDz+btVMHvS3uH3mbvN1PV0lfKLByDZI5HhIw PRvrNnoUiUxBHonV2vDWfD9Ahjxvx5QlUan9P3b4/L34+aLUrl5ZVbpd X-Gm-Gg: ASbGncv387GfT73A+FP9+A4/tmTKewQojumMWinXcADEV38SQ7AfalGJnlTFiZvaLVJ VYDhvQHRhtNXAFndwP/7bOvyZUcs/XAVJt+6DBSj4wllwXgyvi8AlFGKKcbugWvbDj3/0Gqq+i9 KjkYZKGlt4PqDhUHFmPLYHMmUYL6srHM2PlDK0gA0NNmSq2qiGlB8/HQqY83ZaxAIDcr3ykYhvG Cqej4TUY1fjZf77RIWdq5xRzcUrtEcOp2bpfo0mRXqEQmjL4bryeHM0pbk6TI4LRvmwUPkUk1kr vMI00TFlhEcLRiHSmOZOdCL3Ou0VZwRsJfScOP6Za3At7XCO0AtWZVUNHDmzhrygmDp2eGwbXPx fsKKvYqyrZmnL0H/qGrmbkztfO4+Qj7bGnXycyxPhgwZ8Z0N522Nu8XlUQke/3i5+KUDHPqlJxM +I4/7D7OwkN/R2H2xWmyDjk19T5edGTO/uDTGNs/kDqPejy9kqpdoZ976pTjF40+N2jB3/ X-Google-Smtp-Source: AGHT+IFqm26OFmsSA0nKzITzw08x0KzoFRvLAeGfptjPnF7Ljbfyc5/369jW8FthqI8ZOsSRAhkw7g== X-Received: by 2002:a05:6214:1cc4:b0:786:e3b6:bb99 with SMTP id 6a1803df08f44-7fc3128e0c3mr48349976d6.29.1758808572677; Thu, 25 Sep 2025 06:56:12 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:56:12 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:07 -0400 Subject: [PATCH v2 19/19] rust: regulator: 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: <20250925-core-cstr-cstrings-v2-19-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@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 , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown 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, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808439; l=2550; i=tamird@gmail.com; h=from:subject:message-id; bh=O/wu2Lf29nUdzSaspIKYEix0WPxikVmVfF3mQ9scbuU=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFsLawjfMUC3xaiUohpUXzdZt822yLFxnKyQ3hJFQI3UAkDtLeyUoqZ2lgOdZhmeuCD54hWBgXN /2qfobXSOOAA= 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. Signed-off-by: Tamir Duberstein Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin --- rust/kernel/regulator.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/rust/kernel/regulator.rs b/rust/kernel/regulator.rs index 65f3a125348f..dff8fb00566f 100644 --- a/rust/kernel/regulator.rs +++ b/rust/kernel/regulator.rs @@ -98,12 +98,11 @@ pub struct Error { /// /// ``` /// # use kernel::prelude::*; -/// # use kernel::c_str; /// # use kernel::device::Device; /// # use kernel::regulator::{Voltage, Regulator, Disabled, Enabled}; /// fn enable(dev: &Device, min_voltage: Voltage, max_voltage: Voltage) ->= Result { /// // Obtain a reference to a (fictitious) regulator. -/// let regulator: Regulator =3D Regulator::::get(= dev, c_str!("vcc"))?; +/// let regulator: Regulator =3D Regulator::::get(= dev, c"vcc")?; /// /// // The voltage can be set before enabling the regulator if needed,= e.g.: /// regulator.set_voltage(min_voltage, max_voltage)?; @@ -142,12 +141,11 @@ pub struct Error { /// /// ``` /// # use kernel::prelude::*; -/// # use kernel::c_str; /// # use kernel::device::Device; /// # use kernel::regulator::{Voltage, Regulator, Enabled}; /// fn enable(dev: &Device) -> Result { /// // Obtain a reference to a (fictitious) regulator and enable it. -/// let regulator: Regulator =3D Regulator::::get(de= v, c_str!("vcc"))?; +/// let regulator: Regulator =3D Regulator::::get(de= v, c"vcc")?; /// /// // Dropping an enabled regulator will disable it. The refcount wil= l be /// // decremented. @@ -193,7 +191,6 @@ pub struct Error { /// /// ``` /// # use kernel::prelude::*; -/// # use kernel::c_str; /// # use kernel::device::Device; /// # use kernel::regulator::{Regulator, Dynamic}; /// struct PrivateData { @@ -203,7 +200,7 @@ pub struct Error { /// // A fictictious probe function that obtains a regulator and sets it u= p. /// fn probe(dev: &Device) -> Result { /// // Obtain a reference to a (fictitious) regulator. -/// let mut regulator =3D Regulator::::get(dev, c_str!("vcc")= )?; +/// let mut regulator =3D Regulator::::get(dev, c"vcc")?; /// /// Ok(PrivateData { regulator }) /// } --=20 2.51.0