aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatasha Moongrave <natasha@256phi.eu>2026-03-30 11:47:31 +0200
committerNatasha Moongrave <natasha@256phi.eu>2026-03-30 11:47:31 +0200
commit686d6dc39ee2ecca330c0a46399633ea8be03f14 (patch)
tree16d993019e7ef0e9b14225a185a3fa9b9ea07606
parent09f9c923cf43c73bbca2b3fa38c31cabcf49dbf3 (diff)
added frame allocators to src(memory.rs
-rw-r--r--StrixKernel/src/memory.rs75
1 files changed, 70 insertions, 5 deletions
diff --git a/StrixKernel/src/memory.rs b/StrixKernel/src/memory.rs
index 2493815..f7264bf 100644
--- a/StrixKernel/src/memory.rs
+++ b/StrixKernel/src/memory.rs
@@ -1,17 +1,31 @@
+use bootloader::bootinfo::{MemoryMap, MemoryRegionType};
use x86_64::{
- structures::paging::PageTable,
- VirtAddr,
+ PhysAddr, VirtAddr,
+ structures::paging::{
+ FrameAllocator, Mapper, OffsetPageTable, Page, PageTable, PhysFrame, Size4KiB,
+ },
};
+/// Initialize a new OffsetPageTable.
+///
+/// This function is unsafe because the caller must guarantee that the
+/// complete physical memory is mapped to virtual memory at the passed
+/// `physical_memory_offset`. Also, this function must be only called once
+/// to avoid aliasing `&mut` references (which is undefined behavior).
+pub unsafe fn init(physical_memory_offset: VirtAddr) -> OffsetPageTable<'static> {
+ unsafe {
+ let level_4_table = active_level_4_table(physical_memory_offset);
+ OffsetPageTable::new(level_4_table, physical_memory_offset)
+ }
+}
+
/// Returns a mutable reference to the active level 4 table.
///
/// This function is unsafe because the caller must guarantee that the
/// complete physical memory is mapped to virtual memory at the passed
/// `physical_memory_offset`. Also, this function must be only called once
/// to avoid aliasing `&mut` references (which is undefined behavior).
-pub unsafe fn active_level_4_table(physical_memory_offset: VirtAddr)
- -> &'static mut PageTable
-{
+unsafe fn active_level_4_table(physical_memory_offset: VirtAddr) -> &'static mut PageTable {
use x86_64::registers::control::Cr3;
let (level_4_table_frame, _) = Cr3::read();
@@ -22,3 +36,54 @@ pub unsafe fn active_level_4_table(physical_memory_offset: VirtAddr)
unsafe { &mut *page_table_ptr }
}
+
+/// A FrameAllocator that always returns `None`.
+pub struct EmptyFrameAllocator;
+
+unsafe impl FrameAllocator<Size4KiB> for EmptyFrameAllocator {
+ fn allocate_frame(&mut self) -> Option<PhysFrame> {
+ None
+ }
+}
+
+/// A FrameAllocator that returns usable frames from the bootloader's memory map.
+pub struct BootInfoFrameAllocator {
+ memory_map: &'static MemoryMap,
+ next: usize,
+}
+
+impl BootInfoFrameAllocator {
+ /// Create a FrameAllocator from the passed memory map.
+ ///
+ /// This function is unsafe because the caller must guarantee that the passed
+ /// memory map is valid. The main requirement is that all frames that are marked
+ /// as `USABLE` in it are really unused.
+ pub unsafe fn init(memory_map: &'static MemoryMap) -> Self {
+ BootInfoFrameAllocator {
+ memory_map,
+ next: 0,
+ }
+ }
+
+ /// Returns an iterator over the usable frames specified in the memory map.
+ fn usable_frames(&self) -> impl Iterator<Item = PhysFrame> {
+ // get usable regions from memory map
+ let regions = self.memory_map.iter();
+ let usable_regions = regions.filter(|r| r.region_type == MemoryRegionType::Usable);
+ // map each region to its address range
+ let addr_ranges = usable_regions.map(|r| r.range.start_addr()..r.range.end_addr());
+ // transform to an iterator of frame start addresses
+ let frame_addresses = addr_ranges.flat_map(|r| r.step_by(4096));
+ // create `PhysFrame` types from the start addresses
+ frame_addresses.map(|addr| PhysFrame::containing_address(PhysAddr::new(addr)))
+ }
+}
+
+unsafe impl FrameAllocator<Size4KiB> for BootInfoFrameAllocator {
+ fn allocate_frame(&mut self) -> Option<PhysFrame> {
+ let frame = self.usable_frames().nth(self.next);
+ self.next += 1;
+ frame
+ }
+}
+