Skip to content

Commit f8497dd

Browse files
ojedaherrnst
authored andcommitted
rust: upgrade to Rust 1.71.0
This is the second upgrade to the Rust toolchain, from 1.68.2 to 1.71.0 (i.e. the latest). See the upgrade policy [1] and the comments on the first upgrade in commit 3ed03f4 ("rust: upgrade to Rust 1.68.2"). 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. 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]. 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: Rust-for-Linux/linux#2 [2] Link: rust-lang/rust#86844 [3] Link: rust-lang/rust#92048 [4] Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 223af23 commit f8497dd

14 files changed

+208
-253
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) 11.0.0 clang --version
34-
Rust (optional) 1.68.2 rustc --version
34+
Rust (optional) 1.71.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/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ rust-analyzer:
378378
$(RUST_LIB_SRC) > $(objtree)/rust-project.json
379379

380380
redirect-intrinsics = \
381-
__eqsf2 __gesf2 __lesf2 __nesf2 __unordsf2 \
382-
__unorddf2 \
381+
__addsf3 __eqsf2 __gesf2 __lesf2 __ltsf2 __mulsf3 __nesf2 __unordsf2 \
382+
__adddf3 __ledf2 __ltdf2 __muldf3 __unorddf2 \
383383
__muloti4 __multi3 \
384384
__udivmodti4 __udivti3 __umodti3
385385

rust/alloc/alloc.rs

+12-8
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ use core::ptr::{self, NonNull};
1616
#[doc(inline)]
1717
pub use core::alloc::*;
1818

19-
use core::marker::Destruct;
20-
2119
#[cfg(test)]
2220
mod tests;
2321

@@ -41,6 +39,9 @@ extern "Rust" {
4139
#[rustc_allocator_zeroed]
4240
#[rustc_nounwind]
4341
fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
42+
43+
#[cfg(not(bootstrap))]
44+
static __rust_no_alloc_shim_is_unstable: u8;
4445
}
4546

4647
/// The global memory allocator.
@@ -94,7 +95,14 @@ pub use std::alloc::Global;
9495
#[must_use = "losing the pointer will leak memory"]
9596
#[inline]
9697
pub unsafe fn alloc(layout: Layout) -> *mut u8 {
97-
unsafe { __rust_alloc(layout.size(), layout.align()) }
98+
unsafe {
99+
// Make sure we don't accidentally allow omitting the allocator shim in
100+
// stable code until it is actually stabilized.
101+
#[cfg(not(bootstrap))]
102+
core::ptr::read_volatile(&__rust_no_alloc_shim_is_unstable);
103+
104+
__rust_alloc(layout.size(), layout.align())
105+
}
98106
}
99107

100108
/// Deallocate memory with the global allocator.
@@ -333,16 +341,12 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
333341

334342
#[cfg_attr(not(test), lang = "box_free")]
335343
#[inline]
336-
#[rustc_const_unstable(feature = "const_box", issue = "92521")]
337344
// This signature has to be the same as `Box`, otherwise an ICE will happen.
338345
// When an additional parameter to `Box` is added (like `A: Allocator`), this has to be added here as
339346
// well.
340347
// For example if `Box` is changed to `struct Box<T: ?Sized, A: Allocator>(Unique<T>, A)`,
341348
// this function has to be changed to `fn box_free<T: ?Sized, A: Allocator>(Unique<T>, A)` as well.
342-
pub(crate) const unsafe fn box_free<T: ?Sized, A: ~const Allocator + ~const Destruct>(
343-
ptr: Unique<T>,
344-
alloc: A,
345-
) {
349+
pub(crate) unsafe fn box_free<T: ?Sized, A: Allocator>(ptr: Unique<T>, alloc: A) {
346350
unsafe {
347351
let size = size_of_val(ptr.as_ref());
348352
let align = min_align_of_val(ptr.as_ref());

0 commit comments

Comments
 (0)