Merge branch 'main' into refactor_scheduler

build/targets/x86_64.json

@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
     "arch": "x86_64",
     "target-endian": "little",
     "target-pointer-width": "64",

build/xtask/src/main.rs

@@ -93,7 +93,7 @@ fn build(sh: &Shell, rl: bool, mut args: Arguments) -> Result<()> {
         cmd!(
             sh,
             "git clone https://github.com/limine-bootloader/limine.git 
-                    --branch=v5.x-branch-binary
+                    --branch=v6.x-branch-binary
                     --depth=1"
         )
         .run()?;

crates/libxernel/src/syscall.rs

@@ -7,6 +7,7 @@ pub const SYS_WRITE: usize = 1;
 pub const SYS_OPEN: usize = 2;
 pub const SYS_CLOSE: usize = 3;
 pub const SYS_MMAP: usize = 4;
+pub const SYS_LOG: usize = 5;
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 #[repr(isize)]

rust-toolchain

@@ -1 +1 @@
-nightly
+nightly-2024-01-01

xernel/kernel/Cargo.toml

@@ -8,7 +8,7 @@ repository = "https://github.com/anubis-rs/xernel"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-limine = { git = "https://github.com/limine-bootloader/limine-rs" }
+limine = "0.1.12" 
 x86_64 = { git = "https://github.com/rust-osdev/x86_64" }
 acpi_parsing = { package = "acpi", version = "4.1.1" }
 libxernel = { path = "../../crates/libxernel", features = ["kernel"] }

xernel/kernel/src/main.rs

@@ -163,7 +163,8 @@ extern "C" fn kernel_main() -> ! {
         PageTableFlags::WRITABLE | PageTableFlags::USER_ACCESSIBLE | PageTableFlags::PRESENT,
         true,
     );
-    process.lock().get_page_table().unwrap().map(
+    let mut pm = process.lock().get_page_table().unwrap();
+    pm.map(
         page,
         Page::from_start_address(VirtAddr::new(0x200000)).unwrap(),
         PageTableFlags::WRITABLE | PageTableFlags::USER_ACCESSIBLE | PageTableFlags::PRESENT,

xernel/kernel/src/mem/mmap.rs

@@ -30,8 +30,7 @@ pub fn mmap(
 
     match flags {
         MapFlags::ANONYMOUS => {
-            let start_address = process.vm().find_next_start_address();
-            process.vm().add_entry(start_address, len, prot, flags);
+            let start_address = process.vm().create_entry_at(addr, len, prot, flags);
 
             Ok(start_address.as_u64() as isize)
         }
@@ -60,7 +59,7 @@ pub fn handle_page_fault(addr: VirtAddr, error_code: PageFaultErrorCode) -> bool
         let base_addr = addr.align_down(Size4KiB::SIZE);
         let frame = FRAME_ALLOCATOR.lock().allocate_frame::<Size4KiB>().unwrap();
 
-        let pt_flags = ptflags_from_protflags(vm_entry.prot);
+        let pt_flags = ptflags_from_protflags(vm_entry.prot, process.page_table.is_some());
         let mut pt = process.get_page_table().unwrap();
 
         pt.map::<Size4KiB>(frame, Page::from_start_address(base_addr).unwrap(), pt_flags, true);

xernel/kernel/src/mem/mod.rs

@@ -13,12 +13,12 @@ pub static HIGHER_HALF_OFFSET: Once<u64> = Once::new();
 
 pub const KERNEL_OFFSET: u64 = 0xffff_ffff_8000_0000;
 pub const HEAP_START_ADDR: usize = 0xffff_9000_0000_0000;
-// NOTE: there are 16 TB available for mmap until it overflows into the non-canonical address space
-pub const MMAP_START_ADDR: usize = 0x0000_7000_0000_0000;
 
 // NOTE: stack grows down
 pub const KERNEL_THREAD_STACK_TOP: u64 = 0xffff_a000_0000_0000;
-pub const USER_THREAD_STACK_TOP: u64 = 0x0000_7FFF_FFFF_F000;
+
+pub const PROCESS_START: u64 = 0x0000_0000_0040_0000;
+pub const PROCESS_END: u64 = 0x0000_ffff_ffff_f000;
 
 pub const STACK_SIZE: u64 = 0x40000;
 pub const FRAME_SIZE: u64 = 4096;

xernel/kernel/src/mem/paging.rs

@@ -9,7 +9,7 @@ use limine::KernelAddressRequest;
 use x86_64::{
     align_down,
     registers::control::{Cr3, Cr3Flags},
-    structures::paging::{Page, PageSize, Size1GiB, Size2MiB, Size4KiB},
+    structures::paging::{Page, PageSize, PageTableIndex, Size1GiB, Size2MiB, Size4KiB},
 };
 use x86_64::{
     structures::paging::{PageTable, PageTableFlags, PhysFrame},
@@ -293,11 +293,83 @@ impl Pagemap {
             (*pml1)[virt.p1_index()].set_unused();
         }
     }
+
+    unsafe fn get_pt(pt: *mut PageTable, pt_index: PageTableIndex) -> *mut PageTable {
+        (*pt)[pt_index].addr().as_u64() as *mut PageTable
+    }
+
+    /// Only works with 4KiB pages
+    pub fn translate(&self, virt: VirtAddr) -> Option<PhysAddr> {
+        let pml4 = self.page_table;
+
+        unsafe {
+            if !(*pml4)[virt.p4_index()].flags().contains(PageTableFlags::PRESENT) {
+                return None;
+            }
+
+            let pml3 = Self::get_pt(pml4, virt.p4_index());
+
+            if !(*pml3)[virt.p3_index()].flags().contains(PageTableFlags::PRESENT) {
+                return None;
+            }
+
+            let pml2 = Self::get_pt(pml3, virt.p3_index());
+
+            if !(*pml2)[virt.p2_index()].flags().contains(PageTableFlags::PRESENT) {
+                return None;
+            }
+
+            let pml1 = Self::get_pt(pml2, virt.p2_index());
+
+            if !(*pml1)[virt.p1_index()].flags().contains(PageTableFlags::PRESENT) {
+                return None;
+            }
+
+            Some((*pml1)[virt.p1_index()].addr() + u64::from(virt.page_offset()))
+        }
+    }
+
+    fn deallocate_pt(pt: *mut PageTable, level: u8) {
+        let mut frame_allocator = FRAME_ALLOCATOR.lock();
+        if level == 4 {
+            for i in 0..256 {
+                unsafe {
+                    if (*pt)[i].flags().contains(PageTableFlags::PRESENT) {
+                        let pt = ((*pt)[i].addr().as_u64() + *HIGHER_HALF_OFFSET) as *mut PageTable;
+
+                        Self::deallocate_pt(pt, level - 1);
+                    }
+                }
+            }
+
+            unsafe {
+                frame_allocator.deallocate_frame(
+                    PhysFrame::<Size4KiB>::from_start_address(PhysAddr::new(pt as u64 - *HIGHER_HALF_OFFSET)).unwrap(),
+                );
+            }
+        } else if level > 1 {
+            for i in 0..512 {
+                unsafe {
+                    if (*pt)[i].flags().contains(PageTableFlags::PRESENT) {
+                        let pt = ((*pt)[i].addr().as_u64() + *HIGHER_HALF_OFFSET) as *mut PageTable;
+
+                        Self::deallocate_pt(pt, level - 1);
+                    }
+                }
+            }
+
+            unsafe {
+                frame_allocator.deallocate_frame(
+                    PhysFrame::<Size4KiB>::from_start_address(PhysAddr::new(pt as u64 - *HIGHER_HALF_OFFSET)).unwrap(),
+                );
+            }
+        }
+    }
 }
 
 impl Drop for Pagemap {
     fn drop(&mut self) {
-        //todo!("drop pagemap")
+        Self::deallocate_pt(self.page_table, 4);
     }
 }
 

xernel/kernel/src/mem/vm.rs

@@ -1,17 +1,20 @@
-use alloc::vec::Vec;
+use alloc::collections::BTreeMap;
 use libxernel::syscall::{MapFlags, ProtectionFlags};
-use x86_64::align_up;
-use x86_64::structures::paging::PageTableFlags;
+use x86_64::structures::paging::{PageTableFlags, PhysFrame};
 use x86_64::{
     structures::paging::{PageSize, Size4KiB},
     VirtAddr,
 };
 
-use super::MMAP_START_ADDR;
+use crate::cpu::current_process;
+use crate::mem::PROCESS_END;
+
+use super::frame::FRAME_ALLOCATOR;
+use super::{PROCESS_START, STACK_SIZE};
 
 pub struct VmEntry {
-    start: VirtAddr,
-    length: usize,
+    pub start: VirtAddr,
+    pub length: usize,
     pub prot: ProtectionFlags,
     pub flags: MapFlags,
     // TODO: add something to represent to which file this entry belongs to
@@ -22,55 +25,175 @@ impl VmEntry {
     pub fn end(&self) -> VirtAddr {
         self.start + self.length
     }
+
+    pub fn unmap(&self) {
+        let process = current_process();
+        let process = process.lock();
+
+        // SAFETY: only userspace processes should have Vm mappings
+        let mut page_mapper = process.get_page_table().unwrap();
+        let mut frame_allocator = FRAME_ALLOCATOR.lock();
+
+        for page in (self.start..self.end()).step_by(Size4KiB::SIZE as usize) {
+            if let Some(phys_addr) = page_mapper.translate(page) {
+                unsafe {
+                    frame_allocator.deallocate_frame(PhysFrame::<Size4KiB>::containing_address(phys_addr));
+                }
+            }
+
+            page_mapper.unmap(page);
+        }
+    }
 }
 
 pub struct Vm {
-    entries: Vec<VmEntry>,
+    entries: BTreeMap<VirtAddr, VmEntry>,
 }
 
 impl Vm {
     pub const fn new() -> Self {
-        Self { entries: Vec::new() }
+        Self {
+            entries: BTreeMap::new(),
+        }
     }
 
-    pub fn add_entry(&mut self, start: VirtAddr, length: usize, prot: ProtectionFlags, flags: MapFlags) {
-        self.entries.push(VmEntry {
+    fn add_entry(&mut self, start: VirtAddr, length: usize, prot: ProtectionFlags, flags: MapFlags) {
+        let entry = VmEntry {
             start,
             length,
             prot,
             flags,
             file: None,
-        });
+        };
+
+        self.entries.insert(start, entry);
+    }
+
+    pub fn is_available(&self, start: VirtAddr, length: usize) -> bool {
+        !self.entries.iter().any(|(_, entry)| {
+            entry.start < start && entry.end() + Size4KiB::SIZE > start
+                || start + length + Size4KiB::SIZE > entry.start
+                    && (start + length + Size4KiB::SIZE).as_u64() < Size4KiB::SIZE
+        })
+    }
+
+    pub fn create_entry_low(&mut self, length: usize, prot: ProtectionFlags, flags: MapFlags) -> VirtAddr {
+        self.create_entry_at(VirtAddr::new(PROCESS_START), length, prot, flags)
     }
 
-    pub fn find_next_start_address(&self) -> VirtAddr {
-        let last_entry = self.entries.last();
+    pub fn create_entry_high(&mut self, length: usize, prot: ProtectionFlags, flags: MapFlags) -> VirtAddr {
+        let mut start_address = VirtAddr::new(PROCESS_END - length as u64);
+
+        loop {
+            if self.is_available(start_address, length) {
+                if start_address.as_u64() < PROCESS_START {
+                    panic!(
+                        "create_entry_high: {:x}(length = {}) is out of bounds",
+                        start_address, length
+                    );
+                }
+
+                self.add_entry(start_address, length, prot, flags);
+                return start_address;
+            }
 
-        if let Some(last_entry) = last_entry {
-            VirtAddr::new(align_up(last_entry.end().as_u64(), Size4KiB::SIZE))
-        } else {
-            VirtAddr::new(MMAP_START_ADDR as u64)
+            // NOTE: at the moment only a stack should be create at the high end of the process address space
+            start_address -= STACK_SIZE;
+        }
+    }
+
+    /// A new entry is created at the given address or higher
+    pub fn create_entry_at(
+        &mut self,
+        mut start: VirtAddr,
+        length: usize,
+        prot: ProtectionFlags,
+        flags: MapFlags,
+    ) -> VirtAddr {
+        if start.as_u64() + length as u64 > PROCESS_END {
+            panic!("create_entry_at: {:x}(length = {}) is out of bounds", start, length);
+        }
+
+        if !start.is_aligned(Size4KiB::SIZE) {
+            panic!("create_entry_at: {:x} is not aligned", start);
+        }
+
+        if start.as_u64() < PROCESS_START {
+            start = VirtAddr::new(PROCESS_START);
+        }
+
+        if self.is_available(start, length) {
+            self.add_entry(start, length, prot, flags);
+            return start;
+        }
+
+        let mut values_iter = self.entries.values();
+        let mut previous = values_iter.next().unwrap();
+        let current = values_iter.next();
+
+        if current.is_none() {
+            let new_start = previous.end() + Size4KiB::SIZE;
+            let new_start = new_start.align_up(Size4KiB::SIZE);
+
+            self.add_entry(new_start, length, prot, flags);
+            return new_start;
+        }
+
+        let mut current = current.unwrap();
+
+        loop {
+            if current.start - previous.end() >= length as u64 + 2 * Size4KiB::SIZE {
+                let new_start = previous.end() + Size4KiB::SIZE;
+                let new_start = new_start.align_up(Size4KiB::SIZE);
+
+                self.add_entry(new_start, length, prot, flags);
+                return new_start;
+            }
+
+            previous = current;
+            let current_opt = values_iter.next();
+
+            if current_opt.is_none() {
+                let new_start = previous.end() + Size4KiB::SIZE;
+                let new_start = new_start.align_up(Size4KiB::SIZE);
+
+                if new_start.as_u64() + length as u64 > PROCESS_END {
+                    panic!(
+                        "create_entry_at: {:x}(length = {}) is out of bounds! Vm space is exhausted",
+                        new_start, length
+                    );
+                }
+
+                self.add_entry(new_start, length, prot, flags);
+                return new_start;
+            }
+
+            current = current_opt.unwrap();
         }
     }
 
     pub fn get_entry_from_address(&self, addr: VirtAddr) -> Option<&VmEntry> {
         self.entries
             .iter()
-            .find(|entry| entry.start <= addr && entry.end() > addr)
+            .find(|(_, entry)| entry.start <= addr && entry.end() > addr)
+            .map(|(_, entry)| entry)
     }
 
     pub fn clean_up(&mut self) {
-        todo!("clean up all mappings and free memory")
-        // NOTE: don't forget to remove the entries from the vector
+        self.entries.values().for_each(|value| value.unmap());
+        self.entries.clear();
     }
 }
 
-pub fn ptflags_from_protflags(flags: ProtectionFlags) -> PageTableFlags {
+pub fn ptflags_from_protflags(flags: ProtectionFlags, user_accessible: bool) -> PageTableFlags {
     let mut new_flags = PageTableFlags::PRESENT;
 
-    if flags.contains(ProtectionFlags::READ) {
-        // TODO: how to handle this??
-        todo!("PageTableFlags::READ")
+    if user_accessible {
+        new_flags |= PageTableFlags::USER_ACCESSIBLE;
+    }
+
+    if !flags.contains(ProtectionFlags::READ) {
+        // NOTE: it is not possible to remove read access from a page
     }
 
     if flags.contains(ProtectionFlags::WRITE) {