Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make heap allocator interrupt safe

Browse Source
This commit is contained in:
Jianfeng Jiang
2023-06-26 17:02:24 +08:00
committed by Tate, Hongliang Tian
parent 61c2f6ee82
commit 0e8b2aff7b
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
framework/jinux-frame/src/vm/heap_allocator.rs
View File

@ -1,8 +1,12 @@
use crate::config::KERNEL_HEAP_SIZE; use crate::{config::KERNEL_HEAP_SIZE, sync::SpinLock};
use buddy_system_allocator::LockedHeap; use buddy_system_allocator::Heap;
use core::{
alloc::{GlobalAlloc, Layout},
ptr::NonNull,
};
#[global_allocator] #[global_allocator]
static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::empty(); static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::new();
#[alloc_error_handler] #[alloc_error_handler]
pub fn handle_alloc_error(layout: core::alloc::Layout) -> ! { pub fn handle_alloc_error(layout: core::alloc::Layout) -> ! {
@ -12,9 +16,36 @@ pub fn handle_alloc_error(layout: core::alloc::Layout) -> ! {
static mut HEAP_SPACE: [u8; KERNEL_HEAP_SIZE] = [0; KERNEL_HEAP_SIZE]; static mut HEAP_SPACE: [u8; KERNEL_HEAP_SIZE] = [0; KERNEL_HEAP_SIZE];
pub fn init() { pub fn init() {
// Safety: The HEAP_SPACE is a static memory range, so it's always valid.
unsafe { unsafe {
HEAP_ALLOCATOR HEAP_ALLOCATOR.init(HEAP_SPACE.as_ptr(), KERNEL_HEAP_SIZE);
.lock() }
.init(HEAP_SPACE.as_ptr() as usize, KERNEL_HEAP_SIZE); }
struct LockedHeap<const ORDER: usize>(SpinLock<Heap<ORDER>>);
impl<const ORDER: usize> LockedHeap<ORDER> {
/// Creates an new heap
pub const fn new() -> Self {
LockedHeap(SpinLock::new(Heap::<ORDER>::new()))
}
/// Safety: The range [start, start + size) must be a valid memory region.
pub unsafe fn init(&self, start: *const u8, size: usize) {
self.0.lock().init(start as usize, size);
}
}
unsafe impl<const ORDER: usize> GlobalAlloc for LockedHeap<ORDER> {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
self.0
.lock()
.alloc(layout)
.map_or(0 as *mut u8, |allocation| allocation.as_ptr())
}
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
debug_assert!(ptr as usize != 0);
self.0.lock().dealloc(NonNull::new_unchecked(ptr), layout)
} }
} }