Skip to content

TestPR Failing AllocBench #2123

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.

Sign up for GitHub

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

Closed
jounathaen wants to merge 1 commit into from
Closed

TestPR Failing AllocBench #2123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions src/mm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ use align_address::Align;
use free_list::{PageLayout, PageRange};
use hermit_sync::{Lazy, RawInterruptTicketMutex};
pub use memory_addresses::{PhysAddr, VirtAddr};
use talc::{ErrOnOom, Span, Talc, Talck};
use talc::{OomHandler, Span, Talc, Talck};

pub use self::page_range_alloc::{PageRangeAllocator, PageRangeBox};
pub use self::physicalmem::{FrameAlloc, FrameBox};
Expand All @@ -63,9 +63,20 @@ pub use crate::arch::mm::paging::virtual_to_physical;
use crate::arch::mm::paging::{BasePageSize, LargePageSize, PageSize};
use crate::{arch, env};

pub struct DebugOom;

use core::alloc::Layout;

impl OomHandler for DebugOom {
fn handle_oom(talc: &mut Talc<Self>, layout: Layout) -> Result<(), ()> {
error!("memory allocation of {layout:?} failed. Talck: {talc:?}");
Err(())
}
}

#[cfg(target_os = "none")]
#[global_allocator]
pub(crate) static ALLOCATOR: Talck<RawInterruptTicketMutex, ErrOnOom> = Talc::new(ErrOnOom).lock();
pub(crate) static ALLOCATOR: Talck<RawInterruptTicketMutex, DebugOom> = Talc::new(DebugOom).lock();

/// Physical and virtual address range of the 2 MiB pages that map the kernel.
static KERNEL_ADDR_RANGE: Lazy<Range<VirtAddr>> = Lazy::new(|| {
Expand Down