Commit 5a888c28 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Miguel Ojeda
Browse files

rust: alloc: add module `allocator_test` 



`Allocator`s, such as `Kmalloc`, will be used by e.g. `Box` and `Vec` in
subsequent patches, and hence this dependency propagates throughout the
whole kernel.

Add the `allocator_test` module that provides an empty implementation
for all `Allocator`s in the kernel, such that we don't break the
`rusttest` make target in subsequent patches.

Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarBenno Lossin <benno.lossin@proton.me>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://lore.kernel.org/r/20241004154149.93856-8-dakr@kernel.org


[ Added missing `_old_layout` parameter as discussed. - Miguel ]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent a34822d1

rust/kernel/alloc.rs

+7 −2
Original line number Diff line number Diff line
@@ -2,12 +2,17 @@ 


//! Extensions to the [`alloc`] crate.



#[cfg(not(test))]

#[cfg(not(testlib))]

#[cfg(not(any(test, testlib)))]

pub mod allocator;

pub mod box_ext;

pub mod vec_ext;



#[cfg(any(test, testlib))]

pub mod allocator_test;



#[cfg(any(test, testlib))]

pub use self::allocator_test as allocator;



/// Indicates an allocation error.

#[derive(Copy, Clone, PartialEq, Eq, Debug)]

pub struct AllocError;

rust/kernel/alloc/allocator_test.rs

0 → 100644
+20 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#![allow(missing_docs)]



use super::{AllocError, Allocator, Flags};

use core::alloc::Layout;

use core::ptr::NonNull;



pub struct Kmalloc;



unsafe impl Allocator for Kmalloc {

    unsafe fn realloc(

        _ptr: Option<NonNull<u8>>,

        _layout: Layout,

        _old_layout: Layout,

        _flags: Flags,

    ) -> Result<NonNull<[u8]>, AllocError> {

        panic!();

    }

}