Merge pull request #240 from comix-kernel/hal-refactor

Hal refactor

Author: miiyakumo

os/.cargo/config.toml

@@ -22,3 +22,15 @@ runner = "./qemu-loongarch-run.sh"
 
 [net]
 retry = 3
+
+# x86_64 宿主测试（Mock 模式）的编译设置
+# 使用方式: cargo +nightly check --tests --target x86_64-unknown-linux-gnu
+# 或: RUSTFLAGS="-Cpanic=abort -Zpanic_abort_tests" cargo +nightly check --tests --target x86_64-unknown-linux-gnu
+#
+# 注意: cargo test 在 x86_64 上会因为 hashbrown -> allocator-api2 的
+# duplicate lang item 问题无法链接，这是已知问题。cargo check --tests 可以正常通过。
+[target.x86_64-unknown-linux-gnu]
+rustflags = [
+    "-Cpanic=abort",
+    "-Zpanic_abort_tests",
+]

os/Cargo.toml

@@ -4,26 +4,38 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-talc = { version = "4" }
+# 基础依赖（始终需要）
 lock_api = "0.4"
 bitflags = { version = "2.10.0" }
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 once_cell = { version = "1.21.3", default-features = false, features = [
     "alloc",
     "race",
 ] }
-xmas-elf = "0.9"
 paste = "1.0"
-ext4_rs = "1.3.2"
-virtio-drivers = "0.12.0"
-fdt = "0.1.5"
-smoltcp = { version = "0.12.0", default-features = false, features = ["alloc", "medium-ethernet", "proto-ipv4", "proto-ipv6", "socket-raw", "socket-tcp", "socket-udp"] }
-chrono = { version = "0.4", default-features = false, features = ["alloc"] }
-uart_16550 = "0.4.0"
-hashbrown = "0.16.1"
+
+# 功能分层依赖（optional，通过 feature gate 引入）
+talc = { version = "4", default-features = false, features = ["nightly_api", "lock_api"], optional = true }
+hashbrown = { version = "0.16.1", optional = true }
+xmas-elf = { version = "0.9", optional = true }
+ext4_rs = { version = "1.3.2", optional = true }
+virtio-drivers = { version = "0.12.0", optional = true }
+fdt = { version = "0.1.5", optional = true }
+smoltcp = { version = "0.12.0", default-features = false, features = ["alloc", "medium-ethernet", "proto-ipv4", "proto-ipv6", "socket-raw", "socket-tcp", "socket-udp"], optional = true }
+chrono = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
+uart_16550 = { version = "0.4.0", optional = true }
 
 [features]
-default = []
+default = ["sync", "alloc", "paging", "proc_vm", "fs", "net", "device"]
+sync = []
+alloc = ["sync", "dep:talc"]
+# device: 驱动层（virtio, fdt, uart, rtc）
+device = ["alloc", "dep:virtio-drivers", "dep:fdt", "dep:uart_16550", "dep:chrono"]
+paging = ["alloc"]
+proc = ["sync", "dep:hashbrown", "dep:xmas-elf"]
+fs = ["proc", "device", "dep:ext4_rs"]
+proc_vm = ["paging", "fs"]
+net = ["sync", "device", "dep:smoltcp"]
 proto-ipv6 = []
 
 # RISC-V 架构特定依赖
@@ -51,6 +63,8 @@ redundant_clone = "deny"
 
 [profile.dev]
 opt-level = 1  # 启用基本优化以减小代码体积
+panic = "abort"
 
 [profile.test]
 opt-level = 1  # 测试模式也启用基本优化
+panic = "abort"

os/build.rs

@@ -27,8 +27,11 @@ fn main() {
     println!("cargo:rerun-if-changed=../user");
     println!("cargo:rerun-if-changed=../scripts/make_init_simple_fs.py");
 
-    // 步骤 1: 编译用户程序
-    if user_dir.exists() {
+    // 步骤 1: 编译用户程序（仅在目标架构上编译）
+    let target = env::var("TARGET").unwrap_or_default();
+    let is_target_arch = target.contains("riscv64") || target.contains("loongarch");
+
+    if is_target_arch && user_dir.exists() {
         println!("cargo:warning=[build.rs] Building user programs...");
         let status = Command::new("make")
             .current_dir(&user_dir)
@@ -57,8 +60,13 @@ fn main() {
                 );
             }
         }
-    } else {
+    } else if is_target_arch {
         println!("cargo:warning=[build.rs] User directory not found, skipping user build");
+    } else {
+        println!(
+            "cargo:warning=[build.rs] Skipping user program build (target: {})",
+            target
+        );
     }
 
     // 步骤 2: 打包 simple_fs 镜像 (暂时禁用，直接创建空镜像)
@@ -135,8 +143,8 @@ fn main() {
         println!("cargo:rustc-env=EXT4_FS_IMAGE={}", dummy_img.display());
     }
 
-    // 3.2: 非测试模式下创建完整的运行时镜像
-    if !is_test {
+    // 3.2: 非测试模式下创建完整的运行时镜像（仅目标架构）
+    if !is_test && is_target_arch {
         let target = env::var("TARGET").unwrap_or_default();
         let arch_key = match env::var("ARCH") {
             Ok(val) if !val.is_empty() => {

os/src/arch/address.rs

@@ -0,0 +1,259 @@
+//! 类型安全的架构地址抽象
+//!
+//! 借鉴 moss-kernel 的地址类型体系设计：
+//! - Sealed trait 防止外部实现（安全边界）
+//! - 泛型 `Address<K, T>` 带 `MemKind` 和数据类型标记
+//! - 编译期防止地址空间混用
+//! - 安全访问控制：`PA::as_ptr()` unsafe, `VA::as_ptr()` safe, `UA` 不能直接转指针
+
+use core::marker::PhantomData;
+
+// ============================================================================
+// Sealed trait — 外部无法实现 MemKind
+// ============================================================================
+mod sealed {
+    pub trait Sealed {}
+}
+
+/// 内存地址种类标记 trait（sealed — 外部无法实现）
+pub trait MemKind:
+    sealed::Sealed + Ord + Clone + Copy + PartialEq + Eq + core::fmt::Debug
+{
+}
+
+// ============================================================================
+// 地址种类标记类型
+// ============================================================================
+
+/// 虚拟地址标记
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Virtual;
+impl sealed::Sealed for Virtual {}
+impl MemKind for Virtual {}
+
+/// 物理地址标记
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Physical;
+impl sealed::Sealed for Physical {}
+impl MemKind for Physical {}
+
+/// 用户空间地址标记
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct User;
+impl sealed::Sealed for User {}
+impl MemKind for User {}
+
+// ============================================================================
+// 泛型地址类型
+// ============================================================================
+
+/// 带地址种类 `K` 和数据类型 `T` 标记的地址
+///
+/// - `K`: 地址空间种类（Virtual / Physical / User）
+/// - `T`: 指向的数据类型（`()` 表示无类型标记）
+#[repr(transparent)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Address<K: MemKind, T> {
+    inner: usize,
+    _phantom: PhantomData<(K, T)>,
+}
+
+impl<K: MemKind, T> core::fmt::Debug for Address<K, T> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("Address")
+            .field("inner", &format_args!("0x{:x}", self.inner))
+            .finish()
+    }
+}
+
+// ============================================================================
+// 类型别名
+// ============================================================================
+
+/// 无类型标记的物理地址
+pub type PA = Address<Physical, ()>;
+/// 无类型标记的虚拟地址
+pub type VA = Address<Virtual, ()>;
+/// 无类型标记的用户空间地址
+pub type UA = Address<User, ()>;
+
+/// 带类型标记的物理地址指针
+pub type TPA<T> = Address<Physical, T>;
+/// 带类型标记的虚拟地址指针
+pub type TVA<T> = Address<Virtual, T>;
+
+// ============================================================================
+// Address 基本方法
+// ============================================================================
+
+impl<K: MemKind, T> Address<K, T> {
+    /// 从 `usize` 创建地址
+    pub const fn from_usize(addr: usize) -> Self {
+        Self {
+            inner: addr,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// 获取地址的 `usize` 值
+    pub const fn as_usize(&self) -> usize {
+        self.inner
+    }
+
+    /// 检查地址是否为零
+    pub fn is_null(self) -> bool {
+        self.inner == 0
+    }
+
+    /// 返回零地址
+    pub const fn null() -> Self {
+        Self::from_usize(0)
+    }
+
+    /// 获取页内偏移
+    pub fn page_offset(self) -> usize {
+        self.inner & (crate::config::PAGE_SIZE - 1)
+    }
+
+    /// 检查地址是否页对齐
+    pub fn is_page_aligned(self) -> bool {
+        self.page_offset() == 0
+    }
+
+    /// 向上对齐到页边界
+    pub fn page_aligned(self) -> Self {
+        let page_size = crate::config::PAGE_SIZE;
+        Self::from_usize((self.inner + page_size - 1) & !(page_size - 1))
+    }
+
+    /// 向下对齐到页边界
+    pub fn align_down_to_page(self) -> Self {
+        let page_size = crate::config::PAGE_SIZE;
+        Self::from_usize(self.inner & !(page_size - 1))
+    }
+
+    /// 向上对齐到指定对齐值
+    pub fn align_up(self, align: usize) -> Self {
+        Self::from_usize((self.inner + align - 1) & !(align - 1))
+    }
+
+    /// 增加字节偏移
+    pub fn add(self, offset: usize) -> Self {
+        Self::from_usize(self.inner + offset)
+    }
+
+    /// 减去字节偏移
+    pub fn sub(self, offset: usize) -> Self {
+        Self::from_usize(self.inner - offset)
+    }
+
+    /// 增加页数
+    pub fn add_pages(self, count: usize) -> Self {
+        self.add(count * crate::config::PAGE_SIZE)
+    }
+
+    /// 计算与另一地址的差值
+    pub fn diff(self, other: Self) -> isize {
+        self.inner as isize - other.inner as isize
+    }
+}
+
+// ============================================================================
+// 物理地址 (PA) 特有方法
+// ============================================================================
+
+impl<T> Address<Physical, T> {
+    /// 将物理地址转换为裸指针（只读）
+    ///
+    /// # Safety
+    ///
+    /// 裸物理地址访问需要显式承诺：调用者必须确保物理地址有效且已映射。
+    pub unsafe fn as_ptr(&self) -> *const T {
+        self.inner as *const T
+    }
+
+    /// 将物理地址转换为可变裸指针
+    ///
+    /// # Safety
+    ///
+    /// 裸物理地址访问需要显式承诺：调用者必须确保物理地址有效且已映射，
+    /// 并且没有其他活跃引用指向同一内存。
+    pub unsafe fn as_mut_ptr(&mut self) -> *mut T {
+        self.inner as *mut T
+    }
+}
+
+// ============================================================================
+// 虚拟地址 (VA) 特有方法
+// ============================================================================
+
+impl<T> Address<Virtual, T> {
+    /// 将虚拟地址转换为裸指针（只读）
+    ///
+    /// 虚拟地址已通过 MMU 映射，因此此操作不是 unsafe。
+    pub fn as_ptr(&self) -> *const T {
+        self.inner as *const T
+    }
+
+    /// 将虚拟地址转换为可变裸指针
+    pub fn as_mut_ptr(&mut self) -> *mut T {
+        self.inner as *mut T
+    }
+
+    /// 将虚拟地址转换为不可变引用
+    ///
+    /// # Safety
+    ///
+    /// 调用者必须确保地址指向的内存已初始化且未被其他可变引用借用。
+    pub unsafe fn as_ref<'a>(&self) -> &'a T {
+        unsafe { &*(self.inner as *const T) }
+    }
+
+    /// 将虚拟地址转换为可变引用
+    ///
+    /// # Safety
+    ///
+    /// 调用者必须确保地址指向的内存已初始化且无其他活跃引用。
+    pub unsafe fn as_mut<'a>(&mut self) -> &'a mut T {
+        unsafe { &mut *(self.inner as *mut T) }
+    }
+}
+
+// ============================================================================
+// 用户地址 (UA) — 不能直接转指针，必须通过安全机制访问
+// ============================================================================
+
+impl<T> Address<User, T> {
+    /// 用户地址不能直接转换为裸指针。
+    /// 必须通过 `copy_from_user`/`copy_to_user` 等安全机制访问。
+    #[deprecated(note = "UA 不能直接转指针，请使用 copy_from_user/copy_to_user")]
+    pub fn as_ptr(&self) -> *const T {
+        panic!("UA::as_ptr() is forbidden; use copy_from_user/copy_to_user")
+    }
+}
+
+// ============================================================================
+// AddressTranslator — 跨地址空间转换
+// ============================================================================
+
+/// 地址转换器 trait。
+///
+/// 只有通过 `Translator` 才能跨地址空间转换。
+///
+/// # 类型参数
+///
+/// * `T` - 要转换的地址携带的数据类型
+pub trait AddressTranslator<T>: 'static + Send + Sync {
+    /// 虚拟地址 → 物理地址
+    fn virt_to_phys(va: TVA<T>) -> TPA<T>;
+
+    /// 物理地址 → 虚拟地址
+    fn phys_to_virt(pa: TPA<T>) -> TVA<T>;
+}
+
+// ============================================================================
+// unsafe impl Send/Sync
+// ============================================================================
+
+unsafe impl<K: MemKind, T> Send for Address<K, T> {}
+unsafe impl<K: MemKind, T> Sync for Address<K, T> {}