Skip to content

Commit a2ba7cc

Browse files
ojedafbq
authored andcommittedMar 29, 2024
rust: upgrade to Rust 1.77.0
This is the next upgrade to the Rust toolchain, from 1.76.0 to 1.77.0 (i.e. the latest) [1]. See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4 ("rust: upgrade to Rust 1.68.2"). The `offset_of` feature (single-field `offset_of!`) that we were using got stabilized in Rust 1.77.0 [3]. Therefore, now the only unstable features allowed to be used outside the `kernel` crate is `new_uninit`, though other code to be upstreamed may increase the list. Please see [4] for details. Rust 1.77.0 merged the `unused_tuple_struct_fields` lint into `dead_code`, thus upgrading it from `allow` to `warn` [5]. In turn, this makes `rustc` complain about the `ThisModule`'s pointer field being never read. Thus locally `allow` it for the moment, since we will have users later on (e.g. Binder needs a `as_ptr` method [6]). Rust 1.77.0 introduces the `--check-cfg` feature [7], for which there is a Call for Testing going on [8]. We were requested to test it and we found it useful [9] -- we will likely enable it in the future. The vast majority of changes are due to our `alloc` fork being upgraded at once. There are two kinds of changes to be aware of: the ones coming from upstream, which we should follow as closely as possible, and the updates needed in our added fallible APIs to keep them matching the newer infallible APIs coming from upstream. Instead of taking a look at the diff of this patch, an alternative approach is reviewing a diff of the changes between upstream `alloc` and the kernel's. This allows to easily inspect the kernel additions only, especially to check if the fallible methods we already have still match the infallible ones in the new version coming from upstream. Another approach is reviewing the changes introduced in the additions in the kernel fork between the two versions. This is useful to spot potentially unintended changes to our additions. To apply these approaches, one may follow steps similar to the following to generate a pair of patches that show the differences between upstream Rust and the kernel (for the subset of `alloc` we use) before and after applying this patch: # Get the difference with respect to the old version. git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) git -C linux ls-tree -r --name-only HEAD -- rust/alloc | cut -d/ -f3- | grep -Fv README.md | xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH git -C linux diff --patch-with-stat --summary -R > old.patch git -C linux restore rust/alloc # Apply this patch. git -C linux am rust-upgrade.patch # Get the difference with respect to the new version. git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) git -C linux ls-tree -r --name-only HEAD -- rust/alloc | cut -d/ -f3- | grep -Fv README.md | xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH git -C linux diff --patch-with-stat --summary -R > new.patch git -C linux restore rust/alloc Now one may check the `new.patch` to take a look at the additions (first approach) or at the difference between those two patches (second approach). For the latter, a side-by-side tool is recommended. Link: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1770-2024-03-21 [1] Link: https://rust-for-linux.com/rust-version-policy [2] Link: rust-lang/rust#118799 [3] Link: #2 [4] Link: rust-lang/rust#118297 [5] Link: https://lore.kernel.org/rust-for-linux/20231101-rust-binder-v1-2-08ba9197f637@google.com/#Z31rust:kernel:lib.rs [6] Link: https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html [7] Link: rust-lang/rfcs#3013 (comment) [8] Link: rust-lang/rust#82450 (comment) [9] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Link: https://lore.kernel.org/r/20240217002717.57507-1-ojeda@kernel.org [boqun: Resolve the conflicts with using upstream alloc]
1 parent cdc13ea commit a2ba7cc

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed
 

‎Documentation/process/changes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ you probably needn't concern yourself with pcmciautils.
3131
====================== =============== ========================================
3232
GNU C 5.1 gcc --version
3333
Clang/LLVM (optional) 13.0.1 clang --version
34-
Rust (optional) 1.76.0 rustc --version
34+
Rust (optional) 1.77.0 rustc --version
3535
bindgen (optional) 0.65.1 bindgen --version
3636
GNU make 3.82 make --version
3737
bash 4.2 bash --version

‎rust/kernel/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![feature(coerce_unsized)]
1616
#![feature(dispatch_from_dyn)]
1717
#![feature(new_uninit)]
18-
#![feature(offset_of)]
1918
#![feature(receiver_trait)]
2019
#![feature(unsize)]
2120

@@ -75,7 +74,7 @@ pub trait Module: Sized + Sync {
7574
/// Equivalent to `THIS_MODULE` in the C API.
7675
///
7776
/// C header: [`include/linux/export.h`](srctree/include/linux/export.h)
78-
pub struct ThisModule(*mut bindings::module);
77+
pub struct ThisModule(#[allow(dead_code)] *mut bindings::module);
7978

8079
// SAFETY: `THIS_MODULE` may be used from all threads within a module.
8180
unsafe impl Sync for ThisModule {}

‎scripts/Makefile.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ $(obj)/%.lst: $(src)/%.c FORCE
263263
# Compile Rust sources (.rs)
264264
# ---------------------------------------------------------------------------
265265

266-
rust_allowed_features := new_uninit,offset_of
266+
rust_allowed_features := new_uninit
267267

268268
# `--out-dir` is required to avoid temporaries being created by `rustc` in the
269269
# current working directory, which may be not accessible in the out-of-tree

‎scripts/min-tool-version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ llvm)
3333
fi
3434
;;
3535
rustc)
36-
echo 1.76.0
36+
echo 1.77.0
3737
;;
3838
bindgen)
3939
echo 0.65.1

0 commit comments

Comments
 (0)
Please sign in to comment.