refactor(x86_64): migrate to PageBox

Author: mkroening

src/arch/x86_64/kernel/apic.rs

@@ -13,7 +13,7 @@ use align_address::Align;
 #[cfg(feature = "smp")]
 use arch::x86_64::kernel::core_local::*;
 use arch::x86_64::kernel::{interrupts, processor};
-use free_list::{PageLayout, PageRange};
+use free_list::PageLayout;
 use hermit_sync::{OnceCell, SpinMutex, without_interrupts};
 use memory_addresses::{AddrRange, PhysAddr, VirtAddr};
 #[cfg(feature = "smp")]
@@ -30,7 +30,7 @@ use crate::arch::x86_64::mm::paging::{
 };
 use crate::arch::x86_64::swapgs;
 use crate::config::*;
-use crate::mm::{PageAlloc, PageRangeAllocator};
+use crate::mm::{PageAlloc, PageBox, PageRangeAllocator};
 use crate::scheduler::CoreId;
 use crate::{arch, env, scheduler};
 
@@ -387,7 +387,7 @@ fn detect_from_acpi() -> Result<PhysAddr, ()> {
 /// Helper function to search Floating Pointer Structure of the Multiprocessing Specification
 fn search_mp_floating(memory_range: AddrRange<PhysAddr>) -> Result<&'static ApicMP, ()> {
 	let layout = PageLayout::from_size(BasePageSize::SIZE as usize).unwrap();
-	let page_range = PageAlloc::allocate(layout).unwrap();
+	let page_range = PageBox::new(layout).unwrap();
 	let virtual_address = VirtAddr::from(page_range.start());
 
 	for current_address in memory_range.iter().step_by(BasePageSize::SIZE as usize) {
@@ -412,13 +412,6 @@ fn search_mp_floating(memory_range: AddrRange<PhysAddr>) -> Result<&'static Apic
 		}
 	}
 
-	// frees obsolete virtual memory region for MMIO devices
-	let range =
-		PageRange::from_start_len(virtual_address.as_usize(), BasePageSize::SIZE as usize).unwrap();
-	unsafe {
-		PageAlloc::deallocate(range);
-	}
-
 	Err(())
 }
 
@@ -450,7 +443,7 @@ fn detect_from_mp() -> Result<PhysAddr, ()> {
 	}
 
 	let layout = PageLayout::from_size(BasePageSize::SIZE as usize).unwrap();
-	let page_range = PageAlloc::allocate(layout).unwrap();
+	let page_range = PageBox::new(layout).unwrap();
 	let virtual_address = VirtAddr::from(page_range.start());
 
 	let mut flags = PageTableEntryFlags::empty();
@@ -467,12 +460,6 @@ fn detect_from_mp() -> Result<PhysAddr, ()> {
 	let mp_config: &ApicConfigTable = unsafe { &*(ptr::with_exposed_provenance(addr)) };
 	if mp_config.signature != MP_CONFIG_SIGNATURE {
 		warn!("MP config table invalid!");
-		let range =
-			PageRange::from_start_len(virtual_address.as_usize(), BasePageSize::SIZE as usize)
-				.unwrap();
-		unsafe {
-			PageAlloc::deallocate(range);
-		}
 		return Err(());
 	}
 

src/arch/x86_64/kernel/mmio.rs

@@ -86,7 +86,7 @@ fn check_linux_args(
 	linux_mmio: &'static [String],
 ) -> Result<(VolatileRef<'static, DeviceRegisters>, u8), &'static str> {
 	let layout = PageLayout::from_size(BasePageSize::SIZE as usize).unwrap();
-	let page_range = PageAlloc::allocate(layout).unwrap();
+	let page_range = PageBox::new(layout).unwrap();
 	let virtual_address = VirtAddr::from(page_range.start());
 
 	for arg in linux_mmio {
@@ -133,21 +133,14 @@ fn check_linux_args(
 		}
 	}
 
-	// frees obsolete virtual memory region for MMIO devices
-	let range =
-		PageRange::from_start_len(virtual_address.as_usize(), BasePageSize::SIZE as usize).unwrap();
-	unsafe {
-		PageAlloc::deallocate(range);
-	}
-
 	Err("Network card not found!")
 }
 
 fn guess_device() -> Result<(VolatileRef<'static, DeviceRegisters>, u8), &'static str> {
 	// Trigger page mapping in the first iteration!
 	let mut current_page = 0;
 	let layout = PageLayout::from_size(BasePageSize::SIZE as usize).unwrap();
-	let page_range = PageAlloc::allocate(layout).unwrap();
+	let page_range = PageBox::new(layout).unwrap();
 	let virtual_address = VirtAddr::from(page_range.start());
 
 	// Look for the device-ID in all possible 64-byte aligned addresses within this range.
@@ -188,13 +181,6 @@ fn guess_device() -> Result<(VolatileRef<'static, DeviceRegisters>, u8), &'stati
 		return Ok((mmio, IRQ_NUMBER));
 	}
 
-	// frees obsolete virtual memory region for MMIO devices
-	let range =
-		PageRange::from_start_len(virtual_address.as_usize(), BasePageSize::SIZE as usize).unwrap();
-	unsafe {
-		PageAlloc::deallocate(range);
-	}
-
 	Err("Network card not found!")
 }
 

src/arch/x86_64/mm/mod.rs

@@ -21,7 +21,7 @@ pub fn create_new_root_page_table() -> usize {
 	let physaddr = PhysAddr::from(frame_range.start());
 
 	let layout = PageLayout::from_size(2 * BasePageSize::SIZE as usize).unwrap();
-	let page_range = PageAlloc::allocate(layout).unwrap();
+	let page_range = PageBox::new(layout).unwrap();
 	let virtaddr = VirtAddr::from(page_range.start());
 	let mut flags = PageTableEntryFlags::empty();
 	flags.normal().writable();
@@ -52,11 +52,6 @@ pub fn create_new_root_page_table() -> usize {
 	};
 
 	paging::unmap::<BasePageSize>(virtaddr, 2);
-	let range =
-		PageRange::from_start_len(virtaddr.as_usize(), 2 * BasePageSize::SIZE as usize).unwrap();
-	unsafe {
-		PageAlloc::deallocate(range);
-	}
 
 	physaddr.as_usize()
 }