no deps (riscv) + implemented LL heap

kernel/Cargo.lock

@@ -2,18 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "az"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
-
 [[package]]
 name = "bit_field"
 version = "0.10.2"
@@ -38,52 +26,12 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daaa1fb791aea49e19db7b7b3662665d511eb4e30a0627fa525fd92652f39358"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "embedded-graphics"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0649998afacf6d575d126d83e68b78c0ab0e00ca2ac7e9b3db11b4cbe8274ef0"
-dependencies = [
- "az",
- "byteorder",
- "embedded-graphics-core",
- "float-cmp",
- "micromath",
-]
-
-[[package]]
-name = "embedded-graphics-core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba9ecd261f991856250d2207f6d8376946cd9f412a2165d3b75bc87a0bc7a044"
-dependencies = [
- "az",
- "byteorder",
-]
-
-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "kernel"
 version = "0.1.0"
 dependencies = [
  "bootloader_api",
- "embedded-graphics",
  "lazy_static",
- "pc-keyboard",
  "pic8259",
  "uart_16550",
  "x86_64",
@@ -98,27 +46,6 @@ dependencies = [
  "spin",
 ]
 
-[[package]]
-name = "micromath"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815"
-
-[[package]]
-name = "num-traits"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "pc-keyboard"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6f2d937e3b8d63449b01401e2bae4041bc9dd1129c2e3e0d239407cf6635ac"
-
 [[package]]
 name = "pic8259"
 version = "0.10.4"

kernel/Cargo.toml

@@ -9,8 +9,6 @@ test = false
 bench = false
 
 [dependencies]
-embedded-graphics = "0.8.1"
-pc-keyboard = "0.5.0"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 pic8259 = "0.10.1"

kernel/src/allocator.rs

@@ -1,34 +1,11 @@
-use core::{alloc::GlobalAlloc, ops::Range, ptr::null_mut};
+use core::{alloc::GlobalAlloc, ops::Range};
 
-use crate::util::mutex::Mutex;
+use crate::{heap::Heap, util::mutex::Mutex};
 
 #[global_allocator]
-static ALLOCATOR: LockedHeap = LockedHeap::empty();
+pub static ALLOCATOR: LockedHeap = LockedHeap::empty();
 
-struct Heap {
+pub struct LockedHeap(Mutex<Heap>);
-    cur: *mut u8,
-    end: *mut u8,
-}
-
-impl Heap {
-    pub const fn empty() -> Self {
-        Self {
-            cur: null_mut(),
-            end: null_mut(),
-        }
-    }
-
-    pub fn init(&mut self, start: *mut u8, end: *mut u8) {
-        self.cur = start;
-        self.end = end;
-    }
-}
-
-pub fn init_heap(range: Range<*mut u8>) {
-    ALLOCATOR.init(range.start, range.end);
-}
-
-struct LockedHeap(Mutex<Heap>);
 
 // should look into why I need this, didn't see it in linked list alloc crate
 unsafe impl Sync for LockedHeap {}
@@ -37,24 +14,19 @@ impl LockedHeap {
     pub const fn empty() -> Self {
         Self(Mutex::new(Heap::empty()))
     }
-    pub fn init(&self, start: *mut u8, end: *mut u8) {
+    pub unsafe fn init(&self, range: Range<*mut u8>) {
-        self.0.lock().init(start, end);
+        self.0.lock().init(range);
+    }
+    pub fn print(&self) {
+        self.0.lock().print();
     }
 }
 
 unsafe impl GlobalAlloc for LockedHeap {
     unsafe fn alloc(&self, layout: core::alloc::Layout) -> *mut u8 {
-        // blazing fast implementation :sunglasses:
+        self.0.lock().alloc(layout)
-        // (gonna switch to my own linked list later)
-        let mut heap = self.0.lock();
-        let pointer = heap.cur;
-        heap.cur = heap.cur.add(layout.size());
-        if heap.cur >= heap.end {
-            return null_mut();
-        }
-        return pointer;
     }
     unsafe fn dealloc(&self, ptr: *mut u8, layout: core::alloc::Layout) {
-        // bet ur impl is slower
+        self.0.lock().dealloc(ptr, layout)
     }
 }

kernel/src/arch/riscv64/csr.rs

@@ -101,7 +101,7 @@ pub mod mcause {
 pub mod satp {
     use core::mem::transmute;
 
-    use crate::{arch::paging::Table, util::bits::get_bits};
+    use crate::{arch::paging::Table, util::bits::bits};
 
     #[derive(Debug)]
     #[repr(u64)]
@@ -131,9 +131,9 @@ pub mod satp {
     }
     pub fn read() -> Satp {
         let satp = unsafe { csrr!("satp") };
-        let mode = unsafe { transmute(get_bits!(satp[63,60])) };
+        let mode = unsafe { transmute(bits!(satp;60,63)) };
-        let asid = get_bits!(satp[59, 44]);
+        let asid = bits!(satp;44,59);
-        let ppn = unsafe { transmute(get_bits!(satp[43, 0]) << 12) };
+        let ppn = unsafe { transmute(bits!(satp;0,43) << 12) };
         Satp { mode, asid, ppn }
     }
     pub fn write(satp: Satp) {

kernel/src/arch/riscv64/paging.rs

@@ -1,6 +1,6 @@
 use crate::{
     arch::csr::{self, satp},
-    util::bits::get_bits,
+    util::bits::bits,
 };
 use core::slice;
 
@@ -36,7 +36,7 @@ impl Entry {
     }
     pub fn get_addr(&self) -> usize {
         let val = self.0;
-        get_bits!(val[53,10]) << 12
+        bits!(val;10,53) << 12
     }
     pub fn clear(&mut self) {
         self.0 = 0;
@@ -100,10 +100,10 @@ pub fn init(mem_end: *mut u8) -> *mut u8 {
 }
 
 pub fn virt_to_physical(table: &Table, addr: usize) -> usize {
-    let ppn2 = get_bits!(addr[38,30]);
+    let ppn2 = bits!(addr;30,38);
-    let ppn1 = get_bits!(addr[29,21]);
+    let ppn1 = bits!(addr;21,29);
-    let ppn0 = get_bits!(addr[20,12]);
+    let ppn0 = bits!(addr;12,20);
-    let offset = get_bits!(addr[11,0]);
+    let offset = bits!(addr;0,11);
     // let satp = csr::satp::read();
     unsafe {
         let lvl2 = table as *const Table;

kernel/src/heap/block.rs

@@ -0,0 +1,126 @@
+use core::{
+    mem::{size_of, transmute},
+    ops::{Deref, DerefMut},
+    ptr::null_mut,
+};
+
+pub const FREE_SIZE: usize = size_of::<FreeBlockInfo>() + size_of::<FreePointer>();
+pub const PTR_SIZE: usize = size_of::<FreePointer>();
+pub const USED_SIZE: usize = size_of::<BlockInfo>();
+
+pub struct BlockInfo(usize);
+
+impl BlockInfo {
+    pub const fn new(prev_used: bool, size: usize) -> Self {
+        Self(prev_used as usize | size)
+    }
+    pub fn prev_used(&self) -> bool {
+        self.0 & 1 == 1
+    }
+    pub fn size(&self) -> usize {
+        self.0 & !1
+    }
+}
+
+pub struct UsedPointer(*mut BlockInfo);
+
+impl Deref for UsedPointer {
+    type Target = BlockInfo;
+    fn deref(&self) -> &Self::Target {
+        unsafe { transmute(self.0) }
+    }
+}
+
+impl DerefMut for UsedPointer {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        unsafe { transmute(self.0) }
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct FreeBlockInfo {
+    pub size: usize,
+    pub prev: FreePointer,
+    pub next: FreePointer,
+}
+
+impl FreeBlockInfo {
+    pub fn pointer(&mut self) -> FreePointer {
+        FreePointer(self as *mut FreeBlockInfo)
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub struct FreePointer(*mut FreeBlockInfo);
+
+impl FreePointer {
+    pub const fn null() -> Self {
+        Self(null_mut())
+    }
+    pub unsafe fn new(addr: *mut u8, info: FreeBlockInfo) -> Self {
+        let ptr = Self(addr as *mut FreeBlockInfo);
+        let len = info.size;
+        *ptr.0 = info;
+        let end = addr.byte_add(len).byte_sub(PTR_SIZE) as *mut FreePointer;
+        *end = ptr;
+        Self(addr as *mut FreeBlockInfo)
+    }
+    pub fn to_used(mut self) -> *mut BlockInfo {
+        self.prev.next = self.next;
+        self.next.prev = self.prev;
+        self.0 as *mut BlockInfo
+    }
+    pub unsafe fn insert_new(&mut self, len: usize) -> *mut BlockInfo {
+        let old = self.0;
+        let new = old.byte_add(len);
+        *new = *old;
+        self.0 = new;
+        self.size = self.size - len;
+
+        self.prev.next = *self;
+        self.next.prev = *self;
+
+        old as *mut BlockInfo
+    }
+}
+
+impl Deref for FreePointer {
+    type Target = FreeBlockInfo;
+    fn deref(&self) -> &Self::Target {
+        unsafe { transmute(self.0) }
+    }
+}
+
+impl DerefMut for FreePointer {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        unsafe { transmute(self.0) }
+    }
+}
+
+pub struct FreeBlockIter {
+    end: FreePointer,
+    prev: FreePointer,
+}
+
+impl Iterator for FreeBlockIter {
+    // you know, I could've returned &'static mut FreeBlockInfo...
+    // that feels too wrong though
+    type Item = FreePointer;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.prev = unsafe { (*self.prev).next };
+        if self.prev == self.end {
+            None
+        } else {
+            Some(self.prev)
+        }
+    }
+}
+
+impl FreeBlockIter {
+    pub fn from(head: &mut FreeBlockInfo) -> Self {
+        Self {
+            end: FreePointer(head),
+            prev: FreePointer(head),
+        }
+    }
+}

kernel/src/heap/mod.rs

@@ -0,0 +1,266 @@
+use core::{mem::size_of, ops::Range, ptr::null_mut};
+
+// Heap stolen from my own riscv userspace implementation;
+// uses a doubly linked list of free blocks
+//
+// I tried to do this with idomatic rust (wrapper types)
+// but it turned out to just be cursed and messy bc
+// it's all unsafe raw pointers in the end :pensive:
+//
+// might try again later, but it'll probably just make it
+// slower and not much safer so
+
+use crate::println;
+
+const ALIGN: usize = 0b1000;
+const ALIGN_MASK: usize = !(ALIGN - 1);
+
+struct BlockInfo(usize);
+
+impl BlockInfo {
+    pub const fn new(prev_used: bool, size: usize) -> Self {
+        Self(prev_used as usize | size)
+    }
+    pub fn prev_used(&self) -> bool {
+        self.0 & 1 == 1
+    }
+    pub fn set_prev_used(&mut self) {
+        self.0 |= 1;
+    }
+    pub fn unset_prev_used(&mut self) {
+        self.0 &= !1;
+    }
+    pub fn size(&self) -> usize {
+        self.0 & !1
+    }
+}
+
+type BlockPointer = *mut BlockInfo;
+
+struct FreeBlockInfo {
+    info: BlockInfo,
+    prev: FreePointer,
+    next: FreePointer,
+}
+
+impl FreeBlockInfo {
+    pub fn prev_used(&self) -> bool {
+        self.info.prev_used()
+    }
+    pub fn size(&self) -> usize {
+        self.info.size()
+    }
+}
+
+type FreePointer = *mut FreeBlockInfo;
+
+const FREE_SIZE: usize = size_of::<FreeBlockInfo>() + size_of::<FreePointer>();
+const PTR_SIZE: usize = size_of::<FreePointer>();
+const USED_SIZE: usize = size_of::<BlockInfo>();
+
+pub struct Heap {
+    head: FreeBlockInfo,
+    start: *mut u8,
+    end: *mut u8,
+}
+
+impl Heap {
+    pub const fn empty() -> Self {
+        Self {
+            head: FreeBlockInfo {
+                info: BlockInfo(0),
+                prev: null_mut(),
+                next: null_mut(),
+            },
+            start: null_mut(),
+            end: null_mut(),
+        }
+    }
+
+    pub unsafe fn init(&mut self, range: Range<*mut u8>) {
+        let head = self.head();
+        let first = range.start as FreePointer;
+        let size = range.end as usize - range.start as usize;
+        create_free(
+            first,
+            FreeBlockInfo {
+                info: BlockInfo::new(true, size),
+                next: head,
+                prev: head,
+            },
+        );
+        self.head.next = first;
+        self.head.prev = first;
+        self.start = range.start;
+        self.end = range.end;
+    }
+
+    pub unsafe fn alloc(&mut self, layout: core::alloc::Layout) -> *mut u8 {
+        // calc aligned size
+        let mut size = layout.size() + USED_SIZE;
+        // does this matter? idr, copying from my riscv userspace impl
+        size = ((size - 1) & ALIGN_MASK) + ALIGN;
+        if size < FREE_SIZE {
+            size = FREE_SIZE;
+        }
+        // search for free block w enough space
+        for free in self.iter_free() {
+            let free_size = (*free).info.size();
+            // free block found
+            if free_size >= size {
+                // deal with leftover space
+                let leftover = free_size - size;
+                if leftover < FREE_SIZE {
+                    size = free_size;
+                    let mut next_used = free.byte_add(size) as BlockPointer;
+                    if next_used as *mut u8 == self.end {
+                        next_used = &mut self.head.info;
+                    }
+                    (*next_used).set_prev_used();
+                    let prev = (*free).prev;
+                    let next = (*free).next;
+                    (*prev).next = next;
+                    (*next).prev = prev;
+                } else {
+                    let new_free = free.byte_add(size);
+                    let prev = (*free).prev;
+                    let next = (*free).next;
+                    create_free(
+                        new_free,
+                        FreeBlockInfo {
+                            info: BlockInfo::new(true, leftover),
+                            prev,
+                            next,
+                        },
+                    );
+                    (*prev).next = new_free;
+                    (*next).prev = new_free;
+                }
+                // create block
+                let used = free as BlockPointer;
+                (*used) = BlockInfo::new(true, size);
+                let data = used.byte_add(USED_SIZE) as *mut u8;
+                return data;
+            }
+        }
+        return null_mut();
+    }
+
+    pub unsafe fn dealloc(&mut self, ptr: *mut u8, layout: core::alloc::Layout) {
+        let used = ptr.byte_sub(USED_SIZE) as BlockPointer;
+        let mut size = (*used).size();
+        let old_size = size;
+        let mut addr = used as FreePointer;
+        let mut prev = self.head();
+        let mut next = self.head.next;
+        if !(*used).prev_used() {
+            let prev_free = *(used.byte_sub(PTR_SIZE) as *mut FreePointer);
+            addr = prev_free;
+            size += (*prev_free).info.size();
+            prev = (*prev_free).prev;
+            next = (*prev_free).next;
+        }
+        let mut n_block = used.byte_add(old_size);
+        if n_block as *mut u8 != self.end {
+            let mut nn_block = n_block.byte_add((*n_block).size());
+            if nn_block as *mut u8 == self.end {
+                nn_block = &mut self.head.info;
+            }
+            if !(*nn_block).prev_used() {
+                size += (*n_block).size();
+                next = (*next).next;
+            }
+        }
+        create_free(
+            addr,
+            FreeBlockInfo {
+                info: BlockInfo::new(true, size),
+                prev,
+                next,
+            },
+        );
+        (*prev).next = addr;
+        (*next).prev = addr;
+        if n_block as *mut u8 == self.end {
+            n_block = &mut self.head.info;
+        }
+        (*n_block).unset_prev_used();
+    }
+
+    fn iter_free(&mut self) -> FreeBlockIter {
+        FreeBlockIter {
+            prev: &mut self.head,
+            end: &mut self.head,
+        }
+    }
+    fn iter_block(&mut self) -> BlockIter {
+        BlockIter {
+            cur: self.start as BlockPointer,
+            end: self.end,
+        }
+    }
+
+    fn head(&mut self) -> FreePointer {
+        &mut self.head as FreePointer
+    }
+
+    pub fn print(&mut self) {
+        unsafe {
+            println!("heap: {:?} -> {:?}", self.start, self.end);
+            for block in self.iter_block() {
+                let size = (*block).size();
+                let mut n_block = block.byte_add(size);
+                if n_block as *mut u8 == self.end {
+                    n_block = &mut self.head.info;
+                }
+                let used = if (*n_block).prev_used() {"used"} else {"free"};
+                println!(" - {:?}: {}, size 0x{:x}", block, used, size);
+            }
+            println!();
+        }
+    }
+}
+
+unsafe fn create_free(addr: FreePointer, info: FreeBlockInfo) {
+    let len = info.info.size();
+    *addr = info;
+    let end = addr.byte_add(len).byte_sub(PTR_SIZE) as *mut FreePointer;
+    *end = addr;
+}
+
+struct FreeBlockIter {
+    end: FreePointer,
+    prev: FreePointer,
+}
+
+impl Iterator for FreeBlockIter {
+    type Item = FreePointer;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.prev = unsafe { (*self.prev).next };
+        if self.prev == self.end {
+            None
+        } else {
+            Some(self.prev)
+        }
+    }
+}
+
+struct BlockIter {
+    end: *mut u8,
+    cur: BlockPointer,
+}
+
+impl Iterator for BlockIter {
+    type Item = BlockPointer;
+    fn next(&mut self) -> Option<Self::Item> {
+        unsafe {
+            let cur = self.cur;
+            if cur as *mut u8 == self.end {
+                return None;
+            }
+            let size = (*self.cur).size();
+            self.cur = cur.byte_add(size);
+            Some(cur)
+        }
+    }
+}

kernel/src/main.rs

@@ -8,35 +8,52 @@ use core::ops::Range;
 
 use fdt::FDT;
 
+use crate::allocator::ALLOCATOR;
+
 extern crate alloc;
 
 pub mod allocator;
 pub mod arch;
+pub mod dev;
 pub mod fdt;
+pub mod heap;
 pub mod log;
 pub mod qemu;
 pub mod util;
-pub mod dev;
 
 pub fn main(heap_mem: Range<*mut u8>, fdt: FDT) -> ! {
     println!("we out here vibin");
     println!("memory range: {:?}", fdt.mem_range());
-    println!("heap range: {:?}", heap_mem);
+    for node in &fdt {}
-    for node in &fdt {
+    unsafe {
-
+        ALLOCATOR.init(heap_mem);
     }
-    allocator::init_heap(heap_mem);
+    ALLOCATOR.print();
+    println!("----------- vec test:");
     let mut test = alloc::vec![1, 2, 3];
     test.push(3);
+    let test2 = alloc::vec![-1, -2, -3, -4];
+    ALLOCATOR.print();
     println!("{:?}", test);
-    unsafe {
+    println!("{:?}", test2);
-        let x = *(0x3000 as *const u8);
+    drop(test2);
-        println!("{}", x);
+    drop(test);
+    ALLOCATOR.print();
+    println!("----------- vec vec test:");
+    let mut test = alloc::vec::Vec::new();
+    for i in 0..4 {
+        let n = i*4;
+        test.push(alloc::vec![n, n+1, n+2, n+3]);
     }
-    for i in 0..10000 {
+    ALLOCATOR.print();
-        let test2: alloc::vec::Vec<i32> = alloc::vec::Vec::with_capacity(10_000_000);
+    println!("{:?}", test);
-        println!("{}", i);
+    drop(test);
+    ALLOCATOR.print();
+    println!("----------- dealloc test:");
+    for i in 0..1000 {
+        let test2: alloc::vec::Vec<i32> = alloc::vec::Vec::with_capacity(10_000_0000);
     }
+    ALLOCATOR.print();
     // for _ in 0..40000000 {}
     // let x = unsafe { *(0x10000000000 as *mut u8) };
     // println!("we got {x}");

kernel/src/util/bits.rs

@@ -3,12 +3,12 @@ use core::{
     mem::transmute,
 };
 
-macro_rules! get_bits {
+macro_rules! bits {
-    ($name:ident[$high:expr,$low:expr]) => {{
+    ($name:expr;$low:expr,$high:expr) => {{
         ($name & ((($name - $name + 2).pow($high - $low + 1) - 1) << $low)) >> $low
     }};
 }
-pub(crate) use get_bits;
+pub(crate) use bits;
 
 pub trait BeRep {
     fn _from_be(&self) -> Self;