[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJ-ks9=Q2+zmBzq36aYnePmRm2b5NL3buMXP36FpmnJ+UU3FWQ@mail.gmail.com>
Date: Fri, 4 Jul 2025 15:38:53 -0400
From: Tamir Duberstein <tamird@...il.com>
To: Benno Lossin <lossin@...nel.org>
Cc: Michal Rostecki <vadorovsky@...tonmail.com>, Miguel Ojeda <ojeda@...nel.org>,
Alex Gaynor <alex.gaynor@...il.com>, Boqun Feng <boqun.feng@...il.com>,
Gary Guo <gary@...yguo.net>, Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Andreas Hindborg <a.hindborg@...nel.org>, Alice Ryhl <aliceryhl@...gle.com>,
Trevor Gross <tmgross@...ch.edu>, Brendan Higgins <brendan.higgins@...ux.dev>,
David Gow <davidgow@...gle.com>, Rae Moar <rmoar@...gle.com>,
Danilo Krummrich <dakr@...nel.org>, Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Maxime Ripard <mripard@...nel.org>, Thomas Zimmermann <tzimmermann@...e.de>,
David Airlie <airlied@...il.com>, Simona Vetter <simona@...ll.ch>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>, "Rafael J. Wysocki" <rafael@...nel.org>,
Luis Chamberlain <mcgrof@...nel.org>, Russ Weight <russ.weight@...ux.dev>,
FUJITA Tomonori <fujita.tomonori@...il.com>, Rob Herring <robh@...nel.org>,
Saravana Kannan <saravanak@...gle.com>, Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>, Will Deacon <will@...nel.org>, Waiman Long <longman@...hat.com>,
Nathan Chancellor <nathan@...nel.org>, Nick Desaulniers <nick.desaulniers+lkml@...il.com>,
Bill Wendling <morbo@...gle.com>, Justin Stitt <justinstitt@...gle.com>, Andrew Lunn <andrew@...n.ch>,
Heiner Kallweit <hkallweit1@...il.com>, Russell King <linux@...linux.org.uk>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Bjorn Helgaas <bhelgaas@...gle.com>,
Arnd Bergmann <arnd@...db.de>, Jens Axboe <axboe@...nel.dk>,
Krzysztof Wilczyński <kwilczynski@...nel.org>,
Dave Ertman <david.m.ertman@...el.com>, Ira Weiny <ira.weiny@...el.com>,
Leon Romanovsky <leon@...nel.org>, Breno Leitao <leitao@...ian.org>,
Viresh Kumar <viresh.kumar@...aro.org>, Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>, rust-for-linux@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-kselftest@...r.kernel.org,
kunit-dev@...glegroups.com, dri-devel@...ts.freedesktop.org,
netdev@...r.kernel.org, devicetree@...r.kernel.org, llvm@...ts.linux.dev,
linux-pci@...r.kernel.org, nouveau@...ts.freedesktop.org,
linux-block@...r.kernel.org, linux-pm@...r.kernel.org,
linux-clk@...r.kernel.org
Subject: Re: [PATCH v13 3/5] rust: replace `CStr` with `core::ffi::CStr`
On Fri, Jul 4, 2025 at 9:00 AM Benno Lossin <lossin@...nel.org> wrote:
>
> On Tue Jul 1, 2025 at 6:49 PM CEST, Tamir Duberstein wrote:
> > `kernel::ffi::CStr` was introduced in commit d126d2380131 ("rust: str:
> > add `CStr` type") in November 2022 as an upstreaming of earlier work
> > that was done in May 2021[0]. That earlier work, having predated the
> > inclusion of `CStr` in `core`, largely duplicated the implementation of
> > `std::ffi::CStr`.
> >
> > `std::ffi::CStr` was moved to `core::ffi::CStr` in Rust 1.64 in
> > September 2022. Hence replace `kernel::str::CStr` with `core::ffi::CStr`
> > to reduce our custom code footprint, and retain needed custom
> > functionality through an extension trait.
> >
> > C-String literals were added in Rust 1.77, while our MSRV is 1.78. Thus
> > opportunistically replace instances of `kernel::c_str!` with C-String
> > literals where other code changes were already necessary or where
> > existing code triggered clippy lints; the rest will be done in a later
> > commit.
> >
> > Link: https://github.com/Rust-for-Linux/linux/commit/faa3cbcca03d0dec8f8e43f1d8d5c0860d98a23f [0]
> > Acked-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> > Reviewed-by: Alice Ryhl <aliceryhl@...gle.com>
> > Signed-off-by: Tamir Duberstein <tamird@...il.com>
> > ---
> > drivers/gpu/drm/drm_panic_qr.rs | 2 +-
> > rust/kernel/auxiliary.rs | 4 +-
> > rust/kernel/configfs.rs | 4 +-
> > rust/kernel/cpufreq.rs | 2 +-
> > rust/kernel/device.rs | 4 +-
> > rust/kernel/drm/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 | 394 +++++++++++-----------------------------
> > rust/kernel/sync/condvar.rs | 2 +-
> > rust/kernel/sync/lock.rs | 2 +-
> > rust/kernel/sync/lock/global.rs | 2 +-
> > samples/rust/rust_configfs.rs | 2 +-
> > 19 files changed, 140 insertions(+), 318 deletions(-)
>
> Is it also possible to split this? First rename the existing functions
> on our CStr to match upstream & then you don't need to do the rename &
> removal of our CStr in the same patch?
Yes.
Powered by blists - more mailing lists