JonasKruckenberg · JonasKruckenberg · Dec 29, 2024 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ kernel = { path = "kernel" }
 loader-api = { path = "loader/api" }
 backtrace = { path = "libs/backtrace" }
 dtb-parser = { path = "libs/dtb-parser" }
-pmm = { path = "libs/pmm" }
+mmu = { path = "libs/mmu" }
 ktest = { path = "libs/ktest" }
 linked-list = { path = "libs/linked-list" }
 panic-common = { path = "libs/panic-common" }
@@ -50,10 +50,13 @@ arrayvec = { version = "0.7.4", default-features = false }
 object = { version = "0.36.4", default-features = false }
 gimli = { version = "0.31.0", default-features = false, features = ["read"] }
 xmas-elf = "0.9.1"
-talc = "4.4.2"
+talc = { version = "4.4.2", default-features = false }
 pin-project-lite = "0.2.15"
 rand_chacha = { version = "0.3.1", default-features = false }
 rand = { version = "0.8.5", default-features = false }
+static_assertions = "1.1.0"
+addr2line = { version = "0.24.2", default-features = false }
+rustc-demangle = { version = "0.1.24", default-features = false }
 
 # wast dependencies
 bumpalo = "3.14.0"
@@ -91,6 +94,7 @@ lto = true
 strip = true
 overflow-checks = true
 split-debuginfo = "packed"
+debug-assertions = true
 
 [profile.bench]
 debug = true
diff --git a/justfile b/justfile
@@ -126,6 +126,7 @@ test-docs crate="" *cargo_args="":
 # run all tests
 test $K23_PROFILE=(profile) cargo_args="" *args="": && (test-docs cargo_args)
     {{ _cargo }} test \
+        -p mmu \
         -p kernel \
         --target kernel/riscv64gc-k23-none-kernel.json \
         --profile {{ profile }} \
@@ -154,7 +155,7 @@ _run_riscv64 binary *args: (_build_bootimg binary)
         -machine virt \
         -cpu rv64 \
         -smp 1 \
-        -m 64M \
+        -m 128M \
         -d guest_errors,int \
         -display none \
         -serial stdio \

diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -17,25 +17,29 @@ harness = false
 
 [dependencies]
 loader-api.workspace = true
-pmm.workspace = true
+mmu.workspace = true
 panic-unwind.workspace = true
-semihosting-logger = { workspace = true, features = ["hartid"] }
 sync.workspace = true
 thread-local.workspace = true
 wavltree= { workspace = true, features = ["dot"] }
 dtb-parser.workspace = true
+backtrace.workspace = true
 
-talc.workspace = true
+talc = { workspace = true, features = ["lock_api", "counters"] }
 log.workspace = true
 cfg-if.workspace = true
 pin-project-lite.workspace = true
 rand_chacha.workspace = true
 rand.workspace = true
 onlyerror.workspace = true
+bitflags.workspace = true
+xmas-elf.workspace = true
+static_assertions.workspace = true
 
 [target.'cfg(any(target_arch = "riscv64", target_arch = "riscv32"))'.dependencies]
 riscv.workspace = true
 
 [dev-dependencies]
 ktest.workspace = true
 wast.workspace = true
+hashbrown.workspace = true
diff --git a/kernel/src/allocator.rs b/kernel/src/allocator.rs
@@ -1,5 +1,5 @@
 use loader_api::BootInfo;
-use pmm::AddressRangeExt;
+use mmu::AddressRangeExt;
 use talc::{ErrOnOom, Span, Talc, Talck};
 
 #[global_allocator]
@@ -14,7 +14,7 @@ pub fn init(boot_info: &BootInfo) {
     log::debug!("Kernel heap: {heap:?}");
 
     let mut alloc = KERNEL_ALLOCATOR.lock();
-    let span = Span::from_base_size(heap.start.as_raw() as *mut u8, heap.size());
+    let span = Span::from_base_size(heap.start.as_mut_ptr(), heap.size());
     unsafe {
         let old_heap = alloc.claim(span).unwrap();
         alloc.extend(old_heap, span);

diff --git a/kernel/src/arch/mod.rs b/kernel/src/arch/mod.rs
@@ -1,4 +1,4 @@
-pub use pmm::arch::*;
+pub use mmu::arch::*;
 
 cfg_if::cfg_if! {
     if #[cfg(target_arch = "riscv64")] {

diff --git a/kernel/src/arch/riscv64/mod.rs b/kernel/src/arch/riscv64/mod.rs
@@ -3,19 +3,51 @@ pub mod trap_handler;
 pub mod vm;
 
 use core::arch::asm;
+use mmu::VirtualAddress;
 use riscv::sstatus::FS;
 use riscv::{interrupt, sie, sstatus};
+use static_assertions::const_assert_eq;
 
 pub use setjmp_longjmp::{call_with_setjmp, longjmp, setjmp, JmpBuf, JmpBufStruct};
 
-pub fn finish_hart_init() {
+/// Virtual address where the kernel address space starts.
+///
+///
+pub const KERNEL_ASPACE_BASE: VirtualAddress = VirtualAddress::new(0xffffffc000000000).unwrap();
+pub const KERNEL_ASPACE_SIZE: usize = 1 << mmu::arch::VIRT_ADDR_BITS;
+const_assert_eq!(KERNEL_ASPACE_BASE.get(), mmu::arch::CANONICAL_ADDRESS_MASK);
+const_assert_eq!(KERNEL_ASPACE_SIZE - 1, !mmu::arch::CANONICAL_ADDRESS_MASK);
+
+/// Virtual address where the user address space starts.
+///
+/// The first 2MiB are reserved for catching null pointer dereferences, but this might
+/// change in the future if we decide that the null-checking performed by the WASM runtime
+/// is sufficiently robust.
+pub const USER_ASPACE_BASE: VirtualAddress = VirtualAddress::new(0x0000000000200000).unwrap();
+pub const USER_ASPACE_SIZE: usize = (1 << mmu::arch::VIRT_ADDR_BITS) - USER_ASPACE_BASE.get();
+
+/// Return whether the given virtual address is in the kernel address space.
+pub const fn is_kernel_address(virt: VirtualAddress) -> bool {
+    virt.get() >= KERNEL_ASPACE_BASE.get()
+        && virt.checked_sub_addr(KERNEL_ASPACE_BASE).unwrap() < KERNEL_ASPACE_SIZE
+}
+
+/// Suspend the calling hart until an interrupt is received.
+pub fn wait_for_interrupt() {
+    unsafe { asm!("wfi") }
+}
+
+/// Early architecture-specific, per-hart initialization.
+pub fn hart_init_early() {}
+
+/// Late architecture-specific, per-hart initialization.
+pub fn hart_init_late() {
     unsafe {
+        // Enable interrupts
         interrupt::enable();
+        // Enable supervisor timer interrupts
         sie::set_stie();
+        // Enable FPU
         sstatus::set_fs(FS::Initial);
     }
 }
-
-pub fn wait_for_interrupt() {
-    unsafe { asm!("wfi") }
-}