mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
89eed1ab11
This is the second upgrade to the Rust toolchain, from 1.68.2 to 1.71.1
(i.e. the latest).
See the upgrade policy [1] and the comments on the first upgrade in
commit 3ed03f4da0 ("rust: upgrade to Rust 1.68.2").
# Unstable features
No unstable features (that we use) were stabilized.
Therefore, the only unstable feature allowed to be used outside
the `kernel` crate is still `new_uninit`, though other code to be
upstreamed may increase the list.
Please see [2] for details.
# Required changes
For the upgrade, this patch requires the following changes:
- Removal of the `__rust_*` allocator functions, together with
the addition of the `__rust_no_alloc_shim_is_unstable` static.
See [3] for details.
- Some more compiler builtins added due to `<f{32,64}>::midpoint()`
that got added in Rust 1.71 [4].
# `alloc` upgrade and reviewing
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://rust-for-linux.com/rust-version-policy [1]
Link: https://github.com/Rust-for-Linux/linux/issues/2 [2]
Link: https://github.com/rust-lang/rust/pull/86844 [3]
Link: https://github.com/rust-lang/rust/pull/92048 [4]
Closes: https://github.com/Rust-for-Linux/linux/issues/68
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
Reviewed-by: Trevor Gross <tmgross@umich.edu>
Link: https://lore.kernel.org/r/20230729220317.416771-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
73 lines
2 KiB
Rust
73 lines
2 KiB
Rust
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//! Our own `compiler_builtins`.
|
|
//!
|
|
//! Rust provides [`compiler_builtins`] as a port of LLVM's [`compiler-rt`].
|
|
//! Since we do not need the vast majority of them, we avoid the dependency
|
|
//! by providing this file.
|
|
//!
|
|
//! At the moment, some builtins are required that should not be. For instance,
|
|
//! [`core`] has 128-bit integers functionality which we should not be compiling
|
|
//! in. We will work with upstream [`core`] to provide feature flags to disable
|
|
//! the parts we do not need. For the moment, we define them to [`panic!`] at
|
|
//! runtime for simplicity to catch mistakes, instead of performing surgery
|
|
//! on `core.o`.
|
|
//!
|
|
//! In any case, all these symbols are weakened to ensure we do not override
|
|
//! those that may be provided by the rest of the kernel.
|
|
//!
|
|
//! [`compiler_builtins`]: https://github.com/rust-lang/compiler-builtins
|
|
//! [`compiler-rt`]: https://compiler-rt.llvm.org/
|
|
|
|
#![feature(compiler_builtins)]
|
|
#![compiler_builtins]
|
|
#![no_builtins]
|
|
#![no_std]
|
|
|
|
macro_rules! define_panicking_intrinsics(
|
|
($reason: tt, { $($ident: ident, )* }) => {
|
|
$(
|
|
#[doc(hidden)]
|
|
#[export_name = concat!("__rust", stringify!($ident))]
|
|
pub extern "C" fn $ident() {
|
|
panic!($reason);
|
|
}
|
|
)*
|
|
}
|
|
);
|
|
|
|
define_panicking_intrinsics!("`f32` should not be used", {
|
|
__addsf3,
|
|
__eqsf2,
|
|
__gesf2,
|
|
__lesf2,
|
|
__ltsf2,
|
|
__mulsf3,
|
|
__nesf2,
|
|
__unordsf2,
|
|
});
|
|
|
|
define_panicking_intrinsics!("`f64` should not be used", {
|
|
__adddf3,
|
|
__ledf2,
|
|
__ltdf2,
|
|
__muldf3,
|
|
__unorddf2,
|
|
});
|
|
|
|
define_panicking_intrinsics!("`i128` should not be used", {
|
|
__ashrti3,
|
|
__muloti4,
|
|
__multi3,
|
|
});
|
|
|
|
define_panicking_intrinsics!("`u128` should not be used", {
|
|
__ashlti3,
|
|
__lshrti3,
|
|
__udivmodti4,
|
|
__udivti3,
|
|
__umodti3,
|
|
});
|
|
|
|
// NOTE: if you are adding a new intrinsic here, you should also add it to
|
|
// `redirect-intrinsics` in `rust/Makefile`.
|