fix(fs, vfs): revert filesystem and vfs locks back to spin::Mutex

- Revert Mutex in `axfs/disk.rs`, `fs/devfs.rs`, `fs/loop_dev.rs`, `fs/procfs.rs`, and `fs/tmpfs.rs` from `kspin::SpinNoIrq` back to `spin::Mutex`.
- Revert custom preemption-disabling Mutex wrapper in `axfs-ng-vfs` back to standard `spin::Mutex`.
- Remove `kernel_guard` dependency from `crates/axfs-ng-vfs/Cargo.toml`.

中译：
fix(fs, vfs): 将文件系统和 VFS 层所有的不必要锁还原为 spin::Mutex

- 将 `axfs/disk.rs`、`fs/devfs.rs`、`fs/loop_dev.rs`、`fs/procfs.rs` 和 `fs/tmpfs.rs` 中的 `kspin::SpinNoIrq` 还原回原生的 `spin::Mutex`。
- 将 `axfs-ng-vfs` 中的自定义关闭抢占 Mutex 包装器还原回标准的 `spin::Mutex`。
- 移除了 `crates/axfs-ng-vfs/Cargo.toml` 中引入的 `kernel_guard` 依赖。

Author: muou000

Cargo.lock

@@ -7,7 +7,7 @@ use alloc::{
 use core::mem;
 
 use axdriver::{AxBlockDevice, prelude::*};
-use kspin::SpinNoIrq as Mutex;
+use spin::Mutex;
 
 fn take<'a>(buf: &mut &'a [u8], cnt: usize) -> &'a [u8] {
     let (first, rem) = buf.split_at(cnt);

arceos/modules/axfs/src/disk.rs

@@ -16,7 +16,7 @@ use axfs_ng_vfs::{
 use axpoll::{IoEvents, Pollable};
 use rand_core::{Rng, SeedableRng};
 use rand_pcg::Pcg64Mcg;
-use kspin::SpinNoIrq as Mutex;
+use spin::Mutex;
 
 use super::super::disk::{SeekableDisk, SharedBlockDevice};
 

arceos/modules/axfs/src/fs/devfs.rs

@@ -1,6 +1,6 @@
 use alloc::sync::Arc;
 use core::sync::atomic::{AtomicU64, Ordering};
-use kspin::SpinNoIrq as Mutex;
+use spin::Mutex;
 use axdriver::prelude::{BaseDriverOps, BlockDriverOps, DeviceType, DevResult, DevError};
 
 pub struct LoopDeviceState {

arceos/modules/axfs/src/fs/loop_dev.rs

@@ -15,7 +15,7 @@ use axfs_ng_vfs::{
     InMemDir, InMemInode, update_metadata_impl, cmp_file_name,
 };
 use axpoll::{IoEvents, Pollable};
-use kspin::SpinNoIrq as Mutex;
+use spin::Mutex;
 
 static PID_MAX: core::sync::atomic::AtomicU32 = core::sync::atomic::AtomicU32::new(32768);
 

arceos/modules/axfs/src/fs/procfs.rs

@@ -3,7 +3,7 @@ use core::{any::Any, task::Context, time::Duration, cell::OnceCell};
 
 use axpoll::{IoEvents, Pollable};
 use slab::Slab;
-use kspin::SpinNoIrq as Mutex;
+use spin::Mutex;
 
 use axfs_ng_vfs::{
     DeviceId, DirEntry, DirEntrySink, DirNode, DirNodeOps, FileNode, FileNodeOps, Filesystem,

arceos/modules/axfs/src/fs/tmpfs.rs

@@ -58,6 +58,3 @@ version = "1.15"
 version = "0.10"
 features = ["mutex"]
 default-features = false
-
-[dependencies.kernel_guard]
-version = "0.1"

crates/axfs-ng-vfs/Cargo.toml

@@ -1,57 +1,7 @@
 use alloc::{collections::BTreeMap, string::String};
 use core::cmp::Ordering;
 use core::borrow::Borrow;
-pub struct Mutex<T> {
-    inner: spin::Mutex<T>,
-}
-
-impl<T: core::fmt::Debug> core::fmt::Debug for Mutex<T> {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        core::fmt::Debug::fmt(&self.inner, f)
-    }
-}
-
-impl<T> Mutex<T> {
-    pub const fn new(t: T) -> Self {
-        Self {
-            inner: spin::Mutex::new(t),
-        }
-    }
-
-    pub fn lock(&self) -> MutexGuard<'_, T> {
-        let guard = kernel_guard::NoPreempt::new();
-        MutexGuard {
-            inner: self.inner.lock(),
-            _guard: guard,
-        }
-    }
-}
-
-pub struct MutexGuard<'a, T> {
-    inner: spin::MutexGuard<'a, T>,
-    _guard: kernel_guard::NoPreempt,
-}
-
-impl<'a, T> core::ops::Deref for MutexGuard<'a, T> {
-    type Target = T;
-    #[inline]
-    fn deref(&self) -> &T {
-        &*self.inner
-    }
-}
-
-impl<'a, T> core::ops::DerefMut for MutexGuard<'a, T> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut T {
-        &mut *self.inner
-    }
-}
-
-impl<T: Default> Default for Mutex<T> {
-    fn default() -> Self {
-        Self::new(T::default())
-    }
-}
+use spin::Mutex;
 
 use crate::{DirEntrySink, NodeType, Metadata, MetadataUpdate, VfsResult};
 

crates/axfs-ng-vfs/src/inmem.rs

@@ -17,3 +17,5 @@ pub use inmem::*;
 
 pub type VfsError = axerrno::AxError;
 pub type VfsResult<T> = Result<T, VfsError>;
+
+use spin::{Mutex, MutexGuard};

crates/axfs-ng-vfs/src/lib.rs

@@ -12,7 +12,7 @@ use crate::fd_table::FdObject;
 
 const RING_BUFFER_SIZE: usize = 65536;
 
-pub static UNIX_REGISTRY: Mutex<alloc::collections::BTreeMap<alloc::string::String, (core::net::SocketAddr, alloc::sync::Weak<Socket>)>> = Mutex::new(alloc::collections::BTreeMap::new());
+pub static UNIX_REGISTRY: spin::Mutex<alloc::collections::BTreeMap<alloc::string::String, (core::net::SocketAddr, alloc::sync::Weak<Socket>)>> = spin::Mutex::new(alloc::collections::BTreeMap::new());
 
 pub struct LocalSocketRingBuffer {
     arr: [u8; RING_BUFFER_SIZE],