Development

.github/workflows/main.yaml

@@ -29,8 +29,8 @@ jobs:
             mtools \
             lld \
             llvm \
-            cmake \
-            ninja-build \
+            cmake ninja-build \
+          curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh
 
       - name: Compile & Link (CMake)
         run: |

CMakeLists.txt

@@ -107,10 +107,10 @@ set(EXECF_SOURCES
 set(MM_SOURCES
     mm/PMem.c
     mm/MemOps.c
-    mm/KernelHeap.c
     mm/VMem.c
     mm/StackGuard.c
     mm/MemPool.c
+    mm/KernelHeap.c
     mm/trace/StackTrace.c
     mm/security/Cerberus.c
     mm/PageFaultHandler.c
@@ -191,6 +191,11 @@ if(NOT EXCLUDE_EXTRA_OBJECTS)
     )
 endif()
 
+# ============================================================================ 
+# Rust Memory Management
+# ============================================================================ 
+add_subdirectory(mm/rust)
+
 # ============================================================================ 
 # Build Include Directories
 # ============================================================================ 
@@ -248,6 +253,9 @@ if(NOT EXCLUDE_EXTRA_OBJECTS)
     target_sources(voidframe.krnl PRIVATE ${OBJ_SOURCES})
 endif()
 
+# Link Rust heap library
+target_link_libraries(voidframe.krnl PRIVATE rust_heap)
+
 # Configure the linker to use ld.lld with proper arguments
 set_target_properties(voidframe.krnl PROPERTIES
     LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/voidframe.ld"

kernel/etc/Shell.c

@@ -34,6 +34,7 @@
 #include "sound/Generic.h"
 #include "stdlib.h"
 #include "xHCI/xHCI.h"
+#include "KernelHeapRust.h"
 
 #define DATE __DATE__
 #define TIME __TIME__
@@ -363,7 +364,24 @@ static void AllocHandler(const char * args) {
         KernelFree(size_str);
         return;
     }
-    KernelMemoryAlloc((uint32_t)size);
+    if (!KernelMemoryAlloc((uint32_t)size)) PrintKernelErrorF("Allocation for %d bytes failed\n", size);
+    KernelFree(size_str);
+}
+
+static void RsAllocHandler(const char * args) {
+    char* size_str = GetArg(args, 1);
+    if (!size_str) {
+        PrintKernel("Usage: rsalloc <size>\n");
+        KernelFree(size_str);
+        return;
+    }
+    int size = atoi(size_str);
+    if (size <= 0) {
+        PrintKernel("Usage: rsalloc <size>\n");
+        KernelFree(size_str);
+        return;
+    }
+    if (!rust_kmalloc((uint32_t)size)) PrintKernelErrorF("Allocation for %d bytes failed\n", size);
     KernelFree(size_str);
 }
 
@@ -1182,6 +1200,7 @@ static const ShellCommand commands[] = {\
     {"mkdir", MkdirHandler},
     {"touch", TouchHandler},
     {"alloc", AllocHandler},
+    {"rsalloc", RsAllocHandler},
     {"panic", PanicHandler},
     {"kill", KillHandler},
     {"rm", RmHandler},

mm/KernelHeapRust.h

@@ -0,0 +1,36 @@
+#ifndef KERNEL_HEAP_RUST_H
+#define KERNEL_HEAP_RUST_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Core allocation functions
+void* rust_kmalloc(size_t size);
+void rust_kfree(void* ptr);
+void* rust_krealloc(void* ptr, size_t new_size);
+void* rust_kcalloc(size_t count, size_t size);
+
+// Statistics and monitoring
+typedef struct {
+    size_t total_allocated;
+    size_t peak_allocated;
+    uint64_t alloc_count;
+    uint64_t free_count;
+    uint64_t cache_hits;
+    uint64_t cache_misses;
+    uint64_t coalesce_count;
+    uint64_t corruption_count;
+} HeapStats;
+
+void rust_heap_get_stats(HeapStats* stats);
+int rust_heap_validate(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // KERNEL_HEAP_RUST_H

mm/rust/.cargo/config.toml

@@ -0,0 +1,9 @@
+[build]
+target = "x86_64-unknown-none"
+
+[target.x86_64-unknown-none]
+rustflags = [
+    "-C", "code-model=kernel",
+    "-C", "relocation-model=static",
+    "-C", "target-feature=-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2",
+]

mm/rust/CMakeLists.txt

@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.20)
+
+# Find Rust and Cargo
+find_program(CARGO_EXECUTABLE cargo REQUIRED)
+find_program(RUSTC_EXECUTABLE rustc REQUIRED)
+
+# Set target triple based on architecture
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
+    set(RUST_TARGET "x86_64-unknown-none")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
+    set(RUST_TARGET "aarch64-unknown-none")
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
+# Rust library target
+set(RUST_LIB_NAME "voidframe_mm")
+set(RUST_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/target/${RUST_TARGET}/release/lib${RUST_LIB_NAME}.a")
+
+# Custom command to build Rust library
+add_custom_command(
+    OUTPUT ${RUST_LIB_PATH}
+    COMMAND ${CARGO_EXECUTABLE} build --release --target ${RUST_TARGET}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.toml
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/lib.rs
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/heap.rs
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/vmem_ffi.rs
+    COMMENT "Building Rust heap library"
+)
+
+# Create imported library target
+add_custom_target(rust_heap_build DEPENDS ${RUST_LIB_PATH})
+
+add_library(rust_heap STATIC IMPORTED GLOBAL)
+set_target_properties(rust_heap PROPERTIES
+    IMPORTED_LOCATION ${RUST_LIB_PATH}
+)
+
+add_dependencies(rust_heap rust_heap_build)
+
+# Install header
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../KernelHeapRust.h
+        DESTINATION include/mm)

mm/rust/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "voidframe-mm"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["staticlib"]
+
+[dependencies]
+spin = { version = "0.9", default-features = false, features = ["mutex", "spin_mutex"] }
+
+[profile.release]
+panic = "abort"
+lto = true
+codegen-units = 1