refactor: hsm cell 拆分 crate

temp: 增加启动逻辑
Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

Cargo.lock

@@ -1,3 +1,3 @@
 [workspace]
-members = ["rustsbi-qemu", "test-kernel", "bench-kernel", "xtask"]
+members = ["rustsbi-qemu", "hsm-cell", "test-kernel", "bench-kernel", "xtask"]
 default-members = ["xtask"]

Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "hsm-cell"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+sbi-spec = "0.0.4"

hsm-cell/Cargo.toml

@@ -0,0 +1,100 @@
+//! 硬件线程状态和受状态保护的线程间共享数据。
+
+#![no_std]
+#![deny(warnings, missing_docs)]
+
+use core::{
+    cell::UnsafeCell,
+    hint::spin_loop,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+use sbi_spec::hsm::*;
+
+/// 硬件线程状态和受状态保护的线程间共享数据。
+pub struct HsmCell<T> {
+    status: AtomicUsize,
+    val: UnsafeCell<Option<T>>,
+}
+
+/// 当前硬件线程的共享对象。
+pub struct LocalHsmCell<'a, T>(&'a HsmCell<T>);
+
+/// 任意硬件线程的共享对象。
+pub struct RemoteHsmCell<'a, T>(&'a HsmCell<T>);
+
+unsafe impl<T: Send> Sync for HsmCell<T> {}
+unsafe impl<T: Send> Send for HsmCell<T> {}
+
+const HART_STATE_START_PENDING_EXT: usize = usize::MAX;
+
+impl<T> HsmCell<T> {
+    /// 从当前硬件线程的状态中获取线程间共享对象。
+    ///
+    /// # Safety
+    ///
+    /// 用户需要确保对象属于当前硬件线程。
+    #[inline]
+    pub unsafe fn local(&self) -> LocalHsmCell<'_, T> {
+        LocalHsmCell(self)
+    }
+
+    /// 取出共享对象。
+    #[inline]
+    pub fn remote(&self) -> RemoteHsmCell<'_, T> {
+        RemoteHsmCell(self)
+    }
+}
+
+impl<T> LocalHsmCell<'_, T> {
+    /// 从启动挂起状态的硬件线程取出共享数据，并将其状态设置为启动，如果成功返回取出的数据，否则返回当前状态。
+    #[inline]
+    pub fn start(&self) -> Result<T, usize> {
+        loop {
+            match self.0.status.compare_exchange(
+                HART_STATE_START_PENDING,
+                HART_STATE_STARTED,
+                Ordering::AcqRel,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => break Ok(unsafe { (*self.0.val.get()).take().unwrap() }),
+                Err(HART_STATE_START_PENDING_EXT) => spin_loop(),
+                Err(s) => break Err(s),
+            }
+        }
+    }
+}
+
+impl<T> RemoteHsmCell<'_, T> {
+    /// 向关闭状态的硬件线程传入共享数据，并将其状态设置为启动挂起，返回是否放入成功。
+    #[inline]
+    pub fn start(self, t: T) -> bool {
+        if self
+            .0
+            .status
+            .compare_exchange(
+                HART_STATE_STOPPED,
+                HART_STATE_START_PENDING_EXT,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            )
+            .is_ok()
+        {
+            unsafe { *self.0.val.get() = Some(t) };
+            self.0
+                .status
+                .store(HART_STATE_START_PENDING, Ordering::Release);
+            true
+        } else {
+            false
+        }
+    }
+
+    /// 取出当前状态。
+    #[inline]
+    pub fn sbi_get_status(&self) -> usize {
+        match self.0.status.load(Ordering::Acquire) {
+            HART_STATE_START_PENDING_EXT => HART_STATE_START_PENDING,
+            normal => normal,
+        }
+    }
+}

hsm-cell/src/lib.rs

@@ -27,6 +27,7 @@ rcore-console = "0.0.0"
 dtb-walker = "=0.2.0-alpha.3"
 qemu-exit = "3.0"
 
+hsm-cell = { path = "../hsm-cell" }
 fast-trap = { git = "https://github.com/YdrMaster/fast-trap", features = [
     "riscv-m",
 ] }

rustsbi-qemu/Cargo.toml

@@ -7,7 +7,6 @@ mod clint;
 mod device_tree;
 mod execute;
 mod hart_csr_utils;
-mod hsm_cell;
 mod qemu_hsm;
 mod qemu_test;
 
@@ -34,7 +33,8 @@ use core::{
 use device_tree::BoardInfo;
 use execute::Operation;
 use fast_trap::{
-    reuse_stack_for_trap, FastContext, FastResult, FlowContext, FreeTrapStack, TrapStackBlock,
+    load_direct_trap_entry, reuse_stack_for_trap, FastContext, FastResult, FlowContext,
+    FreeTrapStack, TrapStackBlock,
 };
 use hsm_cell::HsmCell;
 use riscv::register::*;
@@ -152,11 +152,38 @@ extern "C" fn rust_main(_hartid: usize, opaque: usize) -> Operation {
         // 设置并打印 pmp
         set_pmp(board_info);
         hart_csr_utils::print_pmps();
+        // 设置陷入栈
+        unsafe { ROOT_STACK[hart_id()].load_as_stack() };
+        // 设置内核入口
+        unsafe {
+            ROOT_STACK[hart_id()]
+                .hart_context()
+                .hsm
+                .remote()
+                .start(Supervisor {
+                    start_addr: SUPERVISOR_ENTRY,
+                    opaque,
+                });
+        }
     } else {
+        // 设置 pmp
         set_pmp(BOARD_INFO.wait());
+        // 设置陷入栈
+        unsafe { ROOT_STACK[hart_id()].load_as_stack() };
+    }
+    // 准备启动调度
+    unsafe {
+        asm!("csrw mcause, {}", in(reg) cause::BOOT);
+        asm!("csrw mideleg, {}", in(reg) !0);
+        asm!("csrw medeleg, {}", in(reg) !0);
+        asm!("csrw mcounteren, {}", in(reg) !0);
+        medeleg::clear_supervisor_env_call();
+        medeleg::clear_machine_env_call();
+        mie::set_mext();
+        mie::set_msoft();
+        mie::set_mtimer();
+        load_direct_trap_entry();
     }
-
-    unsafe { ROOT_STACK[hart_id()].load_as_stack() };
 
     let hsm = HSM.wait();
     if let Some(supervisor) = hsm.take_supervisor() {
@@ -243,8 +270,12 @@ extern "C" fn fast_handler(
             cause::BOOT => {
                 let hart_id = hart_id();
                 let hart_ctx = unsafe { ROOT_STACK[hart_id].hart_context() };
-                match hart_ctx.hsm.take() {
+                match unsafe { hart_ctx.hsm.local() }.start() {
                     Ok(supervisor) => {
+                        unsafe {
+                            mstatus::set_mpie();
+                            mstatus::set_mpp(mstatus::MPP::Supervisor);
+                        }
                         hart_ctx.trap.a[0] = hart_id;
                         hart_ctx.trap.a[1] = supervisor.opaque;
                         hart_ctx.trap.pc = supervisor.start_addr;
@@ -256,7 +287,7 @@ extern "C" fn fast_handler(
                 }
                 ctx.call(2)
             }
-            _ => todo!(),
+            _ => unreachable!(),
         },
         T::Exception(_) | T::Interrupt(_) => todo!(),
     }