feat: support fatfs and ext4 fs

api/ruxfeat/Cargo.toml

@@ -50,6 +50,10 @@ fs = ["alloc", "dep:ruxfs", "ruxruntime/fs"]
 blkfs = ["ruxdriver/virtio-blk", "ruxruntime/blkfs"]
 myfs = ["ruxfs?/myfs"]
 9pfs = []
+fatfs = ["ruxfs?/fatfs"]
+lwext4_rust = ["ruxfs?/lwext4_rust"]
+ext4_rs = ["ruxfs?/ext4_rs"]
+another_ext4 = ["ruxfs?/another_ext4"]
 
 # Networking
 net = ["alloc", "ruxdriver/virtio-net", "dep:ruxnet", "ruxruntime/net"]

apps/custom/harness/src/main.rs

@@ -1,14 +1,13 @@
 #![no_std]
 #![no_main]
 
-use axstd::println;
-use core::{clone::Clone, format_args, panic};
+use core::{clone::Clone, panic};
 use core::{ffi::c_void, mem::size_of};
 use km_command::{fs::LibcDirent, FromBytes};
 use km_harness::{executor, harness_command, Command, Harness, MemPort};
 use ruxos_posix_api::{
     ctypes::dirent, sys_chdir, sys_close, sys_dup, sys_fstat, sys_getcwd, sys_getdents64,
-    sys_mkdirat, sys_openat, sys_unlinkat,
+    sys_mkdirat, sys_openat, sys_unlinkat
 };
 
 /// Size of harness buffer.
@@ -126,9 +125,9 @@ executor!(
 
 #[no_mangle]
 fn main() {
-    println!("CMD_BUF at {:p}", unsafe { CMD_BUF.as_ptr() });
-    println!("RETV_BUF at {:p}", unsafe { RETV_BUF.as_ptr() });
-    println!("OUTPUT_BUF at {:p}", unsafe { OUTPUT_BUF.as_ptr() });
+    log::warn!("CMD_BUF at {:p}", unsafe { CMD_BUF.as_ptr() });
+    log::warn!("RETV_BUF at {:p}", unsafe { RETV_BUF.as_ptr() });
+    log::warn!("OUTPUT_BUF at {:p}", unsafe { OUTPUT_BUF.as_ptr() });
 
     // Make test directory.
     let test_dir = b"test\0" as *const _ as *const i8;

modules/ruxfs/Cargo.toml

@@ -18,6 +18,9 @@ procfs = ["dep:axfs_ramfs"]
 sysfs = ["dep:axfs_ramfs"]
 etcfs = ["dep:axfs_ramfs"]
 fatfs = ["dep:fatfs"]
+lwext4_rust = ["dep:lwext4_rust"]
+ext4_rs = ["dep:ext4_rs"]
+another_ext4 = ["dep:another_ext4"]
 # myfs = ["dep:crate_interface"]
 myfs = []
 use-ramdisk = []
@@ -43,6 +46,11 @@ memory_addr = "0.1.0"
 
 ruxdriver = { path = "../ruxdriver", features = ["block"] }
 axalloc = { path = "../axalloc", optional = true }
+memory_addr = "0.1.0"
+lwext4_rust = { path = "../../crates/lwext4_rust", optional = true }
+ext4_rs = { git = "https://github.com/yuoo655/ext4_rs.git", rev= "6bcc7f5", optional = true }
+another_ext4 = { git = "https://github.com/LJxTHUCS/another_ext4.git", optional = true }
+
 [dependencies.fatfs]
 git = "https://github.com/syswonder/rust-fatfs.git"
 rev = "bf8ad02"

modules/ruxfs/src/dev.rs

@@ -99,6 +99,30 @@ impl Disk {
         Ok(write_size)
     }
 
+    /// Read a single block starting from the specified offset.
+    #[allow(unused)]
+    pub fn read_offset(&mut self, offset: usize) -> [u8; BLOCK_SIZE] {
+        let block_id = offset / BLOCK_SIZE;
+        let mut block_data = [0u8; BLOCK_SIZE];
+        self.dev
+            .read_block(block_id as u64, &mut block_data)
+            .unwrap();
+        block_data
+    }
+
+    /// Write single block starting from the specified offset.
+    #[allow(unused)]
+    pub fn write_offset(&mut self, offset: usize, buf: &[u8]) -> DevResult<usize> {
+        assert!(
+            buf.len() == BLOCK_SIZE,
+            "Buffer length must be equal to BLOCK_SIZE"
+        );
+        assert!(offset % BLOCK_SIZE == 0);
+        let block_id = offset / BLOCK_SIZE;
+        self.dev.write_block(block_id as u64, buf).unwrap();
+        Ok(buf.len())
+    }
+
     ///flush device cache
     pub fn do_flush(&mut self) -> DevResult {
         self.dev.flush()