From nobody Fri Dec 19 16:00:56 2025 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88ACC131E49; Sat, 24 May 2025 20:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118805; cv=none; b=t1OXEwWHZMMgFn09F6Mx3JnV9d9xs07FldWlO2iwPZYhQblPzdE9uPYpVkVpGWrcvIX5IeoGUs0DHxB3r6QzCZoEYAn7dtsOnh9ZP1cN7LWSIWmUBfjm9qGWqb4inm8llRa1Y/ZTEAehKEs+joAnuR5hxWV7OCBD5oR1DgZUlFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118805; c=relaxed/simple; bh=hrug913Vp1NiKCmHn+m4wiqCG8z8FSEDUX4Thc02O9g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rlbc1s+jnQyUxOGYaOwpf4MeK8G9du3s4fA2oYbcQoc26fqPtG0Mwr/duRYBu3IveWI6/LjDJeqMby6YKNHUQ8emJzQVczVDqvuYOMTgAJpK32MUKOMsrD8K1C2/md0VTQ905rbKApWSXH99kUFbqE2YcPsBF4OFkkhcAGqtA6c= 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=dG8jlmJl; arc=none smtp.client-ip=209.85.222.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dG8jlmJl" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7c58974ed57so88916785a.2; Sat, 24 May 2025 13:33:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748118802; x=1748723602; 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=mvfJkqxXdrTl2ACAyEytt+D5VYLPEzTHxEFeE81vrvE=; b=dG8jlmJla3zc2ddUvzo1xIkXVdrOk6ql1swxZFLTgGQKqfpK472JQrYDZGjVhguXk+ rTeO3qyZ1ie8UqNiD1KUPe/2b9U9NadbnkWfunusRgiL2yukrFBhTpLrfuIL9fLFjX99 uiljK+yqr3gVkYsDhe5llOVjTBZr8mZjHTr+7UMxP4yRrXfgL32XXAmKv2allvYZdMt3 AACrWSDcfckGpOsXu7/DbVVBQX3w9tPqDhHL/7uE2W+ivYwKJi5HVa+S5FVmK2+f7jQM 7mfwEqXCRwofL4jH6uSIptCpJgqJC9TkAofPlGHy/AJ4xMyBSav5klkGxte38xXybw/m oDyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748118802; x=1748723602; 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=mvfJkqxXdrTl2ACAyEytt+D5VYLPEzTHxEFeE81vrvE=; b=VGqG7A/CU04bxsQV41KB4jYzk1ckRNpI+Jye6ymFbdBt3mzhJVf1WiA6sMkRvdFWz/ 8Eeba1qFUgnuBjEnPFf2erGRAwMLIPltB85GFULnSqIg7prssC+gO/Cw5ioR/I+RO94e hc8rsubE9ciQLpYh87cZ+T0t8r9kl9p1o2+idHN/KwYigiE+1bBIeiShYuiOf0zAc6oy UlWghP5rcvDATyNlw4yjaT5xHNhQR2lbGir+oAaS1i2DIgo1O0LkY1g1pAXT75TAYGy3 gC+6XBvUsLP4z/i20MBBD+m6lM1bsMzk0a089SG1sNvVi6k15n7RcS/lONB0UxNa88hT K0HA== X-Forwarded-Encrypted: i=1; AJvYcCUHUMxgGJ7e7EkY/5Hlu9IbzB0Mf/yUbLFIWQICABtHEPHcvwIs1nFC23VSRIHHIxeIww2wgh1W7Eu8X/g6@vger.kernel.org, AJvYcCVOzYqJTXzPhb3lrGJf6BB7DGktwDYZgBtWwsOmwMIYnI8h3f/7b7UOPz7407LHsMxrGkREiFkn@vger.kernel.org, AJvYcCW+oPQgfCROSnLjszMzV6c8Zqxqmf7ZKm28hpZTd0EW5DhkSwUCKLSUM2lIbV4EL3ll0JzlTlkvLJ25@vger.kernel.org, AJvYcCX8kOhncy/uAohzarCRCm6yHA2vGJPIldbKhhxY7N9mzwiIkN1DNnBpNtAgD/CUQdbs0xV60N04hGi+@vger.kernel.org, AJvYcCXJ0H6hbcySEaDjxV6BXWFObSLBxcGUgypONyBtlV7NCjs9eALZFOXl8LYyeXSBFqcmXVzw68RHn/a64jI=@vger.kernel.org, AJvYcCXvgOTbjU/NurvdBn5AjOz57FeSdzltWEoGsPfxjWU3kDJjCcn/OUuSxd0LMvGcoMtcwJhCK8SRg7+3awhz5I8e@vger.kernel.org X-Gm-Message-State: AOJu0YysgelZss5dG9yiIMxbUYP3GEitZL2Dtjrixr0rCtrzsuu3dzFl g35rThbAXrPXmGk2Czr2nqfW9Pf7MoHSzjz271aV8hKqkaTLtuIGREts X-Gm-Gg: ASbGncvghfBJqknLZ3v06DoaabbmIXgCiP9QdX1vf04BgmVVcuhYvsoTchZZildl1kX dQlmNEhU05Fc52tzqHvdzn3dDrgaRt/3fkhXC2Mj4fuD8CTHDjMGA3uTC4dGOlkQ+a7v215ewPo AYydxb8SzOz5EpW7O1YWMSAJLkBjeAngP2mAb8RZyT9oDRYcWCKoHZo/c3mkBPiei2fRHnFj4VY fLlxkUgR1OYdJUKi9eFWwB205Y6Cm4vi4q47Zbk0IQ8PK7WDxGE5YlYsWQg15tRt0WtBPRZ/9iK YYlDsolnc0MmIF1Va9Dwntk+jwe93YCvmEvhCMZEWSxab05LpD4xOknIAvhg4wGg1k+30Hc0vhG yBnHLvxgCbCzKN9XqkIm17LoTGYBKNdXXBRBZ4W7cBu9K/UsWp6jh9BGuSmifO1BGuHIQ7o0vLv Xjf1Y= X-Google-Smtp-Source: AGHT+IFboxRLluplUf3LaplIw8SJcbgWkLbYbE/qq4hS3to1whGiWg64X2sqtasOImnMch7vEUC1oA== X-Received: by 2002:a05:620a:608e:b0:7ca:eb5b:6b99 with SMTP id af79cd13be357-7ceecba77cdmr512632385a.15.1748118802225; Sat, 24 May 2025 13:33:22 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:8563:e370:791f:7436]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd467d7fd1sm1379590085a.29.2025.05.24.13.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 13:33:21 -0700 (PDT) From: Tamir Duberstein Date: Sat, 24 May 2025 16:33:01 -0400 Subject: [PATCH v10 1/5] rust: retitle "Example" section as "Examples" 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: <20250524-cstr-core-v10-1-6412a94d9d75@gmail.com> References: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> In-Reply-To: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Brendan Higgins , David Gow , Rae Moar , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , FUJITA Tomonori , Rob Herring , Saravana Kannan , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Arnd Bergmann , Jens Axboe , Benno Lossin , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-pci@vger.kernel.org, nouveau@lists.freedesktop.org, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev This title is consistent with all other macros' documentation, regardless of the number of examples contained in their "Examples" sections. Signed-off-by: Tamir Duberstein Reviewed-by: Benno Lossin --- rust/macros/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index 9acaa68c974e..d31e50c446b0 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -263,7 +263,7 @@ pub fn concat_idents(ts: TokenStream) -> TokenStream { /// literals (lifetimes and documentation strings are not supported). Ther= e is a difference in /// supported modifiers as well. /// -/// # Example +/// # Examples /// /// ``` /// # const binder_driver_return_protocol_BR_OK: u32 =3D 0; --=20 2.49.0 From nobody Fri Dec 19 16:00:56 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 8725827D77D; Sat, 24 May 2025 20:33:26 +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=1748118808; cv=none; b=MYJhG9hTEKLFXDwAJrx8bXjC7VgQ8FB8mqXSMT0K5F6xGqojMVengiQE4kPbNx90iybVqYjk5mvHQbPwXzD5SnyUqmC9TfzhBQ9fxhAHDy83TiQWRpW5wWs0MhTXlD48iXLcd1ISdz1cIp9O1X72UsOEYGLmxKygSrydePPlu7I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118808; c=relaxed/simple; bh=y5enHxy/O7m0lNKAQyUeaj8Wtz3JSohizgniMOhTe7I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VC/3bpiZ7Cu6AUfHj/Ab2Q0I/mFpx5oIi4d8TuFDDIOiwpbN+BH5jS9sL+/hGoKfoK5qf0jQ6Dhy+R8QZuTmCdJmxeHqM8DnjJOAh95Na8QVWFN1M7yvOY0uS2s8OhG6swISammzN2QP8TbEtu+tMSLXLjZouIvgHJPf1uU4CMM= 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=d/dL+Aeh; 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="d/dL+Aeh" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7c5e39d1db2so50843385a.3; Sat, 24 May 2025 13:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748118805; x=1748723605; 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=CnUtoM4bjHXJGymGL5zJirPpZf1+45L63/e33622oUs=; b=d/dL+AehvShGveDSkIpyAPfi8GvDaPxIFTrME1jvJYGcFwvzAVybbJ8NPCHQq/ucKG cu+Ev9WGZaXOswqSOXqVRHo1bnTH/1Sa0hrtOMEopz3oKGK7MqRM4dE6qZBkUwtPJAaH XaFFKDR+uwVK/Aghe8KRyG9/Zsj2Bcae+v8QC6lQh0TJK72h7aOF1b5X/HvfyP7uzvjY jq4RSuZJU5amj386JvgsXlEbfCcPsbuB7UiKxUQutHd5G29FspGN3pMehLZJYG1iQbIl VIzk2ANR0yu+cpC9JHAdAkeVlzysqWPT+jpxhTryiiUdnIJF7eTNEhdomEnqzYdb84es juoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748118805; x=1748723605; 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=CnUtoM4bjHXJGymGL5zJirPpZf1+45L63/e33622oUs=; b=PAj8TBii9D85bzNScnUGBrwUbWmrzvvNUTAiP3ZXm1dZv2u6UWppneu8EswZO4M3R2 UTTt/VArVyZ+lB0MS5oV36ZLuYgIVpB0QjORQL55CyI73U6/h6fJmGhQI/8hVmu9O8LY cJQSY8Cnfm0agOohW/x3+fWXJn1GuDREFiGf4Im2/uOW4dtTAHVA155Gtjui0loE9f4Z iEmEGg+xfFR8a4IhDRIDQ4tNYcrO2MUgg72hMau4Jm8jjVSzlW12iMDvYqOQauF19kfK yVPPbu7vXE1sacxSEdx3cpbiNFovw7g3FESnTUX+/rlP9h+W7LCuF2t0vhAHD/wFGRNF Fk6A== X-Forwarded-Encrypted: i=1; AJvYcCUlaP5jnY94O89/xC72NApwZPxjgOZZavmqLQkpsk2syNgEozyxdXhjkgbctbafiChXYyEVUUWYVYsVjBQu@vger.kernel.org, AJvYcCUm2jE3IMM8Bo1iTWULr319s3bxVFfgV0nzv2jXErXOblhyHYDuizUA9PnTLOzquB1YaoYq1iVt3z0S@vger.kernel.org, AJvYcCVYiRgXTJVGi+dQhJ/2sb8oFr6d8TAu2JGVrteki8Wvc+YZde3NSl3vJNoXp4o2bkXIkQVvhgaDKwHl@vger.kernel.org, AJvYcCVqwSDsVYHI6PM5ypG6j0PhKawZT8uVGASmfAQ1bkSuHuz2XVLov4yPLlk5UMCB/dQqi37HTIH+V7aapQs=@vger.kernel.org, AJvYcCW9nyO2hj9O8QtVkkO9D7fKOhEdm04Zlbk1lQ4599ytY2r1y8r3T6/VVE3BfTGisz9MMroNu6Rh@vger.kernel.org, AJvYcCWrvW/MZTaA0mBZhF5cVFQxujMnY43rI6D94jvTNwxbFH4oyP9s1tPoO47mozf63tfSMN1Avmdo17o/743/gcWZ@vger.kernel.org X-Gm-Message-State: AOJu0Yy5ZVXWKI9IwHIcfWIZTo3eDseSnVO6J1+ZGSPDH3iMa58Mn8fP 9n1uIUWfF8tTpLgRIMYWhW2ErGCC33vit1kjzATom3TqbeiT5zlKPhMS X-Gm-Gg: ASbGnctofG9kcLg5lwC9pTA122cNHcVXVFWWixjLI5mcnHbs+DQxkoudQqk9CZMhhPd bwsaSqV6cIOz4n03PaLlEV/HfkbPDae6j6sHBf8LguZu4HD7I/IHRnDc/1Qyt6/rL3ZTrzsJ/93 LU7jc7rayIwKTOtLpbMKHTXPN6+4PKRGuccWJc+yV6aatA4hoxgl+8KuR2xTlQ6ehycGEDfiVLp Yh1CbFol89by2+J+Y0hRcbk0QhdyQ9laiWOWLV6n6RheSrfTt3cHOL4i4yId4+5AHNHr50YB9Eu 5Zok/aj2ELQYmX9ESI9ihJf1QWxACdvq58uWTyc6HmpLx7pRPDvpEgkYbNwkmUrU+MOCIl6aX2D 9sL7hVAUhRSN6pkfizw+4jUTFmbngCqu81xoV3tWw4tN/Y7Zmb82d0V0QC2Dux+bGdE7PP7AawO YwGhZDreMm+Zpx4Q== X-Google-Smtp-Source: AGHT+IEvTSOiXktFbE4e8UAd5hk5SPe3cLG3udwkxLCXqqv+b7trwUh7p+EjnZaNJ/ueiLYiNpFJQA== X-Received: by 2002:a05:620a:17ab:b0:7cd:53d7:4f8e with SMTP id af79cd13be357-7ceecb6dc81mr672668585a.8.1748118805061; Sat, 24 May 2025 13:33:25 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:8563:e370:791f:7436]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd467d7fd1sm1379590085a.29.2025.05.24.13.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 13:33:24 -0700 (PDT) From: Tamir Duberstein Date: Sat, 24 May 2025 16:33:02 -0400 Subject: [PATCH v10 2/5] rust: support formatting of foreign types 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: <20250524-cstr-core-v10-2-6412a94d9d75@gmail.com> References: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> In-Reply-To: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Brendan Higgins , David Gow , Rae Moar , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , FUJITA Tomonori , Rob Herring , Saravana Kannan , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Arnd Bergmann , Jens Axboe , Benno Lossin , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-pci@vger.kernel.org, nouveau@lists.freedesktop.org, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Introduce a `fmt!` macro which wraps all arguments in `kernel::fmt::Adapter` This enables formatting of foreign types (like `core::ffi::CStr`) that do not implement `fmt::Display` due to concerns around lossy conversions which do not apply in the kernel. Replace all direct calls to `format_args!` with `fmt!`. In preparation for replacing our `CStr` with `core::ffi::CStr`, move its `fmt::Display` implementation to `kernel::fmt::Adapter<&CStr>`. Suggested-by: Alice Ryhl Link: https://rust-for-linux.zulipchat.com/#narrow/channel/288089-General/t= opic/Custom.20formatting/with/516476467 Signed-off-by: Tamir Duberstein --- drivers/block/rnull.rs | 2 +- rust/kernel/block/mq.rs | 2 +- rust/kernel/device.rs | 2 +- rust/kernel/fmt.rs | 77 +++++++++++++++++++++++++++++ rust/kernel/kunit.rs | 6 +-- rust/kernel/lib.rs | 1 + rust/kernel/prelude.rs | 3 +- rust/kernel/print.rs | 4 +- rust/kernel/seq_file.rs | 2 +- rust/kernel/str.rs | 23 ++++----- rust/macros/fmt.rs | 118 ++++++++++++++++++++++++++++++++++++++++= ++++ rust/macros/lib.rs | 19 +++++++ scripts/rustdoc_test_gen.rs | 2 +- 13 files changed, 235 insertions(+), 26 deletions(-) diff --git a/drivers/block/rnull.rs b/drivers/block/rnull.rs index d07e76ae2c13..6366da12c5a5 100644 --- a/drivers/block/rnull.rs +++ b/drivers/block/rnull.rs @@ -51,7 +51,7 @@ fn init(_module: &'static ThisModule) -> impl PinInit { .logical_block_size(4096)? .physical_block_size(4096)? .rotational(false) - .build(format_args!("rnullb{}", 0), tagset) + .build(fmt!("rnullb{}", 0), tagset) })(); =20 try_pin_init!(Self { diff --git a/rust/kernel/block/mq.rs b/rust/kernel/block/mq.rs index fb0f393c1cea..842be88aa1cf 100644 --- a/rust/kernel/block/mq.rs +++ b/rust/kernel/block/mq.rs @@ -82,7 +82,7 @@ //! Arc::pin_init(TagSet::new(1, 256, 1), flags::GFP_KERNEL)?; //! let mut disk =3D gen_disk::GenDiskBuilder::new() //! .capacity_sectors(4096) -//! .build(format_args!("myblk"), tagset)?; +//! .build(fmt!("myblk"), tagset)?; //! //! # Ok::<(), kernel::error::Error>(()) //! ``` diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 5c372cf27ed0..99d99a76934c 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -240,7 +240,7 @@ impl DeviceContext for Normal {} macro_rules! dev_printk { ($method:ident, $dev:expr, $($f:tt)*) =3D> { { - ($dev).$method(core::format_args!($($f)*)); + ($dev).$method($crate::prelude::fmt!($($f)*)); } } } diff --git a/rust/kernel/fmt.rs b/rust/kernel/fmt.rs new file mode 100644 index 000000000000..12b08debc3b3 --- /dev/null +++ b/rust/kernel/fmt.rs @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Formatting utilities. + +use core::fmt; + +/// Internal adapter used to route allow implementations of formatting tra= its for foreign types. +/// +/// It is inserted automatically by the [`fmt!`] macro and is not meant to= be used directly. +/// +/// [`fmt!`]: crate::prelude::fmt! +#[doc(hidden)] +pub struct Adapter(pub T); + +macro_rules! impl_fmt_adapter_forward { + ($($trait:ident),* $(,)?) =3D> { + $( + impl fmt::$trait for Adapter { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let Self(t) =3D self; + fmt::$trait::fmt(t, f) + } + } + )* + }; +} + +impl_fmt_adapter_forward!(Debug, LowerHex, UpperHex, Octal, Binary, Pointe= r, LowerExp, UpperExp); + +macro_rules! impl_display_forward { + ($( + $( { $($generics:tt)* } )? $ty:ty $( { where $($where:tt)* } )? + ),* $(,)?) =3D> { + $( + impl$($($generics)*)? fmt::Display for Adapter<&$ty> + $(where $($where)*)? { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let Self(t) =3D self; + fmt::Display::fmt(t, f) + } + } + )* + }; +} + +impl fmt::Display for Adapter<&&T> +where + for<'a> Adapter<&'a T>: fmt::Display, +{ + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let Self(t) =3D self; + Adapter::<&T>(**t).fmt(f) + } +} + +impl_display_forward!( + bool, + char, + core::panic::PanicInfo<'_>, + crate::str::BStr, + fmt::Arguments<'_>, + i128, + i16, + i32, + i64, + i8, + isize, + str, + u128, + u16, + u32, + u64, + u8, + usize, + {} crate::sync::Arc {where crate::sync::Arc: fmt::Dis= play}, + {} crate::sync::UniqueArc {where crate::sync::UniqueArc<= T>: fmt::Display}, +); diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 1604fb6a5b1b..c29e34192553 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -72,14 +72,14 @@ macro_rules! kunit_assert { // mistake (it is hidden to prevent that). // // This mimics KUnit's failed assertion format. - $crate::kunit::err(format_args!( + $crate::kunit::err($crate::prelude::fmt!( " # {}: ASSERTION FAILED at {FILE}:{LINE}\n", $name )); - $crate::kunit::err(format_args!( + $crate::kunit::err($crate::prelude::fmt!( " Expected {CONDITION} to be true, but is false\n" )); - $crate::kunit::err(format_args!( + $crate::kunit::err($crate::prelude::fmt!( " Failure not reported to KUnit since this is a non= -KUnit task\n" )); break 'out; diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 6e9287136cac..ec48c818d512 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -66,6 +66,7 @@ pub mod faux; #[cfg(CONFIG_RUST_FW_LOADER_ABSTRACTIONS)] pub mod firmware; +pub mod fmt; pub mod fs; pub mod init; pub mod io; diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs index baa774a351ce..ef1efcb9d945 100644 --- a/rust/kernel/prelude.rs +++ b/rust/kernel/prelude.rs @@ -17,7 +17,7 @@ pub use crate::alloc::{flags::*, Box, KBox, KVBox, KVVec, KVec, VBox, VVec= , Vec}; =20 #[doc(no_inline)] -pub use macros::{export, module, vtable}; +pub use macros::{export, fmt, module, vtable}; =20 pub use pin_init::{init, pin_data, pin_init, pinned_drop, InPlaceWrite, In= it, PinInit, Zeroable}; =20 @@ -26,7 +26,6 @@ // `super::std_vendor` is hidden, which makes the macro inline for some re= ason. #[doc(no_inline)] pub use super::dbg; -pub use super::fmt; pub use super::{dev_alert, dev_crit, dev_dbg, dev_emerg, dev_err, dev_info= , dev_notice, dev_warn}; pub use super::{pr_alert, pr_crit, pr_debug, pr_emerg, pr_err, pr_info, pr= _notice, pr_warn}; =20 diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs index 9783d960a97a..0f5e15128005 100644 --- a/rust/kernel/print.rs +++ b/rust/kernel/print.rs @@ -149,7 +149,7 @@ macro_rules! print_macro ( // takes borrows on the arguments, but does not extend the scope o= f temporaries. // Therefore, a `match` expression is used to keep them around, si= nce // the scrutinee is kept until the end of the `match`. - match format_args!($($arg)+) { + match $crate::prelude::fmt!($($arg)+) { // SAFETY: This hidden macro should only be called by the docu= mented // printing macros which ensure the format string is one of th= e fixed // ones. All `__LOG_PREFIX`s are null-terminated as they are g= enerated @@ -168,7 +168,7 @@ macro_rules! print_macro ( // The `CONT` case. ($format_string:path, true, $($arg:tt)+) =3D> ( $crate::print::call_printk_cont( - format_args!($($arg)+), + $crate::prelude::fmt!($($arg)+), ); ); ); diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 7a9403eb6e5b..627bc2f7b3d2 100644 --- a/rust/kernel/seq_file.rs +++ b/rust/kernel/seq_file.rs @@ -47,7 +47,7 @@ pub fn call_printf(&self, args: core::fmt::Arguments<'_>)= { #[macro_export] macro_rules! seq_print { ($m:expr, $($arg:tt)+) =3D> ( - $m.call_printf(format_args!($($arg)+)) + $m.call_printf($crate::prelude::fmt!($($arg)+)) ); } pub use seq_print; diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 98d5c74ec4f7..302423ca5eb0 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -54,7 +54,7 @@ impl fmt::Display for BStr { /// Formats printable ASCII characters, escaping the rest. /// /// ``` - /// # use kernel::{fmt, b_str, str::{BStr, CString}}; + /// # use kernel::{prelude::fmt, b_str, str::{BStr, CString}}; /// let ascii =3D b_str!("Hello, BStr!"); /// let s =3D CString::try_from_fmt(fmt!("{}", ascii))?; /// assert_eq!(s.as_bytes(), "Hello, BStr!".as_bytes()); @@ -85,7 +85,7 @@ impl fmt::Debug for BStr { /// escaping the rest. /// /// ``` - /// # use kernel::{fmt, b_str, str::{BStr, CString}}; + /// # use kernel::{prelude::fmt, b_str, str::{BStr, CString}}; /// // Embedded double quotes are escaped. /// let ascii =3D b_str!("Hello, \"BStr\"!"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", ascii))?; @@ -424,12 +424,12 @@ pub fn to_ascii_uppercase(&self) -> Result { } } =20 -impl fmt::Display for CStr { +impl fmt::Display for crate::fmt::Adapter<&CStr> { /// Formats printable ASCII characters, escaping the rest. /// /// ``` /// # use kernel::c_str; - /// # use kernel::fmt; + /// # use kernel::prelude::fmt; /// # use kernel::str::CStr; /// # use kernel::str::CString; /// let penguin =3D c_str!("=F0=9F=90=A7"); @@ -442,7 +442,8 @@ impl fmt::Display for CStr { /// # Ok::<(), kernel::error::Error>(()) /// ``` fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - for &c in self.as_bytes() { + let Self(cstr) =3D self; + for &c in cstr.as_bytes() { if (0x20..0x7f).contains(&c) { // Printable character. f.write_char(c as char)?; @@ -459,7 +460,7 @@ impl fmt::Debug for CStr { /// /// ``` /// # use kernel::c_str; - /// # use kernel::fmt; + /// # use kernel::prelude::fmt; /// # use kernel::str::CStr; /// # use kernel::str::CString; /// let penguin =3D c_str!("=F0=9F=90=A7"); @@ -595,7 +596,7 @@ fn deref(&self) -> &str { =20 macro_rules! format { ($($f:tt)*) =3D> ({ - &*String::from_fmt(kernel::fmt!($($f)*)) + &*String::from_fmt(crate::prelude::fmt!($($f)*)) }) } =20 @@ -850,7 +851,7 @@ fn write_str(&mut self, s: &str) -> fmt::Result { /// # Examples /// /// ``` -/// use kernel::{str::CString, fmt}; +/// use kernel::{str::CString, prelude::fmt}; /// /// let s =3D CString::try_from_fmt(fmt!("{}{}{}", "abc", 10, 20))?; /// assert_eq!(s.as_bytes_with_nul(), "abc1020\0".as_bytes()); @@ -940,9 +941,3 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Resul= t { fmt::Debug::fmt(&**self, f) } } - -/// A convenience alias for [`core::format_args`]. -#[macro_export] -macro_rules! fmt { - ($($f:tt)*) =3D> ( core::format_args!($($f)*) ) -} diff --git a/rust/macros/fmt.rs b/rust/macros/fmt.rs new file mode 100644 index 000000000000..6b6bd9295d18 --- /dev/null +++ b/rust/macros/fmt.rs @@ -0,0 +1,118 @@ +// SPDX-License-Identifier: GPL-2.0 + +use proc_macro::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStrea= m, TokenTree}; +use std::collections::BTreeSet; + +/// Please see [`crate::fmt`] for documentation. +pub(crate) fn fmt(input: TokenStream) -> TokenStream { + let mut input =3D input.into_iter(); + + let first_opt =3D input.next(); + let first_owned_str; + let mut names =3D BTreeSet::new(); + let first_lit =3D { + let Some((mut first_str, first_lit)) =3D (match first_opt.as_ref()= { + Some(TokenTree::Literal(first_lit)) =3D> { + first_owned_str =3D first_lit.to_string(); + Some(first_owned_str.as_str()).and_then(|first| { + let first =3D first.strip_prefix('"')?; + let first =3D first.strip_suffix('"')?; + Some((first, first_lit)) + }) + } + _ =3D> None, + }) else { + return first_opt.into_iter().chain(input).collect(); + }; + while let Some((_, rest)) =3D first_str.split_once('{') { + first_str =3D rest; + if let Some(rest) =3D first_str.strip_prefix('{') { + first_str =3D rest; + continue; + } + while let Some((name, rest)) =3D first_str.split_once('}') { + first_str =3D rest; + if let Some(rest) =3D first_str.strip_prefix('}') { + first_str =3D rest; + continue; + } + let name =3D name.split_once(':').map_or(name, |(name, _)|= name); + if !name.is_empty() && !name.chars().all(|c| c.is_ascii_di= git()) { + names.insert(name); + } + break; + } + } + first_lit + }; + + let first_span =3D first_lit.span(); + let adapt =3D |expr| { + let mut borrow =3D + TokenStream::from_iter([TokenTree::Punct(Punct::new('&', Spaci= ng::Alone))]); + borrow.extend(expr); + make_ident(first_span, ["kernel", "fmt", "Adapter"]) + .chain([TokenTree::Group(Group::new(Delimiter::Parenthesis, bo= rrow))]) + }; + + let flush =3D |args: &mut TokenStream, current: &mut TokenStream| { + let current =3D std::mem::take(current); + if !current.is_empty() { + args.extend(adapt(current)); + } + }; + + let mut args =3D TokenStream::from_iter(first_opt); + { + let mut current =3D TokenStream::new(); + for tt in input { + match &tt { + TokenTree::Punct(p) =3D> match p.as_char() { + ',' =3D> { + flush(&mut args, &mut current); + &mut args + } + '=3D' =3D> { + names.remove(current.to_string().as_str()); + args.extend(std::mem::take(&mut current)); + &mut args + } + _ =3D> &mut current, + }, + _ =3D> &mut current, + } + .extend([tt]); + } + flush(&mut args, &mut current); + } + + for name in names { + args.extend( + [ + TokenTree::Punct(Punct::new(',', Spacing::Alone)), + TokenTree::Ident(Ident::new(name, first_span)), + TokenTree::Punct(Punct::new('=3D', Spacing::Alone)), + ] + .into_iter() + .chain(adapt(TokenTree::Ident(Ident::new(name, first_span)).in= to())), + ); + } + + TokenStream::from_iter(make_ident(first_span, ["core", "format_args"])= .chain([ + TokenTree::Punct(Punct::new('!', Spacing::Alone)), + TokenTree::Group(Group::new(Delimiter::Parenthesis, args)), + ])) +} + +fn make_ident<'a, T: IntoIterator>( + span: Span, + names: T, +) -> impl Iterator + use<'a, T> { + names.into_iter().flat_map(move |name| { + [ + TokenTree::Punct(Punct::new(':', Spacing::Joint)), + TokenTree::Punct(Punct::new(':', Spacing::Alone)), + TokenTree::Ident(Ident::new(name, span)), + ] + }) +} diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index d31e50c446b0..fa956eaa3ba7 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -10,6 +10,7 @@ mod quote; mod concat_idents; mod export; +mod fmt; mod helpers; mod kunit; mod module; @@ -196,6 +197,24 @@ pub fn export(attr: TokenStream, ts: TokenStream) -> T= okenStream { export::export(attr, ts) } =20 +/// Like [`core::format_args!`], but automatically wraps arguments in [`ke= rnel::fmt::Adapter`]. +/// +/// This macro allows generating `core::fmt::Arguments` while ensuring tha= t each argument is wrapped +/// with `::kernel::fmt::Adapter`, which customizes formatting behavior fo= r kernel logging. +/// +/// Named arguments used in the format string (e.g. `{foo}`) are detected = and resolved from local +/// bindings. All positional and named arguments are automatically wrapped. +/// +/// This macro is an implementation detail of other kernel logging macros = like [`pr_info!`] and +/// should not typically be used directly. +/// +/// [`kernel::fmt::Adapter`]: ../kernel/fmt/struct.Adapter.html +/// [`pr_info!`]: ../kernel/macro.pr_info.html +#[proc_macro] +pub fn fmt(input: TokenStream) -> TokenStream { + fmt::fmt(input) +} + /// Concatenate two identifiers. /// /// This is useful in macros that need to declare or reference items with = names diff --git a/scripts/rustdoc_test_gen.rs b/scripts/rustdoc_test_gen.rs index ec8d70ac888b..22ed9ee14053 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -197,7 +197,7 @@ macro_rules! assert_eq {{ // This follows the syntax for declaring test metadata in the proposed= KTAP v2 spec, which may // be used for the proposed KUnit test attributes API. Thus hopefully = this will make migration // easier later on. - kernel::kunit::info(format_args!(" # {kunit_name}.location: {real_p= ath}:{line}\n")); + kernel::kunit::info(fmt!(" # {kunit_name}.location: {real_path}:{li= ne}\n")); =20 /// The anchor where the test code body starts. #[allow(unused)] --=20 2.49.0 From nobody Fri Dec 19 16:00:56 2025 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 902DC27F724; Sat, 24 May 2025 20:33:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118812; cv=none; b=eQ+SVy/YApBB5NA3ODWzuum+n1wbYiLlW5kJx3mMzi3hJAuhIaFd6pAv6grDfVdqj0MqZGI6iIb920j0KS7XI+0u80zffhMdiTs+SZkm9AyZ26GjOl1W255lfKFOljtOT51QtFqxIH12XLQxC/GazOW5wpS1f1yJEyqfYpuNMWc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118812; c=relaxed/simple; bh=F5VmGQP73qr/LlEXpvQIaPp2QG/Df8MxJTrA4eP4pdo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EKAOoZ+H109A5aY6y/FS0wLiLayncy8rzozgf89Xe7yg7ZGNJpyh2oakLnObdzza2Voqk5xA7WRiZwbXd3Nat3ahu1bxF6kGpxhsHKiaeWMSZtPiJWkXzghue5Ag4aQyEgLWCVwtz4zWDVyC4X6Wjz/i30YUrmPvdifRdqYlmrs= 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=DgQiPX31; arc=none smtp.client-ip=209.85.222.176 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="DgQiPX31" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-7c58974ed57so88920885a.2; Sat, 24 May 2025 13:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748118808; x=1748723608; 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=Mcw9qiZ7QEuufOafEbGfX9hczgDaUuvzSu49Nz+/dWs=; b=DgQiPX31zwB5E20G+qAVTOjAK6rYBqverMHbS81+IpJZX2zFy29velDPFOq+Di68h+ 0I9mn/7oFwrQ7aDMJe/sFSKqpUOoUv+UwfM+asI6Mu+QBBHwjgRhmY7wF3VQHN+q5Web kKNFRq11tSRUu10YHOAr6fvUh0Nwy+SxJY3N68OMHQVlEr2BAGbRYXwdmk/a6Znzpm+P xBrt4PBsdbynrXTp1v31aBX3ZxMfCgoVOO/PXr2WIFb42tctT5uPpXrWzw+iSQi+Q/Sz PoeMBUWqA2mey27R/Ya7iQhEJ9jZR/bLRsRm/d2mcUT0yNPBEpvM0nRssNuUwdYsR/Ri bDVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748118808; x=1748723608; 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=Mcw9qiZ7QEuufOafEbGfX9hczgDaUuvzSu49Nz+/dWs=; b=b9PwUTd2eVe4GB04g347hasp+ETPPMsIX4euiiELf938cqJZFOa1rSI4uxZnV6ib/F 9YKmz0YMXyi9nCmyIxVzcSvMgIw1NLSiDqLCMW81m6HhPeydMCFdxvgWxX/cihPtL11+ ynthnSSG1gnaiOhrihkrg/qXea7Zcky6JixfeJ+RhFApdasjfkOmjdTXOcoRAOyUxWeM rwcSxolg6n+kgj2fAVPgwiWXSmitwiouzcbqff40T5XfaHD9QosLQlH0xHOdH++MO0/8 2km2MRW2ikEn7WUUFv3o3DvBmFa6LW8ki+KBIP8UeZot+eZ9OG//9HkzKTn7a1E2bqA8 TwGg== X-Forwarded-Encrypted: i=1; AJvYcCUjd4dQRjGuqNNoczoS2BTDlZoP7wMDu1xCKoN0lRJ2YyRn5KA+epux5QGj5SW9gOm+HR2OGVBOqvvomc1f@vger.kernel.org, AJvYcCV5GTLsQHKGySy4NVIS5N1sv0yIafE6RfgyL8CNXwsq5UFsvwoBq3GRO8TTPPT/YpyxlPF1uiIaO6k75Z1O56Jh@vger.kernel.org, AJvYcCWSka5U9xE+xt3qUDin/ztxSGh7lS+RSRk/67UzVtZ6OtZPEZmAgyNryExjpvF0vxwDuj/i0Wnl3pPe@vger.kernel.org, AJvYcCWzaWlPx5Ba34FstHMKp9O5uPH6T9CHJOAe1WeqqDEn1p0ws3Isnq8OZIZgnKZASYNRYCgYVxdwEghy5p0=@vger.kernel.org, AJvYcCXFpZ/CKI6tMRyoNLbjUyq/3309/1l3HsyYTnZ0tinQJo3rpgMPp7Sw3fIuK3Vw64JA3RP71tvAp4R8@vger.kernel.org, AJvYcCXfMGqQQnCllUL7TQjvIWYQY9b8tE2DnAZDUUFhG6lOy0tjlUz16lYHY1qhKGn/Pm3tl80Nr4Fp@vger.kernel.org X-Gm-Message-State: AOJu0YwB2X/H1sRPkEkMFDp64oLeTs0Q32qRWH/Z4Q+cK3naCfGV4koG DwWPT9XtkgFHGhmgITl/D5VR+8htJqzWUfrU7UGts5jBoeETSOmMYv7C X-Gm-Gg: ASbGncsFdj2CaseCk0wk+GyIij8FeTbiHggsst/6uErgHjEDhtU0omceO+uq5xRmY7H P/XKs+dEpNAdgY6vNti8SqbG7m4UJ/L6s0PmClIfVCmmhzdsY7zLVZ+lVk2pTnQhbGdG1fhDDHP 8cGFz7xN61/kJU/ouEumDzjSIsgllFoAnA7kseXQqrGu7re8dZULIbL3JhuNgOw1scYXOxAE2q9 0L+6EQF0hS8RYmbNaKaebTC/DHK7Sq8frlvnUhTe+S8be1SCnrtmBhyHk0Yb9jF5FZQ/PHGwo4/ rLlFPIbuzk4sJHowdlpAU66Wgpd3hrgM8e9FfJvolsOS0WYbMz094rPkBv+cPeXWxSTkQ6OECWl oWZXU3sFo/1KahmvpyiOhfAZ2kynXrCoY3AUupO7HZT6DimzCEed6c1Sa6R34gCzTDbn1Ljjol8 oCid4= X-Google-Smtp-Source: AGHT+IHk25PY1k2ZgXNEvWmxFrXKhKqSy6zzVr7t0ph2b59szGzbLRgZX6AHE+1Vyv3WlYPfZ4UJ3Q== X-Received: by 2002:a05:620a:3184:b0:7cc:7704:bf87 with SMTP id af79cd13be357-7ceecc0b810mr479743785a.42.1748118807900; Sat, 24 May 2025 13:33:27 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:8563:e370:791f:7436]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd467d7fd1sm1379590085a.29.2025.05.24.13.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 13:33:27 -0700 (PDT) From: Tamir Duberstein Date: Sat, 24 May 2025 16:33:03 -0400 Subject: [PATCH v10 3/5] rust: replace `CStr` with `core::ffi::CStr` Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250524-cstr-core-v10-3-6412a94d9d75@gmail.com> References: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> In-Reply-To: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Brendan Higgins , David Gow , Rae Moar , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , FUJITA Tomonori , Rob Herring , Saravana Kannan , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Arnd Bergmann , Jens Axboe , Benno Lossin , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-pci@vger.kernel.org, nouveau@lists.freedesktop.org, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev `std::ffi::CStr` was moved to `core::ffi::CStr` in Rust 1.64. Replace `kernel::str::CStr` with `core::ffi::CStr` now that we can. C-String literals were added in Rust 1.77. Opportunistically replace instances of `kernel::c_str!` with C-String literals where other code changes were already necessary; the rest will be done in a later commit. Signed-off-by: Tamir Duberstein --- drivers/gpu/drm/drm_panic_qr.rs | 2 +- rust/kernel/device.rs | 4 +- rust/kernel/error.rs | 4 +- rust/kernel/firmware.rs | 11 +- rust/kernel/kunit.rs | 6 +- rust/kernel/miscdevice.rs | 2 +- rust/kernel/net/phy.rs | 2 +- rust/kernel/of.rs | 2 +- rust/kernel/prelude.rs | 5 +- rust/kernel/seq_file.rs | 4 +- rust/kernel/str.rs | 358 +++++++++---------------------------= ---- rust/kernel/sync/condvar.rs | 2 +- rust/kernel/sync/lock.rs | 2 +- rust/kernel/sync/lock/global.rs | 2 +- 14 files changed, 112 insertions(+), 294 deletions(-) diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr= .rs index f2a99681b998..d8192a9bef63 100644 --- a/drivers/gpu/drm/drm_panic_qr.rs +++ b/drivers/gpu/drm/drm_panic_qr.rs @@ -922,7 +922,7 @@ fn draw_all(&mut self, data: impl Iterator= ) { // nul-terminated string. let url_cstr: &CStr =3D unsafe { CStr::from_char_ptr(url) }; let segments =3D &[ - &Segment::Binary(url_cstr.as_bytes()), + &Segment::Binary(url_cstr.to_bytes()), &Segment::Numeric(&data_slice[0..data_len]), ]; match EncodedMsg::new(segments, tmp_slice) { diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 99d99a76934c..9074322c79e8 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -12,7 +12,7 @@ use core::{fmt, ptr}; =20 #[cfg(CONFIG_PRINTK)] -use crate::c_str; +use crate::str::CStrExt as _; =20 /// A reference-counted device. /// @@ -176,7 +176,7 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Argume= nts<'_>) { bindings::_dev_printk( klevel as *const _ as *const crate::ffi::c_char, self.as_raw(), - c_str!("%pA").as_char_ptr(), + c"%pA".as_char_ptr(), &msg as *const _ as *const crate::ffi::c_void, ) }; diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 3dee3139fcd4..933c048c04f1 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -164,6 +164,8 @@ pub fn name(&self) -> Option<&'static CStr> { if ptr.is_null() { None } else { + use crate::str::CStrExt as _; + // SAFETY: The string returned by `errname` is static and `NUL= `-terminated. Some(unsafe { CStr::from_char_ptr(ptr) }) } @@ -188,7 +190,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Resul= t { Some(name) =3D> f .debug_tuple( // SAFETY: These strings are ASCII-only. - unsafe { core::str::from_utf8_unchecked(name) }, + unsafe { core::str::from_utf8_unchecked(name.to_bytes(= )) }, ) .finish(), } diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index 2494c96e105f..582ab648b14c 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -4,7 +4,14 @@ //! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.= h) =20 -use crate::{bindings, device::Device, error::Error, error::Result, ffi, st= r::CStr}; +use crate::{ + bindings, + device::Device, + error::Error, + error::Result, + ffi, + str::{CStr, CStrExt as _}, +}; use core::ptr::NonNull; =20 /// # Invariants @@ -290,7 +297,7 @@ const fn push_module_name(self) -> Self { let module_name =3D this.module_name; =20 if !this.module_name.is_empty() { - this =3D this.push_internal(module_name.as_bytes_with_nul()); + this =3D this.push_internal(module_name.to_bytes_with_nul()); =20 if N !=3D 0 { // Re-use the space taken by the NULL terminator and swap = it with the '.' separator. diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index c29e34192553..e5621d596ed3 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -100,12 +100,12 @@ unsafe impl Sync for Location {} unsafe impl Sync for UnaryAssert {} =20 static LOCATION: Location =3D Location($crate::bindings::kunit= _loc { - file: FILE.as_char_ptr(), + file: $crate::str::as_char_ptr_in_const_context(FILE), line: LINE, }); static ASSERTION: UnaryAssert =3D UnaryAssert($crate::bindings= ::kunit_unary_assert { assert: $crate::bindings::kunit_assert {}, - condition: CONDITION.as_char_ptr(), + condition: $crate::str::as_char_ptr_in_const_context(CONDI= TION), expected_true: true, }); =20 @@ -175,7 +175,7 @@ pub const fn kunit_case( ) -> kernel::bindings::kunit_case { kernel::bindings::kunit_case { run_case: Some(run_case), - name: name.as_char_ptr(), + name: kernel::str::as_char_ptr_in_const_context(name), attr: kernel::bindings::kunit_attributes { speed: kernel::bindings::kunit_speed_KUNIT_SPEED_NORMAL, }, diff --git a/rust/kernel/miscdevice.rs b/rust/kernel/miscdevice.rs index b4c5f74de23d..d684ec4ef4d0 100644 --- a/rust/kernel/miscdevice.rs +++ b/rust/kernel/miscdevice.rs @@ -34,7 +34,7 @@ pub const fn into_raw(self) -> bindings::m= iscdevice { // SAFETY: All zeros is valid for this C type. let mut result: bindings::miscdevice =3D unsafe { MaybeUninit::zer= oed().assume_init() }; result.minor =3D bindings::MISC_DYNAMIC_MINOR as _; - result.name =3D self.name.as_char_ptr(); + result.name =3D crate::str::as_char_ptr_in_const_context(self.name= ); result.fops =3D MiscdeviceVTable::::build(); result } diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index a59469c785e3..652e060e47bd 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -504,7 +504,7 @@ unsafe impl Sync for DriverVTable {} pub const fn create_phy_driver() -> DriverVTable { // INVARIANT: All the fields of `struct phy_driver` are initialized pr= operly. DriverVTable(Opaque::new(bindings::phy_driver { - name: T::NAME.as_char_ptr().cast_mut(), + name: crate::str::as_char_ptr_in_const_context(T::NAME).cast_mut(), flags: T::FLAGS, phy_id: T::PHY_DEVICE_ID.id, phy_id_mask: T::PHY_DEVICE_ID.mask_as_int(), diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs index 04f2d8ef29cb..12ea65df46de 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -29,7 +29,7 @@ fn index(&self) -> usize { impl DeviceId { /// Create a new device id from an OF 'compatible' string. pub const fn new(compatible: &'static CStr) -> Self { - let src =3D compatible.as_bytes_with_nul(); + let src =3D compatible.to_bytes_with_nul(); // Replace with `bindings::of_device_id::default()` once stabilize= d for `const`. // SAFETY: FFI type is valid to be zero-initialized. let mut of: bindings::of_device_id =3D unsafe { core::mem::zeroed(= ) }; diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs index ef1efcb9d945..97e8bcf73669 100644 --- a/rust/kernel/prelude.rs +++ b/rust/kernel/prelude.rs @@ -35,7 +35,10 @@ =20 pub use super::error::{code::*, Error, Result}; =20 -pub use super::{str::CStr, ThisModule}; +pub use super::{ + str::{CStr, CStrExt as _}, + ThisModule, +}; =20 pub use super::init::InPlaceInit; =20 diff --git a/rust/kernel/seq_file.rs b/rust/kernel/seq_file.rs index 627bc2f7b3d2..1011743dd0ce 100644 --- a/rust/kernel/seq_file.rs +++ b/rust/kernel/seq_file.rs @@ -4,7 +4,7 @@ //! //! C header: [`include/linux/seq_file.h`](srctree/include/linux/seq_file.= h) =20 -use crate::{bindings, c_str, types::NotThreadSafe, types::Opaque}; +use crate::{bindings, str::CStrExt as _, types::NotThreadSafe, types::Opaq= ue}; =20 /// A utility for generating the contents of a seq file. #[repr(transparent)] @@ -36,7 +36,7 @@ pub fn call_printf(&self, args: core::fmt::Arguments<'_>)= { unsafe { bindings::seq_printf( self.inner.get(), - c_str!("%pA").as_char_ptr(), + c"%pA".as_char_ptr(), &args as *const _ as *const crate::ffi::c_void, ); } diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 302423ca5eb0..586644912414 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -4,7 +4,7 @@ =20 use crate::alloc::{flags::*, AllocError, KVec}; use core::fmt::{self, Write}; -use core::ops::{self, Deref, DerefMut, Index}; +use core::ops::{Deref, DerefMut, Index}; =20 use crate::error::{code::*, Error}; =20 @@ -57,11 +57,11 @@ impl fmt::Display for BStr { /// # use kernel::{prelude::fmt, b_str, str::{BStr, CString}}; /// let ascii =3D b_str!("Hello, BStr!"); /// let s =3D CString::try_from_fmt(fmt!("{}", ascii))?; - /// assert_eq!(s.as_bytes(), "Hello, BStr!".as_bytes()); + /// assert_eq!(s.to_bytes(), "Hello, BStr!".as_bytes()); /// /// let non_ascii =3D b_str!("=F0=9F=A6=80"); /// let s =3D CString::try_from_fmt(fmt!("{}", non_ascii))?; - /// assert_eq!(s.as_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); + /// assert_eq!(s.to_bytes(), "\\xf0\\x9f\\xa6\\x80".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -89,11 +89,11 @@ impl fmt::Debug for BStr { /// // Embedded double quotes are escaped. /// let ascii =3D b_str!("Hello, \"BStr\"!"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", ascii))?; - /// assert_eq!(s.as_bytes(), "\"Hello, \\\"BStr\\\"!\"".as_bytes()); + /// assert_eq!(s.to_bytes(), "\"Hello, \\\"BStr\\\"!\"".as_bytes()); /// /// let non_ascii =3D b_str!("=F0=9F=98=BA"); /// let s =3D CString::try_from_fmt(fmt!("{:?}", non_ascii))?; - /// assert_eq!(s.as_bytes(), "\"\\xf0\\x9f\\x98\\xba\"".as_bytes()); + /// assert_eq!(s.to_bytes(), "\"\\xf0\\x9f\\x98\\xba\"".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -175,55 +175,19 @@ macro_rules! b_str { }}; } =20 -/// Possible errors when using conversion functions in [`CStr`]. -#[derive(Debug, Clone, Copy)] -pub enum CStrConvertError { - /// Supplied bytes contain an interior `NUL`. - InteriorNul, +pub use core::ffi::CStr; =20 - /// Supplied bytes are not terminated by `NUL`. - NotNulTerminated, +/// Returns a C pointer to the string. +// It is a free function rather than a method on an extension trait becaus= e: +// +// - error[E0379]: functions in trait impls cannot be declared const +#[inline] +pub const fn as_char_ptr_in_const_context(c_str: &CStr) -> *const crate::f= fi::c_char { + c_str.as_ptr().cast() } =20 -impl From for Error { - #[inline] - fn from(_: CStrConvertError) -> Error { - EINVAL - } -} - -/// A string that is guaranteed to have exactly one `NUL` byte, which is a= t the -/// end. -/// -/// Used for interoperability with kernel APIs that take C strings. -#[repr(transparent)] -pub struct CStr([u8]); - -impl CStr { - /// Returns the length of this string excluding `NUL`. - #[inline] - pub const fn len(&self) -> usize { - self.len_with_nul() - 1 - } - - /// Returns the length of this string with `NUL`. - #[inline] - pub const fn len_with_nul(&self) -> usize { - if self.0.is_empty() { - // SAFETY: This is one of the invariant of `CStr`. - // We add a `unreachable_unchecked` here to hint the optimizer= that - // the value returned from this function is non-zero. - unsafe { core::hint::unreachable_unchecked() }; - } - self.0.len() - } - - /// Returns `true` if the string only includes `NUL`. - #[inline] - pub const fn is_empty(&self) -> bool { - self.len() =3D=3D 0 - } - +/// Extensions to [`CStr`]. +pub trait CStrExt { /// Wraps a raw C string pointer. /// /// # Safety @@ -231,54 +195,9 @@ pub const fn is_empty(&self) -> bool { /// `ptr` must be a valid pointer to a `NUL`-terminated C string, and = it must /// last at least `'a`. When `CStr` is alive, the memory pointed by `p= tr` /// must not be mutated. - #[inline] - pub unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a= Self { - // SAFETY: The safety precondition guarantees `ptr` is a valid poi= nter - // to a `NUL`-terminated C string. - let len =3D unsafe { bindings::strlen(ptr) } + 1; - // SAFETY: Lifetime guaranteed by the safety precondition. - let bytes =3D unsafe { core::slice::from_raw_parts(ptr as _, len) = }; - // SAFETY: As `len` is returned by `strlen`, `bytes` does not cont= ain interior `NUL`. - // As we have added 1 to `len`, the last byte is known to be `NUL`. - unsafe { Self::from_bytes_with_nul_unchecked(bytes) } - } - - /// Creates a [`CStr`] from a `[u8]`. - /// - /// The provided slice must be `NUL`-terminated, does not contain any - /// interior `NUL` bytes. - pub const fn from_bytes_with_nul(bytes: &[u8]) -> Result<&Self, CStrCo= nvertError> { - if bytes.is_empty() { - return Err(CStrConvertError::NotNulTerminated); - } - if bytes[bytes.len() - 1] !=3D 0 { - return Err(CStrConvertError::NotNulTerminated); - } - let mut i =3D 0; - // `i + 1 < bytes.len()` allows LLVM to optimize away bounds check= ing, - // while it couldn't optimize away bounds checks for `i < bytes.le= n() - 1`. - while i + 1 < bytes.len() { - if bytes[i] =3D=3D 0 { - return Err(CStrConvertError::InteriorNul); - } - i +=3D 1; - } - // SAFETY: We just checked that all properties hold. - Ok(unsafe { Self::from_bytes_with_nul_unchecked(bytes) }) - } - - /// Creates a [`CStr`] from a `[u8]` without performing any additional - /// checks. - /// - /// # Safety - /// - /// `bytes` *must* end with a `NUL` byte, and should only have a single - /// `NUL` byte (or the string will be truncated). - #[inline] - pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CS= tr { - // SAFETY: Properties of `bytes` guaranteed by the safety precondi= tion. - unsafe { core::mem::transmute(bytes) } - } + // This function exists to paper over the fact that `CStr::from_ptr` t= akes a `*const + // core::ffi::c_char` rather than a `*const crate::ffi::c_char`. + unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Sel= f; =20 /// Creates a mutable [`CStr`] from a `[u8]` without performing any /// additional checks. @@ -287,77 +206,16 @@ pub const fn from_bytes_with_nul(bytes: &[u8]) -> Res= ult<&Self, CStrConvertError /// /// `bytes` *must* end with a `NUL` byte, and should only have a single /// `NUL` byte (or the string will be truncated). - #[inline] - pub unsafe fn from_bytes_with_nul_unchecked_mut(bytes: &mut [u8]) -> &= mut CStr { - // SAFETY: Properties of `bytes` guaranteed by the safety precondi= tion. - unsafe { &mut *(bytes as *mut [u8] as *mut CStr) } - } + unsafe fn from_bytes_with_nul_unchecked_mut(bytes: &mut [u8]) -> &mut = Self; =20 /// Returns a C pointer to the string. - #[inline] - pub const fn as_char_ptr(&self) -> *const crate::ffi::c_char { - self.0.as_ptr() - } - - /// Convert the string to a byte slice without the trailing `NUL` byte. - #[inline] - pub fn as_bytes(&self) -> &[u8] { - &self.0[..self.len()] - } - - /// Convert the string to a byte slice containing the trailing `NUL` b= yte. - #[inline] - pub const fn as_bytes_with_nul(&self) -> &[u8] { - &self.0 - } - - /// Yields a [`&str`] slice if the [`CStr`] contains valid UTF-8. - /// - /// If the contents of the [`CStr`] are valid UTF-8 data, this - /// function will return the corresponding [`&str`] slice. Otherwise, - /// it will return an error with details of where UTF-8 validation fai= led. - /// - /// # Examples - /// - /// ``` - /// # use kernel::str::CStr; - /// let cstr =3D CStr::from_bytes_with_nul(b"foo\0")?; - /// assert_eq!(cstr.to_str(), Ok("foo")); - /// # Ok::<(), kernel::error::Error>(()) - /// ``` - #[inline] - pub fn to_str(&self) -> Result<&str, core::str::Utf8Error> { - core::str::from_utf8(self.as_bytes()) - } - - /// Unsafely convert this [`CStr`] into a [`&str`], without checking f= or - /// valid UTF-8. - /// - /// # Safety - /// - /// The contents must be valid UTF-8. - /// - /// # Examples - /// - /// ``` - /// # use kernel::c_str; - /// # use kernel::str::CStr; - /// let bar =3D c_str!("=E3=83=84"); - /// // SAFETY: String literals are guaranteed to be valid UTF-8 - /// // by the Rust compiler. - /// assert_eq!(unsafe { bar.as_str_unchecked() }, "=E3=83=84"); - /// ``` - #[inline] - pub unsafe fn as_str_unchecked(&self) -> &str { - // SAFETY: TODO. - unsafe { core::str::from_utf8_unchecked(self.as_bytes()) } - } + // This function exists to paper over the fact that `CStr::as_ptr` ret= urns a `*const + // core::ffi::c_char` rather than a `*const crate::ffi::c_char`. + fn as_char_ptr(&self) -> *const crate::ffi::c_char; =20 /// Convert this [`CStr`] into a [`CString`] by allocating memory and /// copying over the string data. - pub fn to_cstring(&self) -> Result { - CString::try_from(self) - } + fn to_cstring(&self) -> Result; =20 /// Converts this [`CStr`] to its ASCII lower case equivalent in-place. /// @@ -368,11 +226,7 @@ pub fn to_cstring(&self) -> Result { /// [`to_ascii_lowercase()`]. /// /// [`to_ascii_lowercase()`]: #method.to_ascii_lowercase - pub fn make_ascii_lowercase(&mut self) { - // INVARIANT: This doesn't introduce or remove NUL bytes in the C - // string. - self.0.make_ascii_lowercase(); - } + fn make_ascii_lowercase(&mut self); =20 /// Converts this [`CStr`] to its ASCII upper case equivalent in-place. /// @@ -383,11 +237,7 @@ pub fn make_ascii_lowercase(&mut self) { /// [`to_ascii_uppercase()`]. /// /// [`to_ascii_uppercase()`]: #method.to_ascii_uppercase - pub fn make_ascii_uppercase(&mut self) { - // INVARIANT: This doesn't introduce or remove NUL bytes in the C - // string. - self.0.make_ascii_uppercase(); - } + fn make_ascii_uppercase(&mut self); =20 /// Returns a copy of this [`CString`] where each character is mapped = to its /// ASCII lower case equivalent. @@ -398,13 +248,7 @@ pub fn make_ascii_uppercase(&mut self) { /// To lowercase the value in-place, use [`make_ascii_lowercase`]. /// /// [`make_ascii_lowercase`]: str::make_ascii_lowercase - pub fn to_ascii_lowercase(&self) -> Result { - let mut s =3D self.to_cstring()?; - - s.make_ascii_lowercase(); - - Ok(s) - } + fn to_ascii_lowercase(&self) -> Result; =20 /// Returns a copy of this [`CString`] where each character is mapped = to its /// ASCII upper case equivalent. @@ -415,13 +259,7 @@ pub fn to_ascii_lowercase(&self) -> Result { /// To uppercase the value in-place, use [`make_ascii_uppercase`]. /// /// [`make_ascii_uppercase`]: str::make_ascii_uppercase - pub fn to_ascii_uppercase(&self) -> Result { - let mut s =3D self.to_cstring()?; - - s.make_ascii_uppercase(); - - Ok(s) - } + fn to_ascii_uppercase(&self) -> Result; } =20 impl fmt::Display for crate::fmt::Adapter<&CStr> { @@ -434,16 +272,16 @@ impl fmt::Display for crate::fmt::Adapter<&CStr> { /// # use kernel::str::CString; /// let penguin =3D c_str!("=F0=9F=90=A7"); /// let s =3D CString::try_from_fmt(fmt!("{}", penguin))?; - /// assert_eq!(s.as_bytes_with_nul(), "\\xf0\\x9f\\x90\\xa7\0".as_byte= s()); + /// assert_eq!(s.to_bytes_with_nul(), "\\xf0\\x9f\\x90\\xa7\0".as_byte= s()); /// /// let ascii =3D c_str!("so \"cool\""); /// let s =3D CString::try_from_fmt(fmt!("{}", ascii))?; - /// assert_eq!(s.as_bytes_with_nul(), "so \"cool\"\0".as_bytes()); + /// assert_eq!(s.to_bytes_with_nul(), "so \"cool\"\0".as_bytes()); /// # Ok::<(), kernel::error::Error>(()) /// ``` fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let Self(cstr) =3D self; - for &c in cstr.as_bytes() { + for &c in cstr.to_bytes() { if (0x20..0x7f).contains(&c) { // Printable character. f.write_char(c as char)?; @@ -455,98 +293,75 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Res= ult { } } =20 -impl fmt::Debug for CStr { - /// Formats printable ASCII characters with a double quote on either e= nd, escaping the rest. - /// - /// ``` - /// # use kernel::c_str; - /// # use kernel::prelude::fmt; - /// # use kernel::str::CStr; - /// # use kernel::str::CString; - /// let penguin =3D c_str!("=F0=9F=90=A7"); - /// let s =3D CString::try_from_fmt(fmt!("{:?}", penguin))?; - /// assert_eq!(s.as_bytes_with_nul(), "\"\\xf0\\x9f\\x90\\xa7\"\0".as_= bytes()); - /// - /// // Embedded double quotes are escaped. - /// let ascii =3D c_str!("so \"cool\""); - /// let s =3D CString::try_from_fmt(fmt!("{:?}", ascii))?; - /// assert_eq!(s.as_bytes_with_nul(), "\"so \\\"cool\\\"\"\0".as_bytes= ()); - /// # Ok::<(), kernel::error::Error>(()) - /// ``` - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.write_str("\"")?; - for &c in self.as_bytes() { - match c { - // Printable characters. - b'\"' =3D> f.write_str("\\\"")?, - 0x20..=3D0x7e =3D> f.write_char(c as char)?, - _ =3D> write!(f, "\\x{c:02x}")?, - } - } - f.write_str("\"") - } +/// Converts a mutable C string to a mutable byte slice. +/// +/// # Safety +/// +/// The caller must ensure that the slice ends in a NUL byte and contains = no other NUL bytes before +/// the borrow ends and the underlying [`CStr`] is used. +unsafe fn to_bytes_mut(s: &mut CStr) -> &mut [u8] { + // SAFETY: the cast from `&CStr` to `&[u8]` is safe since `CStr` has t= he same layout as `&[u8]` + // (this is technically not guaranteed, but we rely on it here). The p= ointer dereference is + // safe since it comes from a mutable reference which is guaranteed to= be valid for writes. + unsafe { &mut *(s as *mut CStr as *mut [u8]) } } =20 -impl AsRef for CStr { +impl CStrExt for CStr { #[inline] - fn as_ref(&self) -> &BStr { - BStr::from_bytes(self.as_bytes()) + unsafe fn from_char_ptr<'a>(ptr: *const crate::ffi::c_char) -> &'a Sel= f { + // SAFETY: The safety preconditions are the same as for `CStr::fro= m_ptr`. + unsafe { CStr::from_ptr(ptr.cast()) } } -} =20 -impl Deref for CStr { - type Target =3D BStr; + #[inline] + unsafe fn from_bytes_with_nul_unchecked_mut(bytes: &mut [u8]) -> &mut = Self { + // SAFETY: the cast from `&[u8]` to `&CStr` is safe since the prop= erties of `bytes` are + // guaranteed by the safety precondition and `CStr` has the same l= ayout as `&[u8]` (this is + // technically not guaranteed, but we rely on it here). The pointe= r dereference is safe + // since it comes from a mutable reference which is guaranteed to = be valid for writes. + unsafe { &mut *(bytes as *mut [u8] as *mut CStr) } + } =20 #[inline] - fn deref(&self) -> &Self::Target { - self.as_ref() + fn as_char_ptr(&self) -> *const crate::ffi::c_char { + self.as_ptr().cast() } -} =20 -impl Index> for CStr { - type Output =3D CStr; + fn to_cstring(&self) -> Result { + CString::try_from(self) + } =20 - #[inline] - fn index(&self, index: ops::RangeFrom) -> &Self::Output { - // Delegate bounds checking to slice. - // Assign to _ to mute clippy's unnecessary operation warning. - let _ =3D &self.as_bytes()[index.start..]; - // SAFETY: We just checked the bounds. - unsafe { Self::from_bytes_with_nul_unchecked(&self.0[index.start..= ]) } + fn make_ascii_lowercase(&mut self) { + // SAFETY: This doesn't introduce or remove NUL bytes in the C str= ing. + unsafe { to_bytes_mut(self) }.make_ascii_lowercase(); } -} =20 -impl Index for CStr { - type Output =3D CStr; + fn make_ascii_uppercase(&mut self) { + // SAFETY: This doesn't introduce or remove NUL bytes in the C str= ing. + unsafe { to_bytes_mut(self) }.make_ascii_uppercase(); + } =20 - #[inline] - fn index(&self, _index: ops::RangeFull) -> &Self::Output { - self + fn to_ascii_lowercase(&self) -> Result { + let mut s =3D self.to_cstring()?; + + s.make_ascii_lowercase(); + + Ok(s) } -} =20 -mod private { - use core::ops; + fn to_ascii_uppercase(&self) -> Result { + let mut s =3D self.to_cstring()?; =20 - // Marker trait for index types that can be forward to `BStr`. - pub trait CStrIndex {} + s.make_ascii_uppercase(); =20 - impl CStrIndex for usize {} - impl CStrIndex for ops::Range {} - impl CStrIndex for ops::RangeInclusive {} - impl CStrIndex for ops::RangeToInclusive {} + Ok(s) + } } =20 -impl Index for CStr -where - Idx: private::CStrIndex, - BStr: Index, -{ - type Output =3D >::Output; - +impl AsRef for CStr { #[inline] - fn index(&self, index: Idx) -> &Self::Output { - &self.as_ref()[index] + fn as_ref(&self) -> &BStr { + BStr::from_bytes(self.to_bytes()) } } =20 @@ -630,15 +445,6 @@ fn test_cstr_to_str_panic() { checked_cstr.to_str().unwrap(); } =20 - #[test] - fn test_cstr_as_str_unchecked() { - let good_bytes =3D b"\xf0\x9f\x90\xA7\0"; - let checked_cstr =3D CStr::from_bytes_with_nul(good_bytes).unwrap(= ); - // SAFETY: The contents come from a string literal which contains = valid UTF-8. - let unchecked_str =3D unsafe { checked_cstr.as_str_unchecked() }; - assert_eq!(unchecked_str, "=F0=9F=90=A7"); - } - #[test] fn test_cstr_display() { let hello_world =3D CStr::from_bytes_with_nul(b"hello, world!\0").= unwrap(); @@ -854,11 +660,11 @@ fn write_str(&mut self, s: &str) -> fmt::Result { /// use kernel::{str::CString, prelude::fmt}; /// /// let s =3D CString::try_from_fmt(fmt!("{}{}{}", "abc", 10, 20))?; -/// assert_eq!(s.as_bytes_with_nul(), "abc1020\0".as_bytes()); +/// assert_eq!(s.to_bytes_with_nul(), "abc1020\0".as_bytes()); /// /// let tmp =3D "testing"; /// let s =3D CString::try_from_fmt(fmt!("{tmp}{}", 123))?; -/// assert_eq!(s.as_bytes_with_nul(), "testing123\0".as_bytes()); +/// assert_eq!(s.to_bytes_with_nul(), "testing123\0".as_bytes()); /// /// // This fails because it has an embedded `NUL` byte. /// let s =3D CString::try_from_fmt(fmt!("a\0b{}", 123)); @@ -928,7 +734,7 @@ impl<'a> TryFrom<&'a CStr> for CString { fn try_from(cstr: &'a CStr) -> Result { let mut buf =3D KVec::new(); =20 - buf.extend_from_slice(cstr.as_bytes_with_nul(), GFP_KERNEL)?; + buf.extend_from_slice(cstr.to_bytes_with_nul(), GFP_KERNEL)?; =20 // INVARIANT: The `CStr` and `CString` types have the same invaria= nts for // the string data, and we copied it over without changes. diff --git a/rust/kernel/sync/condvar.rs b/rust/kernel/sync/condvar.rs index caebf03f553b..0b6bc7f2878d 100644 --- a/rust/kernel/sync/condvar.rs +++ b/rust/kernel/sync/condvar.rs @@ -8,7 +8,7 @@ use super::{lock::Backend, lock::Guard, LockClassKey}; use crate::{ ffi::{c_int, c_long}, - str::CStr, + str::{CStr, CStrExt as _}, task::{ MAX_SCHEDULE_TIMEOUT, TASK_FREEZABLE, TASK_INTERRUPTIBLE, TASK_NOR= MAL, TASK_UNINTERRUPTIBLE, }, diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index e82fa5be289c..a777a22976e0 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -7,7 +7,7 @@ =20 use super::LockClassKey; use crate::{ - str::CStr, + str::{CStr, CStrExt as _}, types::{NotThreadSafe, Opaque, ScopeGuard}, }; use core::{cell::UnsafeCell, marker::PhantomPinned, pin::Pin}; diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global= .rs index d65f94b5caf2..79d0ef7fda86 100644 --- a/rust/kernel/sync/lock/global.rs +++ b/rust/kernel/sync/lock/global.rs @@ -5,7 +5,7 @@ //! Support for defining statics containing locks. =20 use crate::{ - str::CStr, + str::{CStr, CStrExt as _}, sync::lock::{Backend, Guard, Lock}, sync::{LockClassKey, LockedBy}, types::Opaque, --=20 2.49.0 From nobody Fri Dec 19 16:00:56 2025 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E076A28001E; Sat, 24 May 2025 20:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118815; cv=none; b=Qj8Up7xSvZThIRy8/cyit+ywD+IW0MSBv9kgmJ2d4wp6klQPW7i1lNhRcj5PqygeRUs3DeSdEK0bLNCnA7DWS7Z3cEVLmdxAkEu0gZ520Utwhq4HyS54U1zIRYaF51Wj30V/nl5EgXHeC1rAKIiPwE1rz6dTpKPfhJj5VJvMTxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118815; c=relaxed/simple; bh=kkDNPFMtmm7o2CPV1jcgMpbdiDqrEpsITJoNNMWHJmg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nGYUOHZPtv1pe2W5g2CrUs+pxxZoKqOYeYA+ZdsY4LpOJ+1y9dB1xhB6a8yyzc+ysHXJUYHEZkvsVjk6+4sVR/fpXAKyAZkAn3hkVvV1WfvwWIBV8QAEJdJGoxHziZK2zvTJr2auXc1lNYfuiO/2yTUXmzDVegMICv0V5tEmB/o= 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=WJL7Y2sf; arc=none smtp.client-ip=209.85.222.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WJL7Y2sf" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7c542ffec37so105742685a.2; Sat, 24 May 2025 13:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748118812; x=1748723612; 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=Ifoon9IxFiouGz8CqKtmOZmA7QiWiaDusLiL7/M/4/Y=; b=WJL7Y2sfmCrHou6/6dWY9GRn9T3A6GTZaH6PC1r9kCAMv/JKSytWxuOJRBG1j0dmrF oEpIFWzUFiWQKolnYHTZGS4exMKK1jCV6+Mo8IIN16mHjYOKttpsm6jjwX5OzQKnYCw1 OIROkap5AHYyuxFvOO5+xj4LlFbD23WLZRVaqfadMYDUihhREa/GjoBJS8x7glYh8Xdt Nh95dR10YPH3myS5HQ1S1lLl7WsHq+0jJPv/+chHu1uDkl69n1PD7sr6CHJEH/4BZqpu c8KGpv0ErypTssaTkdtjVVR620Bf/w++y//YcxF6tyTq2u9zEFb3goW3/PKzBFWIVVuX DbQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748118812; x=1748723612; 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=Ifoon9IxFiouGz8CqKtmOZmA7QiWiaDusLiL7/M/4/Y=; b=WhqJMrMDbmSqBf+yytZWpksEb5UHNbtuTAsAX5/w0xdjG4AZCA/8sSEr1nc7NEDNUW 5Z7u8LsaoBsBx8Zm2qTZPneLiKo3U8oR3sSddmeW2BdIPurLW6w6yHgbnRYcoLvjrptY yIKePgvRkx0LHf4lQ7wemt4Y4nf9bon/rfVvjUgxC8jwLePUnKXUfMpo3spuhfkOni5m SHBnHD9E/W8Nxm6SZ3LRTeblWlGToG85nJoxTDBKZyHthrzGk42XyovAC77o/K77jzSf O4CFXkyHdQuODu8z8RfGA7f4NZ9JVmsw13f11SW8WC+aElvnFqQX/JRo5j6bp3H8C6ef oMAA== X-Forwarded-Encrypted: i=1; AJvYcCUbv7MwM2ApwyxFDmDYQwE3YiUQ535yHVQBhuT9BEm3sL0HgXHLpbTd8imE4CWp7/Zj/WjytIMzsEmC24hI@vger.kernel.org, AJvYcCVBXbXgtBscKSWI8BEKdqsvTrwsf7GsaaerAtk3zIvbOYHvDuB1O1ZIYeS9KOxdyeuAXi4Bci9/3YBK@vger.kernel.org, AJvYcCWIKl6f3fujLDqOLb1k97azOA+qR1t5VbPojIV3xJb1r9FJryT2bbTT7tiNtRFNdNDlEZ4Dy6by@vger.kernel.org, AJvYcCXQ1UVm9+EgQJNutc5L9Ns0yB+TnVy/pVFulmFM8AY9ytCbBkYf8GvMkckaUrAAQHzn04WUvdTn1ya8MSA=@vger.kernel.org, AJvYcCXjnGRrl5lwQSeTxS+dpI2uNsOJ6pDJhpYnL35+017tnFyYDDL/s1hHhQ/V5MABl1E/60iuqg22Az3m@vger.kernel.org, AJvYcCXk/A3XBkCAlmRfV33kDIEgIy5mOF/l1pPv84RB+8n7IDmkp0Ne1oW0NIEQ5d9IusX1nT9BDzvLUPixVPDOAZZz@vger.kernel.org X-Gm-Message-State: AOJu0YzIiNCvmEfaqn+tpaTr3yjoQarR923N+e6ng8jivTnHrj5FzpnQ Tkdt63BYlF8akYPyavnc7YwjccdE9tLzTNoKkxm9wbOZG2C9GXWykOEd X-Gm-Gg: ASbGncsQHWeoPWTAVfoVH0E7gWs6rEgWOKQxIqzTLFs70jmi0LueFeuH2TaIbEBNr6s OdMjO+gKFqnDYpkeFI5wDjzonWrHxDWpesNZZk/tzLnkDANDVigpCYc6DEI2QEE6I4XFZWCSGNN vXt06OLVcy85tJuVX3GqnI3Scs4vqaLFeC9xw8cJX+DjT0XUMkBHs6URc18sDvS/E/JQyX4m6gE 3BigH3RCBQNYBXa6AwegZzO9xfTHphLBVxvzZThr11u7w/33VG0Dc7qhPp7VSe6XWRt+dqHedEy T4O94I3YNLflsveYJ4yxkstW+CBAid6HylbY2NSZPtmxd6qAxcqbq9+iYI6lq9j93okP3pEeLEW Y25MHejxfXPOzrCheOSNzdjYhmwwCTJ8B63LaRLjd7S/2ftPfBQ0zsmfmCgv2CnSAaP+if0fI25 1otWg= X-Google-Smtp-Source: AGHT+IFMh5W/q7hGYv8OuYbTzU3wr3bMIx26mFk1t3CO6+VlG0sdIdFy9pzmEYD2gThQbbXe/b3NJA== X-Received: by 2002:a05:620a:4244:b0:7c7:a5b7:b288 with SMTP id af79cd13be357-7ceecbd370dmr523782185a.19.1748118811438; Sat, 24 May 2025 13:33:31 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:8563:e370:791f:7436]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd467d7fd1sm1379590085a.29.2025.05.24.13.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 13:33:30 -0700 (PDT) From: Tamir Duberstein Date: Sat, 24 May 2025 16:33:04 -0400 Subject: [PATCH v10 4/5] rust: replace `kernel::c_str!` with C-Strings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250524-cstr-core-v10-4-6412a94d9d75@gmail.com> References: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> In-Reply-To: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Brendan Higgins , David Gow , Rae Moar , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , FUJITA Tomonori , Rob Herring , Saravana Kannan , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Arnd Bergmann , Jens Axboe , Benno Lossin , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-pci@vger.kernel.org, nouveau@lists.freedesktop.org, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible and rename `kernel::c_str!` to `c_str_avoid_literals` to clarify its intended use. Closes: https://github.com/Rust-for-Linux/linux/issues/1075 Signed-off-by: Tamir Duberstein --- drivers/gpu/nova-core/driver.rs | 2 +- drivers/net/phy/ax88796b_rust.rs | 7 +++---- drivers/net/phy/qt2025.rs | 5 ++--- rust/kernel/devres.rs | 2 +- rust/kernel/firmware.rs | 6 +++--- rust/kernel/kunit.rs | 7 ++++--- rust/kernel/net/phy.rs | 6 ++---- rust/kernel/platform.rs | 4 ++-- rust/kernel/str.rs | 38 ++++++++++++++++++++++++--------= ---- rust/kernel/sync.rs | 7 +++---- rust/kernel/sync/lock/global.rs | 3 ++- rust/macros/kunit.rs | 6 +++--- rust/macros/module.rs | 2 +- samples/rust/rust_driver_faux.rs | 4 ++-- samples/rust/rust_driver_pci.rs | 4 ++-- samples/rust/rust_driver_platform.rs | 4 ++-- samples/rust/rust_misc_device.rs | 3 +-- 17 files changed, 59 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver= .rs index a08fb6599267..776970049974 100644 --- a/drivers/gpu/nova-core/driver.rs +++ b/drivers/gpu/nova-core/driver.rs @@ -33,7 +33,7 @@ fn probe(pdev: &pci::Device, _info: &Self::IdInfo) = -> Result(0, c_str!("nova-c= ore/bar0"))?; + let bar =3D pdev.iomap_region_sized::(0, c"nova-core/ba= r0")?; =20 let this =3D KBox::pin_init( try_pin_init!(Self { 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); } diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index ddb1ce4a78d9..8735b227f0d3 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -45,7 +45,7 @@ struct DevresInner { /// # Example /// /// ```no_run -/// # use kernel::{bindings, c_str, device::Device, devres::Devres, io::{I= o, IoRaw}}; +/// # use kernel::{bindings, device::Device, devres::Devres, io::{Io, IoRa= w}}; /// # use core::ops::Deref; /// /// // See also [`pci::Bar`] for a real example. diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index 582ab648b14c..09fd3a27bcf0 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(()) @@ -203,7 +203,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 }; diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index e5621d596ed3..09148e982f48 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -58,9 +58,10 @@ 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 $crate::c_str_avoi= d_literals!($file); static LINE: i32 =3D core::line!() as i32 - $diff; - static CONDITION: &'static $crate::str::CStr =3D $crate::c_str= !(stringify!($condition)); + static CONDITION: &'static $crate::str::CStr =3D + $crate::c_str_avoid_literals!(stringify!($condition)); =20 // SAFETY: FFI call without safety requirements. let kunit_test =3D unsafe { $crate::bindings::kunit_get_curren= t_test() }; @@ -222,7 +223,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/kernel/net/phy.rs b/rust/kernel/net/phy.rs index 652e060e47bd..8129419a3931 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -780,7 +780,6 @@ const fn as_int(&self) -> u32 { /// /// ``` /// # mod module_phy_driver_sample { -/// use kernel::c_str; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -799,7 +798,7 @@ const fn as_int(&self) -> u32 { /// /// #[vtable] /// impl phy::Driver for PhySample { -/// const NAME: &'static CStr =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// # } @@ -808,7 +807,6 @@ const fn as_int(&self) -> u32 { /// This expands to the following code: /// /// ```ignore -/// use kernel::c_str; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -828,7 +826,7 @@ const fn as_int(&self) -> u32 { /// /// #[vtable] /// impl phy::Driver for PhySample { -/// const NAME: &'static CStr =3D c_str!("PhySample"); +/// const NAME: &'static CStr =3D c"PhySample"; /// const PHY_DEVICE_ID: phy::DeviceId =3D phy::DeviceId::new_with_exa= ct_mask(0x00000001); /// } /// diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index fd4a494f30e8..7163fc468b32 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -124,7 +124,7 @@ macro_rules! module_platform_driver { /// # Example /// ///``` -/// # use kernel::{bindings, c_str, device::Core, of, platform}; +/// # use kernel::{bindings, device::Core, of, platform}; /// /// struct MyDriver; /// @@ -133,7 +133,7 @@ macro_rules! module_platform_driver { /// MODULE_OF_TABLE, /// ::IdInfo, /// [ -/// (of::DeviceId::new(c_str!("test,device")), ()) +/// (of::DeviceId::new(c"test,device"), ()) /// ] /// ); /// diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 586644912414..0385d927fcd5 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -266,15 +266,14 @@ impl fmt::Display for crate::fmt::Adapter<&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>(()) @@ -365,25 +364,38 @@ fn as_ref(&self) -> &BStr { } } =20 -/// Creates a new [`CStr`] from a string literal. +/// Creates a static C string wrapper at compile time. /// -/// The string literal should not contain any `NUL` bytes. +/// Rust supports C string literals since Rust 1.77, and they should be us= ed instead of this macro +/// where possible. This macro exists to allow static *non-literal* C stri= ngs to be created at +/// compile time. This is most often used in other macros. +/// +/// # Panics +/// +/// This macro panics if the operand contains an interior `NUL` byte. /// /// # Examples /// /// ``` -/// # use kernel::c_str; +/// # use kernel::c_str_avoid_literals; /// # use kernel::str::CStr; -/// const MY_CSTR: &CStr =3D c_str!("My awesome CStr!"); +/// const MY_CSTR: &CStr =3D c_str_avoid_literals!(concat!(file!(), ":", l= ine!(), ": My CStr!")); /// ``` #[macro_export] -macro_rules! c_str { +macro_rules! c_str_avoid_literals { + // NB: we could write `($str:lit) =3D> compile_error!("use a C string = literal instead");` here but + // that would trigger when the literal is at the top of several macro = expansions. That would be + // too limiting to macro authors, so we rely on the name as a hint ins= tead. ($str:expr) =3D> {{ - const S: &str =3D concat!($str, "\0"); - const C: &$crate::str::CStr =3D match $crate::str::CStr::from_byte= s_with_nul(S.as_bytes()) { - Ok(v) =3D> v, - Err(_) =3D> panic!("string contains interior NUL"), - }; + const S: &'static str =3D concat!($str, "\0"); + const C: &'static $crate::str::CStr =3D + match $crate::str::CStr::from_bytes_with_nul(S.as_bytes()) { + Ok(v) =3D> v, + Err(err) =3D> { + let _: core::ffi::FromBytesWithNulError =3D err; + panic!("string contains interior NUL") + } + }; C }}; } diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs index 36a719015583..424864fb448f 100644 --- a/rust/kernel/sync.rs +++ b/rust/kernel/sync.rs @@ -41,7 +41,6 @@ impl LockClassKey { /// /// # Example /// ``` - /// # use kernel::c_str; /// # use kernel::alloc::KBox; /// # use kernel::types::ForeignOwnable; /// # use kernel::sync::{LockClassKey, SpinLock}; @@ -53,7 +52,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) } @@ -106,9 +105,9 @@ macro_rules! static_lock_class { #[macro_export] macro_rules! optional_name { () =3D> { - $crate::c_str!(::core::concat!(::core::file!(), ":", ::core::line!= ())) + $crate::c_str_avoid_literals!(::core::concat!(::core::file!(), ":"= , ::core::line!())) }; ($name:literal) =3D> { - $crate::c_str!($name) + $crate::c_str_avoid_literals!($name) }; } diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global= .rs index 79d0ef7fda86..0ca23b12427c 100644 --- a/rust/kernel/sync/lock/global.rs +++ b/rust/kernel/sync/lock/global.rs @@ -267,7 +267,8 @@ macro_rules! global_lock { $pub enum $name {} =20 impl $crate::sync::lock::GlobalLockBackend for $name { - const NAME: &'static $crate::str::CStr =3D $crate::c_str!(::co= re::stringify!($name)); + const NAME: &'static $crate::str::CStr =3D + $crate::c_str_avoid_literals!(::core::stringify!($name)); type Item =3D $valuety; type Backend =3D $crate::global_lock_inner!(backend $kind); =20 diff --git a/rust/macros/kunit.rs b/rust/macros/kunit.rs index 99ccac82edde..56469fdcee3f 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::bin= dings::kunit) { bar(); } // // static mut TEST_CASES: [kernel::bindings::kunit_case; 3] =3D [ - // kernel::kunit::kunit_case(kernel::c_str!("foo"), kunit_rust_wra= pper_foo), - // kernel::kunit::kunit_case(kernel::c_str!("bar"), kunit_rust_wra= pper_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(), // ]; // @@ -106,7 +106,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}\"), {ku= nit_wrapper_fn_name})," + " kernel::kunit::kunit_case(c\"{test}\", {kunit_wrapper_fn_= name}),", ) .unwrap(); } diff --git a/rust/macros/module.rs b/rust/macros/module.rs index 44e5cb108cea..7b71d6d99d5c 100644 --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -232,7 +232,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_str!(= \"{name}\"); + const NAME: &'static kernel::str::CStr =3D c\"{name}\"; }} =20 // Double nested modules, since then nobody can access the pub= lic items inside. diff --git a/samples/rust/rust_driver_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_pci.rs b/samples/rust/rust_driver_pci= .rs index 2bb260aebc9e..8da48c1c3c2d 100644 --- a/samples/rust/rust_driver_pci.rs +++ b/samples/rust/rust_driver_pci.rs @@ -4,7 +4,7 @@ //! //! To make this driver probe, QEMU must be run with `-device pci-testdev`. =20 -use kernel::{bindings, c_str, device::Core, devres::Devres, pci, prelude::= *, types::ARef}; +use kernel::{bindings, device::Core, devres::Devres, pci, prelude::*, type= s::ARef}; =20 struct Regs; =20 @@ -73,7 +73,7 @@ fn probe(pdev: &pci::Device, info: &Self::IdInfo) -= > Result pdev.enable_device_mem()?; pdev.set_master(); =20 - let bar =3D pdev.iomap_region_sized::<{ Regs::END }>(0, c_str!("ru= st_driver_pci"))?; + let bar =3D pdev.iomap_region_sized::<{ Regs::END }>(0, c"rust_dri= ver_pci")?; =20 let drvdata =3D KBox::new( Self { diff --git a/samples/rust/rust_driver_platform.rs b/samples/rust/rust_drive= r_platform.rs index 8b42b3cfb363..e6487a970a59 100644 --- a/samples/rust/rust_driver_platform.rs +++ b/samples/rust/rust_driver_platform.rs @@ -2,7 +2,7 @@ =20 //! Rust Platform driver sample. =20 -use kernel::{c_str, device::Core, of, platform, prelude::*, types::ARef}; +use kernel::{device::Core, of, platform, prelude::*, types::ARef}; =20 struct SampleDriver { pdev: ARef, @@ -14,7 +14,7 @@ struct SampleDriver { OF_TABLE, MODULE_OF_TABLE, ::IdInfo, - [(of::DeviceId::new(c_str!("test,rust-device")), Info(42))] + [(of::DeviceId::new(c"test,rust-device"), Info(42))] ); =20 impl platform::Driver for SampleDriver { diff --git a/samples/rust/rust_misc_device.rs b/samples/rust/rust_misc_devi= ce.rs index c881fd6dbd08..12b64296e912 100644 --- a/samples/rust/rust_misc_device.rs +++ b/samples/rust/rust_misc_device.rs @@ -98,7 +98,6 @@ use core::pin::Pin; =20 use kernel::{ - c_str, device::Device, fs::File, ioctl::{_IO, _IOC_SIZE, _IOR, _IOW}, @@ -133,7 +132,7 @@ fn init(_module: &'static ThisModule) -> impl PinInit { pr_info!("Initialising Rust Misc Device Sample\n"); =20 let options =3D MiscDeviceOptions { - name: c_str!("rust-misc-device"), + name: c"rust-misc-device", }; =20 try_pin_init!(Self { --=20 2.49.0 From nobody Fri Dec 19 16:00:56 2025 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9410284672; Sat, 24 May 2025 20:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118819; cv=none; b=oaVYZ3T8AUanV4nvyk121SL195LeDnbZsS0N5X5SAT4O+IatFNOsslEeDG+MwJ0vY9Q69lGRRNGuXVV9vSMQLOpcAWC+NOYM7xIQIzaD7l9ws8bHtq7p4jKYJoNwvL7XkTU9Z+mfUKoxoY7wmgTcTeq7mrE1EkPcKelxFLzOsH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748118819; c=relaxed/simple; bh=kG3kayql0Dgixj0oudGrSc24LiVQtIXol+JSnw1Cu4E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fz7xBUTM1YAOLHySgbpwVO6RnkWNuF5+dppg90lQoPNILULz8h4QOsDdac6s+noNYU6/RPeUokZgIOfEt08I3cpSUSVIwyCS8XUIGpbBJSZDqjw+Ys/X47t8I84LHp9b64SAOvFjTSmU9z/eEHbhPKx8UjDjJfZqk+7RBB6//LU= 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=EIYGqqui; arc=none smtp.client-ip=209.85.222.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EIYGqqui" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7caea4bc9e9so164599785a.1; Sat, 24 May 2025 13:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748118814; x=1748723614; 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=QiDLXiIEZDFy2THLzL+Zk1Qw/KsOCaFIvwT2meUVX0s=; b=EIYGqquid6pfzhvnm6mbr1TsjYxmR25h4PaejZSSfr7qjyeXEEVXj+2E9z8+kf4dUH c8UwTvNgB15puTvbO5O+hpsyPpeG6CSOuo64v4KPp3dU1cc4pIFTIZ+GPK2k+o/IHdNO kUKoO3iTtH+oR73lsKUX9pZXlUviEUWlA8mfCuPJOZrC+pZ1aemYY6HnE6a1LLsstJa3 7VNt7mELDPoBJHTBAiDcK4yuzwdbHDKTA/HZdSi/nK7Fhl4EIgPRj7+2i6MngsAgm90q 9esGUcxE4IC6HHXmZseVYoKj76Ug2zBarKd/yKj/bBInA97O7MPbz8G8h8p3F/CvrIlM Z4TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748118814; x=1748723614; 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=QiDLXiIEZDFy2THLzL+Zk1Qw/KsOCaFIvwT2meUVX0s=; b=c5AT3jOTna1Gs14J4QhS/TzWIC3G1i4i0Gh++kzTuBH0mi4wgyttm/tDTYF/NDQRdx yfNoTyCTeKiQCAkCTHw6KLeRW+hYxFHcOEmQ1RBPi7apPkA2oyT/LMx0AhmPMg257RBv pwwurRZ2XoCCcB+Mny9ojgfrAkeTEFdZAvoqRXrlbFrVGJsr3ewAF4BIaeHp1+TO4oy0 D4RLqgaRyq9ScHQK+MnNoiwTfihQxu4vLN5VtiLzGamaW1wixS+zCelkuCDwGtPelBPE bpkAr4VGwlcgKCt/ze9t9eiMCqvQ/HOeR+QIlcNStG56oRgw1M1Se+yYxzBeAeLLygsP GyuA== X-Forwarded-Encrypted: i=1; AJvYcCUQHFNNhZ+/qg6ZCy1cffQc/557jtyRPTUNKCNvObCKB0ABa3CCLXmHwQCDXXCiC4USA1nyBoMLRTpD5zhr@vger.kernel.org, AJvYcCUgSWktEHldcJAsHscNGGl37YNq38fZIsvIPHKmv7RHMAZzP5k5i0hxFccGKUKPe0lOgL5ZtIZ9l2jwjKRA+oe9@vger.kernel.org, AJvYcCW3kGIAXX2dgspiBn1KEgY+NO01TVcVmS4fBLrolRxS35J/b+6y4CggZCvl6o3Xzq8QDEbyGAjJu1PnmiU=@vger.kernel.org, AJvYcCWwE9lmNI8m92873Dfvjn7rh4xE6UrL41m/i1rhQ5umIEQzQhtDLUOq8epF36Vu5oKcTtk/CuvM@vger.kernel.org, AJvYcCXUVYjdsreUgzoSTK8CvuBndF9jTpjfGXpDK8mc3qvyxdrRFqexWnaeSidW7wDPfhYAUJjE16Yg/db2@vger.kernel.org, AJvYcCXY/ugry9HaA8O0mvb8b4pQMQrgGNFd95sf65I0wakB3MzGWUcTD67CtbnWqsb7qPzbF/RtkrZ+K5Y1@vger.kernel.org X-Gm-Message-State: AOJu0YxnlpQywVo8OKGvU0tdra+zxufcF7S9Wmtz2vNxyIX7nF8y2Yaz 9j7YxYZIrNJMo+iKJylDc6++AykvfuhHzQTcL7caGTDweME985gGgXH3 X-Gm-Gg: ASbGncsk1R3UXNhW6lhnUc2KbwLyX0YIe1Mp3EQj+cXE7mEV5hXyyNEsUFdCOjJQYuE asbC47svTJji0/HXfQ0lK7oc0y1pfp9g4kXHKDTCORDtZNKHiBTSalgH0SYXQybfCscBRu+WYRg Q2slACBj8luUCktV12u1xA6jYXqMfJIu8qj45SmoOhU0LcqOF7jIS8QnUULWQ0LM5QkEB2WlUxF 7eTBzdImtYzLdY3n9k/6Ab+iwbSoHLKTgxRrzBz5KbLoYF5cX9DK3Q/4oXJW1HwArPY8hT1qczk QxMFh1ed450D0XL7jJvcTw76RZ7KbomUgvDyiDPRjVpWddL6f8zHqlwtJR2cjPoLPZ2i3p+4ELq ZVLkmW6BBpFB/73Rvpjf1CoH65Tyzs5sqOWO96F0AiazpkE7fsXcAtwHWVdMBMTuIZHF35u2QCT QRaXA= X-Google-Smtp-Source: AGHT+IEMkpMqvA9WNOdlKWZQIKQWr5E+dkEd8TNERyCMUwX04el93uDr7qE0Ky3NEaktXvs2xOj0Pw== X-Received: by 2002:a05:620a:244e:b0:7ce:d95e:8d9a with SMTP id af79cd13be357-7ceecbdc4a4mr561212585a.28.1748118814246; Sat, 24 May 2025 13:33:34 -0700 (PDT) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:8563:e370:791f:7436]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7cd467d7fd1sm1379590085a.29.2025.05.24.13.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 13:33:33 -0700 (PDT) From: Tamir Duberstein Date: Sat, 24 May 2025 16:33:05 -0400 Subject: [PATCH v10 5/5] rust: remove core::ffi::CStr reexport Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250524-cstr-core-v10-5-6412a94d9d75@gmail.com> References: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> In-Reply-To: <20250524-cstr-core-v10-0-6412a94d9d75@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Brendan Higgins , David Gow , Rae Moar , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , FUJITA Tomonori , Rob Herring , Saravana Kannan , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Arnd Bergmann , Jens Axboe , Benno Lossin , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-pci@vger.kernel.org, nouveau@lists.freedesktop.org, linux-block@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Clean up references to `kernel::str::CStr`. Signed-off-by: Tamir Duberstein --- drivers/gpu/drm/drm_panic_qr.rs | 3 ++- drivers/gpu/nova-core/firmware.rs | 2 +- drivers/net/phy/ax88796b_rust.rs | 1 + drivers/net/phy/qt2025.rs | 1 + rust/kernel/device.rs | 3 +-- rust/kernel/driver.rs | 4 ++-- rust/kernel/error.rs | 6 ++---- rust/kernel/faux.rs | 5 ++++- rust/kernel/firmware.rs | 15 ++++----------- rust/kernel/kunit.rs | 6 +++--- rust/kernel/lib.rs | 2 +- rust/kernel/miscdevice.rs | 3 +-- rust/kernel/net/phy.rs | 4 +++- rust/kernel/of.rs | 3 ++- rust/kernel/pci.rs | 2 +- rust/kernel/platform.rs | 2 +- rust/kernel/prelude.rs | 5 +---- rust/kernel/str.rs | 22 ++++++++++------------ rust/kernel/sync/condvar.rs | 4 ++-- rust/kernel/sync/lock.rs | 4 ++-- rust/kernel/sync/lock/global.rs | 5 +++-- rust/kernel/sync/poll.rs | 1 + rust/kernel/workqueue.rs | 1 + rust/macros/module.rs | 2 +- 24 files changed, 51 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr= .rs index d8192a9bef63..ba63238d352f 100644 --- a/drivers/gpu/drm/drm_panic_qr.rs +++ b/drivers/gpu/drm/drm_panic_qr.rs @@ -27,7 +27,8 @@ //! * //! * =20 -use kernel::{prelude::*, str::CStr}; +use core::ffi::CStr; +use kernel::prelude::*; =20 #[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd)] struct Version(usize); diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firm= ware.rs index 6e6361c59ca1..0af1f0df2fa5 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -30,7 +30,7 @@ const fn make_entry_chipset(self, chipset: &str) -> Self { } =20 pub(crate) const fn create( - module_name: &'static kernel::str::CStr, + module_name: &'static core::ffi::CStr, ) -> firmware::ModInfoBuilder { let mut this =3D Self(firmware::ModInfoBuilder::new(module_name)); let mut i =3D 0; diff --git a/drivers/net/phy/ax88796b_rust.rs b/drivers/net/phy/ax88796b_ru= st.rs index 2d24628a4e58..68b8e30ae296 100644 --- a/drivers/net/phy/ax88796b_rust.rs +++ b/drivers/net/phy/ax88796b_rust.rs @@ -4,6 +4,7 @@ //! Rust Asix PHYs driver //! //! C version of this driver: [`drivers/net/phy/ax88796b.c`](./ax88796b.c) +use core::ffi::CStr; use kernel::{ net::phy::{self, reg::C22, DeviceId, Driver}, prelude::*, diff --git a/drivers/net/phy/qt2025.rs b/drivers/net/phy/qt2025.rs index 9ccc75f70219..78ce2866f2b6 100644 --- a/drivers/net/phy/qt2025.rs +++ b/drivers/net/phy/qt2025.rs @@ -9,6 +9,7 @@ //! //! The QT2025 PHY integrates an Intel 8051 micro-controller. =20 +use core::ffi::CStr; use kernel::error::code; use kernel::firmware::Firmware; use kernel::net::phy::{ diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs index 9074322c79e8..2cf5903f7dde 100644 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@ -6,10 +6,9 @@ =20 use crate::{ bindings, - str::CStr, types::{ARef, Opaque}, }; -use core::{fmt, ptr}; +use core::{ffi::CStr, fmt, ptr}; =20 #[cfg(CONFIG_PRINTK)] use crate::str::CStrExt as _; diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs index ec9166cedfa7..9926664d9ba2 100644 --- a/rust/kernel/driver.rs +++ b/rust/kernel/driver.rs @@ -6,8 +6,8 @@ //! register using the [`Registration`] class. =20 use crate::error::{Error, Result}; -use crate::{device, of, str::CStr, try_pin_init, types::Opaque, ThisModule= }; -use core::pin::Pin; +use crate::{device, of, try_pin_init, types::Opaque, ThisModule}; +use core::{ffi::CStr, pin::Pin}; use pin_init::{pin_data, pinned_drop, PinInit}; =20 /// The [`RegistrationOps`] trait serves as generic interface for subsyste= ms (e.g., PCI, Platform, diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 933c048c04f1..b2b46d26f7b7 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -4,11 +4,9 @@ //! //! C header: [`include/uapi/asm-generic/errno-base.h`](srctree/include/ua= pi/asm-generic/errno-base.h) =20 -use crate::{ - alloc::{layout::LayoutError, AllocError}, - str::CStr, -}; +use crate::alloc::{layout::LayoutError, AllocError}; =20 +use core::ffi::CStr; use core::fmt; use core::num::NonZeroI32; use core::num::TryFromIntError; diff --git a/rust/kernel/faux.rs b/rust/kernel/faux.rs index 8a50fcd4c9bb..d9e5cd265101 100644 --- a/rust/kernel/faux.rs +++ b/rust/kernel/faux.rs @@ -7,7 +7,10 @@ //! C header: [`include/linux/device/faux.h`] =20 use crate::{bindings, device, error::code::*, prelude::*}; -use core::ptr::{addr_of_mut, null, null_mut, NonNull}; +use core::{ + ffi::CStr, + ptr::{addr_of_mut, null, null_mut, NonNull}, +}; =20 /// The registration of a faux device. /// diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index 09fd3a27bcf0..4ba5e5589d7b 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -4,15 +4,8 @@ //! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.= h) =20 -use crate::{ - bindings, - device::Device, - error::Error, - error::Result, - ffi, - str::{CStr, CStrExt as _}, -}; -use core::ptr::NonNull; +use crate::{bindings, device::Device, error::Error, error::Result, ffi, st= r::CStrExt as _}; +use core::{ffi::CStr, ptr::NonNull}; =20 /// # Invariants /// @@ -168,7 +161,7 @@ unsafe impl Sync for Firmware {} /// const DIR: &'static str =3D "vendor/chip/"; /// const FILES: [&'static str; 3] =3D [ "foo", "bar", "baz" ]; /// -/// const fn create(module_name: &'static kernel::str::CStr) -> firmwa= re::ModInfoBuilder { +/// const fn create(module_name: &'static core::ffi::CStr) -> firmware= ::ModInfoBuilder { /// let mut builder =3D firmware::ModInfoBuilder::new(module_name); /// /// let mut i =3D 0; @@ -202,7 +195,7 @@ macro_rules! module_firmware { // this macro. Hence, we can neither use `expr` nor `ty`. ($($builder:tt)*) =3D> { const _: () =3D { - const __MODULE_FIRMWARE_PREFIX: &'static $crate::str::CStr =3D= if cfg!(MODULE) { + const __MODULE_FIRMWARE_PREFIX: &'static ::core::ffi::CStr =3D= if cfg!(MODULE) { c"" } else { ::NAME diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 09148e982f48..83b48e2f8379 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -58,9 +58,9 @@ macro_rules! kunit_assert { break 'out; } =20 - static FILE: &'static $crate::str::CStr =3D $crate::c_str_avoi= d_literals!($file); + static FILE: &'static core::ffi::CStr =3D $crate::c_str_avoid_= literals!($file); static LINE: i32 =3D core::line!() as i32 - $diff; - static CONDITION: &'static $crate::str::CStr =3D + static CONDITION: &'static core::ffi::CStr =3D $crate::c_str_avoid_literals!(stringify!($condition)); =20 // SAFETY: FFI call without safety requirements. @@ -171,7 +171,7 @@ macro_rules! kunit_assert_eq { /// Use [`kunit_case_null`] to generate such a delimiter. #[doc(hidden)] pub const fn kunit_case( - name: &'static kernel::str::CStr, + name: &'static core::ffi::CStr, run_case: unsafe extern "C" fn(*mut kernel::bindings::kunit), ) -> kernel::bindings::kunit_case { kernel::bindings::kunit_case { diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index ec48c818d512..d36b123c518b 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -152,7 +152,7 @@ fn init(module: &'static ThisModule) -> impl pin_init::= PinInit u32 { /// /// ``` /// # mod module_phy_driver_sample { +/// use core::ffi::CStr; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// @@ -807,6 +808,7 @@ const fn as_int(&self) -> u32 { /// This expands to the following code: /// /// ```ignore +/// use core::ffi::CStr; /// use kernel::net::phy::{self, DeviceId}; /// use kernel::prelude::*; /// diff --git a/rust/kernel/of.rs b/rust/kernel/of.rs index 12ea65df46de..087ac8e05551 100644 --- a/rust/kernel/of.rs +++ b/rust/kernel/of.rs @@ -2,7 +2,8 @@ =20 //! Device Tree / Open Firmware abstractions. =20 -use crate::{bindings, device_id::RawDeviceId, prelude::*}; +use crate::{bindings, device_id::RawDeviceId}; +use core::ffi::CStr; =20 /// IdTable type for OF drivers. pub type IdTable =3D &'static dyn kernel::device_id::IdTable; diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs index 3aeb1250c27f..b639e6a1f590 100644 --- a/rust/kernel/pci.rs +++ b/rust/kernel/pci.rs @@ -13,11 +13,11 @@ error::{to_result, Result}, io::Io, io::IoRaw, - str::CStr, types::{ARef, ForeignOwnable, Opaque}, ThisModule, }; use core::{ + ffi::CStr, marker::PhantomData, ops::Deref, ptr::{addr_of_mut, NonNull}, diff --git a/rust/kernel/platform.rs b/rust/kernel/platform.rs index 7163fc468b32..ba580a4e3416 100644 --- a/rust/kernel/platform.rs +++ b/rust/kernel/platform.rs @@ -9,12 +9,12 @@ error::{to_result, Result}, of, prelude::*, - str::CStr, types::{ARef, ForeignOwnable, Opaque}, ThisModule, }; =20 use core::{ + ffi::CStr, marker::PhantomData, ops::Deref, ptr::{addr_of_mut, NonNull}, diff --git a/rust/kernel/prelude.rs b/rust/kernel/prelude.rs index 97e8bcf73669..5d55e274b41e 100644 --- a/rust/kernel/prelude.rs +++ b/rust/kernel/prelude.rs @@ -35,10 +35,7 @@ =20 pub use super::error::{code::*, Error, Result}; =20 -pub use super::{ - str::{CStr, CStrExt as _}, - ThisModule, -}; +pub use super::{str::CStrExt as _, ThisModule}; =20 pub use super::init::InPlaceInit; =20 diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index 0385d927fcd5..cf0402d1daac 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -3,6 +3,7 @@ //! String representations. =20 use crate::alloc::{flags::*, AllocError, KVec}; +use core::ffi::CStr; use core::fmt::{self, Write}; use core::ops::{Deref, DerefMut, Index}; =20 @@ -175,8 +176,6 @@ macro_rules! b_str { }}; } =20 -pub use core::ffi::CStr; - /// Returns a C pointer to the string. // It is a free function rather than a method on an extension trait becaus= e: // @@ -267,7 +266,6 @@ impl fmt::Display for crate::fmt::Adapter<&CStr> { /// /// ``` /// # use kernel::prelude::fmt; - /// # use kernel::str::CStr; /// # use kernel::str::CString; /// let penguin =3D c"=F0=9F=90=A7"; /// let s =3D CString::try_from_fmt(fmt!("{}", penguin))?; @@ -377,8 +375,8 @@ fn as_ref(&self) -> &BStr { /// # Examples /// /// ``` +/// # use core::ffi::CStr; /// # use kernel::c_str_avoid_literals; -/// # use kernel::str::CStr; /// const MY_CSTR: &CStr =3D c_str_avoid_literals!(concat!(file!(), ":", l= ine!(), ": My CStr!")); /// ``` #[macro_export] @@ -388,14 +386,14 @@ macro_rules! c_str_avoid_literals { // too limiting to macro authors, so we rely on the name as a hint ins= tead. ($str:expr) =3D> {{ const S: &'static str =3D concat!($str, "\0"); - const C: &'static $crate::str::CStr =3D - match $crate::str::CStr::from_bytes_with_nul(S.as_bytes()) { - Ok(v) =3D> v, - Err(err) =3D> { - let _: core::ffi::FromBytesWithNulError =3D err; - panic!("string contains interior NUL") - } - }; + const C: &'static core::ffi::CStr =3D match core::ffi::CStr::from_= bytes_with_nul(S.as_bytes()) + { + Ok(v) =3D> v, + Err(err) =3D> { + let _: core::ffi::FromBytesWithNulError =3D err; + panic!("string contains interior NUL") + } + }; C }}; } diff --git a/rust/kernel/sync/condvar.rs b/rust/kernel/sync/condvar.rs index 0b6bc7f2878d..09bc35feb451 100644 --- a/rust/kernel/sync/condvar.rs +++ b/rust/kernel/sync/condvar.rs @@ -8,14 +8,14 @@ use super::{lock::Backend, lock::Guard, LockClassKey}; use crate::{ ffi::{c_int, c_long}, - str::{CStr, CStrExt as _}, + str::CStrExt as _, task::{ MAX_SCHEDULE_TIMEOUT, TASK_FREEZABLE, TASK_INTERRUPTIBLE, TASK_NOR= MAL, TASK_UNINTERRUPTIBLE, }, time::Jiffies, types::Opaque, }; -use core::{marker::PhantomPinned, pin::Pin, ptr}; +use core::{ffi::CStr, marker::PhantomPinned, pin::Pin, ptr}; use pin_init::{pin_data, pin_init, PinInit}; =20 /// Creates a [`CondVar`] initialiser with the given name and a newly-crea= ted lock class. diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs index a777a22976e0..21deff0bb13b 100644 --- a/rust/kernel/sync/lock.rs +++ b/rust/kernel/sync/lock.rs @@ -7,10 +7,10 @@ =20 use super::LockClassKey; use crate::{ - str::{CStr, CStrExt as _}, + str::CStrExt as _, types::{NotThreadSafe, Opaque, ScopeGuard}, }; -use core::{cell::UnsafeCell, marker::PhantomPinned, pin::Pin}; +use core::{cell::UnsafeCell, ffi::CStr, marker::PhantomPinned, pin::Pin}; use pin_init::{pin_data, pin_init, PinInit}; =20 pub mod mutex; diff --git a/rust/kernel/sync/lock/global.rs b/rust/kernel/sync/lock/global= .rs index 0ca23b12427c..bfeaa21ab101 100644 --- a/rust/kernel/sync/lock/global.rs +++ b/rust/kernel/sync/lock/global.rs @@ -5,13 +5,14 @@ //! Support for defining statics containing locks. =20 use crate::{ - str::{CStr, CStrExt as _}, + str::CStrExt as _, sync::lock::{Backend, Guard, Lock}, sync::{LockClassKey, LockedBy}, types::Opaque, }; use core::{ cell::UnsafeCell, + ffi::CStr, marker::{PhantomData, PhantomPinned}, pin::Pin, }; @@ -267,7 +268,7 @@ macro_rules! global_lock { $pub enum $name {} =20 impl $crate::sync::lock::GlobalLockBackend for $name { - const NAME: &'static $crate::str::CStr =3D + const NAME: &'static core::ffi::CStr =3D $crate::c_str_avoid_literals!(::core::stringify!($name)); type Item =3D $valuety; type Backend =3D $crate::global_lock_inner!(backend $kind); diff --git a/rust/kernel/sync/poll.rs b/rust/kernel/sync/poll.rs index d7e6e59e124b..bf2fb24d04ea 100644 --- a/rust/kernel/sync/poll.rs +++ b/rust/kernel/sync/poll.rs @@ -11,6 +11,7 @@ sync::{CondVar, LockClassKey}, types::Opaque, }; +use core::ffi::CStr; use core::ops::Deref; =20 /// Creates a [`PollCondVar`] initialiser with the given name and a newly-= created lock class. diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index f98bd02b838f..c64769ef5b90 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -135,6 +135,7 @@ =20 use crate::alloc::{AllocError, Flags}; use crate::{prelude::*, sync::Arc, sync::LockClassKey, types::Opaque}; +use core::ffi::CStr; use core::marker::PhantomData; =20 /// Creates a [`Work`] initialiser with the given name and a newly-created= lock class. diff --git a/rust/macros/module.rs b/rust/macros/module.rs index 7b71d6d99d5c..5246fed82e63 100644 --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -232,7 +232,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 c\"{name}\"; + const NAME: &'static core::ffi::CStr =3D c\"{name}\"; }} =20 // Double nested modules, since then nobody can access the pub= lic items inside. --=20 2.49.0