can compile

Author: YinhuaChen-vivo

kernel/src/allocator/buddy/heap.rs

@@ -111,7 +111,7 @@ impl BuddyAllocatorCore {
             let page = &mut *self.pages.add(pfn);
             page.flags.insert(PageFlags::FREE);
             page.order = order as u8;
-            self.free_lists[order].push(page);
+            unsafe { self.free_lists[order].push(page); }
 
             pfn += 1 << order;
         }
@@ -134,7 +134,10 @@ impl BuddyAllocatorCore {
         }
 
         for o in search_order..=MAX_ORDER {
-            let page_ptr = self.free_lists[o].pop()?;
+            let page_ptr = match unsafe { self.free_lists[o].pop() } {
+                Some(p) => p,
+                None => continue,
+            };
             let mut current_order = o;
 
             while current_order > order {
@@ -143,7 +146,7 @@ impl BuddyAllocatorCore {
                 let buddy = unsafe { &mut *self.page_at_mut(buddy_pfn) };
                 buddy.flags.insert(PageFlags::FREE);
                 buddy.order = current_order as u8;
-                self.free_lists[current_order].push(buddy);
+                unsafe { self.free_lists[current_order].push(buddy); }
             }
 
             let page = unsafe { &mut *page_ptr };
@@ -202,7 +205,8 @@ impl BuddyAllocatorCore {
         self.base_addr + (pfn << PAGE_SHIFT)
     }
 
-    fn page_at_mut(&mut self, pfn: usize) -> *mut Page {
+    /// Get a mutable pointer to the `Page` descriptor for `pfn`.
+    pub(crate) fn page_at_mut(&mut self, pfn: usize) -> *mut Page {
         debug_assert!(pfn < self.total_pages);
         unsafe { self.pages.add(pfn) }
     }
@@ -215,7 +219,8 @@ impl BuddyAllocatorCore {
             let mut node = self.free_lists[order].peek();
             while let Some(ptr) = node {
                 count += 1;
-                node = unsafe { (*ptr).list.next };
+                let next = unsafe { (*ptr).list.next };
+                node = if next.is_null() { None } else { Some(next) };
             }
             free_pages += count * (1 << order);
         }

kernel/src/allocator/buddy/page.rs

@@ -91,6 +91,7 @@ impl Page {
 ///
 /// Uses the `list` field embedded in each `Page` for linkage.
 /// No heap allocations — all nodes are `Page` structs in the mem_map array.
+#[derive(Clone, Copy)]
 pub struct LinkedList {
     head: *mut Page,
 }

kernel/src/allocator/buddy/tests.rs

@@ -21,6 +21,7 @@
 use super::heap::{order_of_size, BuddyAllocatorCore, BuddyMemoryInfo};
 use super::page::{PageFlags, MAX_ORDER, PAGE_SIZE};
 use core::sync::atomic::Ordering;
+use alloc::vec::Vec;
 
 // 16 MiB test memory region — adjust based on test harness.
 const TEST_MEM_SIZE: usize = 16 * 1024 * 1024;
@@ -145,12 +146,14 @@ mod basic_tests {
 
         // Free one and try again
         let pfn = allocated.pop().unwrap();
-        unsafe { core.free_pages(&mut *core.page_at_mut(pfn), 0) };
+        let page = unsafe { &mut *core.page_at_mut(pfn) };
+        unsafe { core.free_pages(page, 0) };
         assert!(core.alloc_pages(0).is_some());
 
         // Clean up remaining allocations
         for pfn in allocated {
-            unsafe { core.free_pages(&mut *core.page_at_mut(pfn), 0) };
+            let page = unsafe { &mut *core.page_at_mut(pfn) };
+            unsafe { core.free_pages(page, 0) };
         }
     }
 }
@@ -298,7 +301,8 @@ mod aligned_tests {
 
         // Free all
         for pfn in allocated {
-            unsafe { core.free_pages(&mut *core.page_at_mut(pfn), 1) };
+            let page = unsafe { &mut *core.page_at_mut(pfn) };
+            unsafe { core.free_pages(page, 1) };
         }
 
         let after = core.memory_info().free_pages;
@@ -408,7 +412,8 @@ mod stress_tests {
 
         // Free in reverse order
         for (pfn, order) in allocated.into_iter().rev() {
-            unsafe { core.free_pages(&mut *core.page_at_mut(pfn), order) };
+            let page = unsafe { &mut *core.page_at_mut(pfn) };
+            unsafe { core.free_pages(page, order) };
         }
 
         let after = core.memory_info().free_pages;

kernel/src/boards/qemu_riscv32/mod.rs

@@ -19,7 +19,8 @@
 // Copyright (c) 2024 - present Microsoft Corporation
 // SPDX-License-Identifier: MIT
 
-mod config;
+pub mod config;
+pub use config::{DRAM_BASE, DRAM_SIZE};
 use crate::{
     arch,
     arch::riscv::{local_irq_enabled, trap_entry, Context},

kernel/src/boards/qemu_riscv64/mod.rs

@@ -19,7 +19,8 @@
 // Copyright (c) 2024 - present Microsoft Corporation
 // SPDX-License-Identifier: MIT
 
-mod config;
+pub mod config;
+pub use config::{DRAM_BASE, DRAM_SIZE};
 use crate::{
     arch,
     arch::riscv::{local_irq_enabled, trap_entry, Context},

kernel/src/boards/qemu_virt64_aarch64/mod.rs

@@ -14,6 +14,7 @@
 
 pub mod init;
 pub use init::*;
-mod config;
+pub mod config;
+pub use config::{DRAM_BASE, DRAM_SIZE};
 pub(crate) use config::{MMU_L1_DEVICE_BASES, MMU_L1_NORMAL_BASES};
 pub type ClockImpl = crate::devices::clock::gic_generic_timer::QemuGtClk;

kernel/src/boards/rk3568/mod.rs

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod config;
+pub mod config;
+pub use config::{DRAM_BASE, DRAM_SIZE};
 use crate::{arch, error::Error, sync::SpinLock, time};
 use blueos_driver::uart::ns16x50::Ns16x50Isr;
 use blueos_kconfig::CONFIG_NUM_CORES;