FROMGIT: rust: alloc: add Vec::remove
This is needed by Rust Binder in the range allocator, and by upcoming GPU drivers during firmware initialization. Panics in the kernel are best avoided when possible, so an error is returned if the index is out of bounds. An error type is used rather than just returning Option<T> to let callers handle errors with ?. Signed-off-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Benno Lossin <lossin@kernel.org> Link: https://lore.kernel.org/r/20250502-vec-methods-v5-6-06d20ad9366f@google.com [ Remove `# Panics` section; `Vec::remove() handles the error properly.` - Danilo ] Signed-off-by: Danilo Krummrich <dakr@kernel.org> Bug: 414994413 (cherry picked from commit 294a7ecbdf0a5d65c6df1287c5d56241e9331cf2 https://github.com/Rust-for-Linux/linux.git alloc-next) Change-Id: I80a8925910f234cccd325614634aa8a12e85ea1c Signed-off-by: Alice Ryhl <aliceryhl@google.com>
This commit is contained in:
committed by
Matthew Maurer
parent
e1da60354a
commit
c28afde01d
@@ -22,7 +22,7 @@ use core::{
|
||||
};
|
||||
|
||||
mod errors;
|
||||
pub use self::errors::PushError;
|
||||
pub use self::errors::{PushError, RemoveError};
|
||||
|
||||
/// Create a [`KVec`] containing the arguments.
|
||||
///
|
||||
@@ -389,6 +389,42 @@ where
|
||||
Some(unsafe { removed.read() })
|
||||
}
|
||||
|
||||
/// Removes the element at the given index.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// let mut v = kernel::kvec![1, 2, 3]?;
|
||||
/// assert_eq!(v.remove(1)?, 2);
|
||||
/// assert_eq!(v, [1, 3]);
|
||||
/// # Ok::<(), Error>(())
|
||||
/// ```
|
||||
pub fn remove(&mut self, i: usize) -> Result<T, RemoveError> {
|
||||
let value = {
|
||||
let value_ref = self.get(i).ok_or(RemoveError)?;
|
||||
// INVARIANT: This breaks the invariants by invalidating the value at index `i`, but we
|
||||
// restore the invariants below.
|
||||
// SAFETY: The value at index `i` is valid, because otherwise we would have already
|
||||
// failed with `RemoveError`.
|
||||
unsafe { ptr::read(value_ref) }
|
||||
};
|
||||
|
||||
// SAFETY: We checked that `i` is in-bounds.
|
||||
let p = unsafe { self.as_mut_ptr().add(i) };
|
||||
|
||||
// INVARIANT: After this call, the invalid value is at the last slot, so the Vec invariants
|
||||
// are restored after the below call to `dec_len(1)`.
|
||||
// SAFETY: `p.add(1).add(self.len - i - 1)` is `i+1+len-i-1 == len` elements after the
|
||||
// beginning of the vector, so this is in-bounds of the vector's allocation.
|
||||
unsafe { ptr::copy(p.add(1), p, self.len - i - 1) };
|
||||
|
||||
// SAFETY: Since the check at the beginning of this call did not fail with `RemoveError`,
|
||||
// the length is at least one.
|
||||
unsafe { self.dec_len(1) };
|
||||
|
||||
Ok(value)
|
||||
}
|
||||
|
||||
/// Creates a new [`Vec`] instance with at least the given capacity.
|
||||
///
|
||||
/// # Examples
|
||||
|
||||
@@ -21,3 +21,18 @@ impl<T> From<PushError<T>> for Error {
|
||||
EINVAL
|
||||
}
|
||||
}
|
||||
|
||||
/// Error type for [`Vec::remove`].
|
||||
pub struct RemoveError;
|
||||
|
||||
impl Debug for RemoveError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "Index out of bounds")
|
||||
}
|
||||
}
|
||||
|
||||
impl From<RemoveError> for Error {
|
||||
fn from(_: RemoveError) -> Error {
|
||||
EINVAL
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user