Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implements malloc with size within page size #971

Merged
merged 1 commit into from
Sep 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/obkrnl/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ mod imgfmt;
mod malloc;
mod panic;
mod proc;
mod uma;

extern crate alloc;

Expand Down
55 changes: 51 additions & 4 deletions src/obkrnl/src/malloc/stage2.rs
Original file line number Diff line number Diff line change
@@ -1,30 +1,77 @@
use crate::config::PAGE_SIZE;
use crate::context::Context;
use crate::uma::UmaZone;
use alloc::string::ToString;
use alloc::sync::Arc;
use alloc::vec::Vec;
use core::alloc::Layout;

/// Stage 2 kernel heap.
///
/// This stage allocate a memory from a virtual memory management system. This struct is a merge of
/// `malloc_type` and `malloc_type_internal` structure.
pub struct Stage2 {}
pub struct Stage2 {
zones: Vec<Arc<UmaZone>>, // kmemsize + kmemzones
}

impl Stage2 {
const KMEM_ZSHIFT: usize = 4;
const KMEM_ZBASE: usize = 16;
const KMEM_ZMASK: usize = Self::KMEM_ZBASE - 1;
const KMEM_ZSIZE: usize = PAGE_SIZE >> Self::KMEM_ZSHIFT;

/// See `kmeminit` on the PS4 for a reference.
pub fn new() -> Self {
Self {}
let mut zones = Vec::with_capacity(Self::KMEM_ZSIZE + 1);
let mut last = 0;

for i in Self::KMEM_ZSHIFT.. {
// Stop if size larger than page size.
let size = 1usize << i;

if size > PAGE_SIZE {
break;
}

// Create zone.
let zone = Arc::new(UmaZone::new(size.to_string().into(), size));

while last <= size {
zones.push(zone.clone());
last += Self::KMEM_ZBASE;
}
}

Self { zones }
}

/// See `malloc` on the PS4 for a reference.
///
/// # Safety
/// `layout` must be nonzero.
pub unsafe fn alloc(&self, _: Layout) -> *mut u8 {
pub unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
// Our implementation imply M_WAITOK.
let td = Context::thread();

if td.active_interrupts() != 0 {
panic!("heap allocation in an interrupt handler is not supported");
}

todo!()
// TODO: Handle alignment.
let mut size = layout.size();

if size <= PAGE_SIZE {
// Round size.
if (size & Self::KMEM_ZMASK) != 0 {
// TODO: Refactor this for readability.
size = (size + Self::KMEM_ZBASE) & !Self::KMEM_ZMASK;
}

// TODO: There are more logic after this on the PS4.
self.zones[size >> Self::KMEM_ZSHIFT].alloc()
} else {
todo!()
}
}

/// # Safety
Expand Down
16 changes: 16 additions & 0 deletions src/obkrnl/src/uma/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
use alloc::borrow::Cow;

/// Implementation of `uma_zone` structure.
pub struct UmaZone {}

impl UmaZone {
/// See `uma_zcreate` on the PS4 for a reference.
pub fn new(_: Cow<'static, str>, _: usize) -> Self {
Self {}
}

/// See `uma_zalloc_arg` on the PS4 for a reference.
pub fn alloc(&self) -> *mut u8 {
todo!()
}
}