This is the third upgrade to the Rust toolchain, from 1.71.1 to 1.72.1 (i.e. the latest) [1]. See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4da06e ("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 [3] for details. # Other improvements Previously, the compiler could incorrectly generate a `.eh_frame` section under `-Cpanic=abort`. We were hitting this bug when debug assertions were enabled (`CONFIG_RUST_DEBUG_ASSERTIONS=y`) [4]: LD .tmp_vmlinux.kallsyms1 ld.lld: error: <internal>:(.eh_frame) is being placed in '.eh_frame' Gary fixed the issue in Rust 1.72.0 [5]. # Required changes For the upgrade, the following changes are required: - A call to `Box::from_raw` in `rust/kernel/sync/arc.rs` now requires an explicit `drop()` call. See previous patch for details. # `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://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1721-2023-09-19 [1] Link: https://rust-for-linux.com/rust-version-policy [2] Link: https://github.com/Rust-for-Linux/linux/issues/2 [3] Closes: https://github.com/Rust-for-Linux/linux/issues/1012 [4] Link: https://github.com/rust-lang/rust/pull/112403 [5] Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com> Reviewed-by: Gary Guo <gary@garyguo.net> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Björn Roy Baron <bjorn3_gh@protonmail.com> Link: https://lore.kernel.org/r/20230823160244.188033-3-ojeda@kernel.org [ Used 1.72.1 instead of .0 (no changes in `alloc`) and reworded to mention that we hit the `.eh_frame` bug under debug assertions. ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
116 lines
3.7 KiB
Rust
116 lines
3.7 KiB
Rust
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
|
|
use crate::alloc::{Allocator, Global};
|
|
use core::ptr;
|
|
use core::slice;
|
|
|
|
use super::Vec;
|
|
|
|
/// An iterator which uses a closure to determine if an element should be removed.
|
|
///
|
|
/// This struct is created by [`Vec::extract_if`].
|
|
/// See its documentation for more.
|
|
///
|
|
/// # Example
|
|
///
|
|
/// ```
|
|
/// #![feature(extract_if)]
|
|
///
|
|
/// let mut v = vec![0, 1, 2];
|
|
/// let iter: std::vec::ExtractIf<'_, _, _> = v.extract_if(|x| *x % 2 == 0);
|
|
/// ```
|
|
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
|
|
#[derive(Debug)]
|
|
#[must_use = "iterators are lazy and do nothing unless consumed"]
|
|
pub struct ExtractIf<
|
|
'a,
|
|
T,
|
|
F,
|
|
#[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
|
|
> where
|
|
F: FnMut(&mut T) -> bool,
|
|
{
|
|
pub(super) vec: &'a mut Vec<T, A>,
|
|
/// The index of the item that will be inspected by the next call to `next`.
|
|
pub(super) idx: usize,
|
|
/// The number of items that have been drained (removed) thus far.
|
|
pub(super) del: usize,
|
|
/// The original length of `vec` prior to draining.
|
|
pub(super) old_len: usize,
|
|
/// The filter test predicate.
|
|
pub(super) pred: F,
|
|
}
|
|
|
|
impl<T, F, A: Allocator> ExtractIf<'_, T, F, A>
|
|
where
|
|
F: FnMut(&mut T) -> bool,
|
|
{
|
|
/// Returns a reference to the underlying allocator.
|
|
#[unstable(feature = "allocator_api", issue = "32838")]
|
|
#[inline]
|
|
pub fn allocator(&self) -> &A {
|
|
self.vec.allocator()
|
|
}
|
|
}
|
|
|
|
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
|
|
impl<T, F, A: Allocator> Iterator for ExtractIf<'_, T, F, A>
|
|
where
|
|
F: FnMut(&mut T) -> bool,
|
|
{
|
|
type Item = T;
|
|
|
|
fn next(&mut self) -> Option<T> {
|
|
unsafe {
|
|
while self.idx < self.old_len {
|
|
let i = self.idx;
|
|
let v = slice::from_raw_parts_mut(self.vec.as_mut_ptr(), self.old_len);
|
|
let drained = (self.pred)(&mut v[i]);
|
|
// Update the index *after* the predicate is called. If the index
|
|
// is updated prior and the predicate panics, the element at this
|
|
// index would be leaked.
|
|
self.idx += 1;
|
|
if drained {
|
|
self.del += 1;
|
|
return Some(ptr::read(&v[i]));
|
|
} else if self.del > 0 {
|
|
let del = self.del;
|
|
let src: *const T = &v[i];
|
|
let dst: *mut T = &mut v[i - del];
|
|
ptr::copy_nonoverlapping(src, dst, 1);
|
|
}
|
|
}
|
|
None
|
|
}
|
|
}
|
|
|
|
fn size_hint(&self) -> (usize, Option<usize>) {
|
|
(0, Some(self.old_len - self.idx))
|
|
}
|
|
}
|
|
|
|
#[unstable(feature = "extract_if", reason = "recently added", issue = "43244")]
|
|
impl<T, F, A: Allocator> Drop for ExtractIf<'_, T, F, A>
|
|
where
|
|
F: FnMut(&mut T) -> bool,
|
|
{
|
|
fn drop(&mut self) {
|
|
unsafe {
|
|
if self.idx < self.old_len && self.del > 0 {
|
|
// This is a pretty messed up state, and there isn't really an
|
|
// obviously right thing to do. We don't want to keep trying
|
|
// to execute `pred`, so we just backshift all the unprocessed
|
|
// elements and tell the vec that they still exist. The backshift
|
|
// is required to prevent a double-drop of the last successfully
|
|
// drained item prior to a panic in the predicate.
|
|
let ptr = self.vec.as_mut_ptr();
|
|
let src = ptr.add(self.idx);
|
|
let dst = src.sub(self.del);
|
|
let tail_len = self.old_len - self.idx;
|
|
src.copy_to(dst, tail_len);
|
|
}
|
|
self.vec.set_len(self.old_len - self.del);
|
|
}
|
|
}
|
|
}
|