Skip to content

Commit

Permalink
rust: alloc: Add realloc and alloc_zeroed to the GlobalAlloc impl
Browse files Browse the repository at this point in the history
While there are default impls for these methods, using the respective C
api's is faster. Currently neither the existing nor these new
GlobalAlloc method implementations are actually called. Instead the
__rust_* function defined below the GlobalAlloc impl are used. With
rustc 1.71 these functions will be gone and all allocation calls will go
through the GlobalAlloc implementation.

Link: Rust-for-Linux/linux#68
Signed-off-by: Björn Roy Baron <[email protected]>
[boqun: add size adjustment for alignment requirement]
Signed-off-by: Boqun Feng <[email protected]>
Reviewed-by: Andreas Hindborg <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Miguel Ojeda <[email protected]>
  • Loading branch information
bjorn3 authored and herrnst committed Sep 7, 2023
1 parent 67f98d3 commit 99178ad
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions rust/kernel/allocator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,33 @@ unsafe impl GlobalAlloc for KernelAllocator {
bindings::kfree(ptr as *const core::ffi::c_void);
}
}

unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
// SAFETY:
// - `new_size`, when rounded up to the nearest multiple of `layout.align()`, will not
// overflow `isize` by the function safety requirement.
// - `layout.align()` is a proper alignment (i.e. not zero and must be a power of two).
let layout = unsafe { Layout::from_size_align_unchecked(new_size, layout.align()) };

// SAFETY:
// - `ptr` is either null or a pointer allocated by this allocator by the function safety
// requirement.
// - the size of `layout` is not zero because `new_size` is not zero by the function safety
// requirement.
unsafe { krealloc_aligned(ptr, layout, bindings::GFP_KERNEL) }
}

unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
// SAFETY: `ptr::null_mut()` is null and `layout` has a non-zero size by the function safety
// requirement.
unsafe {
krealloc_aligned(
ptr::null_mut(),
layout,
bindings::GFP_KERNEL | bindings::__GFP_ZERO,
)
}
}
}

#[global_allocator]
Expand Down

0 comments on commit 99178ad

Please sign in to comment.