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: #68
Signed-off-by: Björn Roy Baron <bjorn3_gh@protonmail.com>
[boqun: add size adjustment for alignment requirement]
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20230625232528.89306-1-boqun.feng@gmail.com
  • Loading branch information
fbq committed Jun 30, 2023
1 parent 6a4e6dc commit f2f2787
Showing 1 changed file with 54 additions and 5 deletions.
59 changes: 54 additions & 5 deletions rust/kernel/allocator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,17 @@ use crate::bindings;

struct KernelAllocator;

unsafe impl GlobalAlloc for KernelAllocator {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
impl KernelAllocator {
/// # Safety
///
/// * `ptr` can be either null or a pointer which has been allocated by this allocator.
/// * `layout` must have a non-zero size.
unsafe fn krealloc_with_flags(
&self,
ptr: *mut u8,
layout: Layout,
flags: bindings::gfp_t,
) -> *mut u8 {
// Customized layouts from `Layout::from_size_align()` can have size < align, so pads first.
let layout = layout.pad_to_align();

Expand All @@ -26,16 +35,56 @@ unsafe impl GlobalAlloc for KernelAllocator {
size = size.next_power_of_two();
}

// `krealloc()` is used instead of `kmalloc()` because the latter is
// an inline function and cannot be bound to as a result.
unsafe { bindings::krealloc(ptr::null(), size, bindings::GFP_KERNEL) as *mut u8 }
// SAFETY:
//
// * `ptr` is either null or a pointer returned from a previous k{re}alloc() by the function
// safety requirement.
//
// * `size` is greater than 0 since it's either a `layout.size()` (which cannot be zero
// according to the function safety requirement) or a result from `next_power_of_two()`.
unsafe { bindings::krealloc(ptr as *const core::ffi::c_void, size, flags) as *mut u8 }
}
}

unsafe impl GlobalAlloc for KernelAllocator {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
// SAFETY: `ptr::null_mut()` is null and `layout` has a non-zero size by the function safety
// requirement.
unsafe { self.krealloc_with_flags(ptr::null_mut(), layout, bindings::GFP_KERNEL) }
}

unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
unsafe {
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 function safety
// requirement.
// * the size of `layout` is not zero because `new_size` is not zero by function safety
// requirement.
unsafe { self.krealloc_with_flags(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 {
self.krealloc_with_flags(
ptr::null_mut(),
layout,
bindings::GFP_KERNEL | bindings::__GFP_ZERO,
)
}
}
}

#[global_allocator]
Expand Down

0 comments on commit f2f2787

Please sign in to comment.