update starry-vm to 0.2

Author: AsakuraMizu

Cargo.lock

@@ -69,7 +69,7 @@ slab = { version = "0.4.9", default-features = false }
 spin = "0.10"
 starry-process = "0.2"
 starry-signal = "0.2"
-starry-vm = "0.1"
+starry-vm = "0.2"
 
 starry-core = { path = "./core" }
 starry-api = { path = "./api" }
@@ -154,8 +154,8 @@ axpoll = { git = "https://github.com/Starry-OS/axpoll.git", rev = "258cb5f" }
 page_table_entry = { git = "https://github.com/Starry-OS/page_table_multiarch.git", rev = "3f697c8" }
 page_table_multiarch = { git = "https://github.com/Starry-OS/page_table_multiarch.git", rev = "3f697c8" }
 starry-process = { git = "https://github.com/Starry-OS/starry-process.git", rev = "6327455" }
-starry-signal = { git = "https://github.com/Starry-OS/starry-signal.git", rev = "6cc32f2" }
-starry-vm = { git = "https://github.com/Starry-OS/starry-vm.git", rev = "e2a50e7" }
+starry-signal = { git = "https://github.com/Starry-OS/starry-signal.git", rev = "5b23dec" }
+starry-vm = { git = "https://github.com/Starry-OS/starry-vm.git", rev = "4c91a6b" }
 
 [package.metadata.vendor-filter]
 platforms = ["riscv64gc-unknown-none-elf", "loongarch64-unknown-none-softfloat"]

Cargo.toml

@@ -57,7 +57,7 @@ slab.workspace = true
 spin.workspace = true
 starry-process.workspace = true
 starry-signal.workspace = true
-starry-vm = { workspace = true, features = ["axio"] }
+starry-vm.workspace = true
 syscalls = { git = "https://github.com/jasonwhite/syscalls.git", rev = "92624de", default-features = false }
 zerocopy = { version = "0.8.26", features = ["derive"] }
 

api/Cargo.toml

@@ -19,15 +19,17 @@ use inherit_methods_macro::inherit_methods;
 use linux_raw_sys::general::{RLIMIT_NOFILE, stat, statx, statx_timestamp};
 use spin::RwLock;
 use starry_core::{resources::AX_FILE_LIMIT, task::AsThread};
-use starry_vm::{VmBytes, VmBytesMut};
 
 pub use self::{
     fs::{Directory, File, ResolveAtResult, metadata_to_kstat, resolve_at, with_fs},
     net::Socket,
     pidfd::PidFd,
     pipe::Pipe,
 };
-use crate::io::IoVectorBufIo;
+use crate::{
+    io::IoVectorBufIo,
+    mm::{VmBytes, VmBytesMut},
+};
 
 #[derive(Debug, Clone, Copy)]
 pub struct Kstat {

api/src/file/mod.rs

@@ -1,18 +1,25 @@
 use alloc::string::String;
-use core::{alloc::Layout, ffi::c_char, hint::unlikely, mem::transmute, ptr, slice, str};
+use core::{
+    alloc::Layout,
+    ffi::c_char,
+    hint::unlikely,
+    mem::{MaybeUninit, transmute},
+    ptr, slice, str,
+};
 
 use axerrno::{AxError, AxResult};
 use axhal::{
     paging::MappingFlags,
     trap::{PAGE_FAULT, register_trap_handler},
 };
+use axio::{Buf, BufMut, Read, Write};
 use axtask::current;
 use memory_addr::{MemoryAddr, PAGE_SIZE_4K, VirtAddr};
 use starry_core::{
     mm::{access_user_memory, is_accessing_user_memory},
     task::AsThread,
 };
-use starry_vm::vm_load_until_nul;
+use starry_vm::{vm_load_until_nul, vm_read_slice, vm_write_slice};
 
 fn check_region(start: VirtAddr, layout: Layout, access_flags: MappingFlags) -> AxResult<()> {
     let align = layout.align();
@@ -256,3 +263,90 @@ pub fn vm_load_string(ptr: *const c_char) -> AxResult<String> {
     let bytes = vm_load_until_nul(ptr as *const u8)?;
     String::from_utf8(bytes).map_err(|_| AxError::IllegalBytes)
 }
+
+/// A read-only buffer in the VM's memory.
+///
+/// It implements the `axio::Read` trait, allowing it to be used with other I/O
+/// operations.
+pub struct VmBytes {
+    /// The pointer to the start of the buffer in the VM's memory.
+    pub ptr: *const u8,
+    /// The length of the buffer.
+    pub len: usize,
+}
+
+impl VmBytes {
+    /// Creates a new `VmBytes` from a raw pointer and a length.
+    pub fn new(ptr: *const u8, len: usize) -> Self {
+        Self { ptr, len }
+    }
+
+    /// Casts the `VmBytes` to a mutable `VmBytesMut`.
+    pub fn cast_mut(&self) -> VmBytesMut {
+        VmBytesMut::new(self.ptr as *mut u8, self.len)
+    }
+}
+
+impl Read for VmBytes {
+    /// Reads bytes from the VM's memory into the provided buffer.
+    fn read(&mut self, buf: &mut [u8]) -> axio::Result<usize> {
+        let len = self.len.min(buf.len());
+        vm_read_slice(self.ptr, unsafe {
+            transmute::<&mut [u8], &mut [MaybeUninit<u8>]>(&mut buf[..len])
+        })?;
+        self.ptr = self.ptr.wrapping_add(len);
+        self.len -= len;
+        Ok(len)
+    }
+}
+
+impl Buf for VmBytes {
+    fn remaining(&self) -> usize {
+        self.len
+    }
+}
+
+/// A mutable buffer in the VM's memory.
+///
+/// It implements the `axio::Write` trait, allowing it to be used with other I/O
+/// operations.
+pub struct VmBytesMut {
+    /// The pointer to the start of the buffer in the VM's memory.
+    pub ptr: *mut u8,
+    /// The length of the buffer.
+    pub len: usize,
+}
+
+impl VmBytesMut {
+    /// Creates a new `VmBytesMut` from a raw pointer and a length.
+    pub fn new(ptr: *mut u8, len: usize) -> Self {
+        Self { ptr, len }
+    }
+
+    /// Casts the `VmBytesMut` to a read-only `VmBytes`.
+    pub fn cast_const(&self) -> VmBytes {
+        VmBytes::new(self.ptr, self.len)
+    }
+}
+
+impl Write for VmBytesMut {
+    /// Writes bytes from the provided buffer into the VM's memory.
+    fn write(&mut self, buf: &[u8]) -> axio::Result<usize> {
+        let len = self.len.min(buf.len());
+        vm_write_slice(self.ptr, &buf[..len])?;
+        self.ptr = self.ptr.wrapping_add(len);
+        self.len -= len;
+        Ok(len)
+    }
+
+    /// Flushes the buffer. This is a no-op for `VmBytesMut`.
+    fn flush(&mut self) -> axio::Result {
+        Ok(())
+    }
+}
+
+impl BufMut for VmBytesMut {
+    fn remaining_mut(&self) -> usize {
+        self.len
+    }
+}

api/src/mm.rs

@@ -10,13 +10,13 @@ use axio::{Seek, SeekFrom};
 use axpoll::{IoEvents, Pollable};
 use axtask::current;
 use linux_raw_sys::general::__kernel_off_t;
-use starry_vm::{VmBytes, VmBytesMut, VmMutPtr, VmPtr};
+use starry_vm::{VmMutPtr, VmPtr};
 use syscalls::Sysno;
 
 use crate::{
     file::{File, FileLike, Pipe, SealedBuf, SealedBufMut, get_file_like},
     io::{IoVec, IoVectorBuf},
-    mm::UserConstPtr,
+    mm::{UserConstPtr, VmBytes, VmBytesMut},
 };
 
 struct DummyFd;

api/src/syscall/fs/io.rs

@@ -7,12 +7,11 @@ use axnet::{CMsgData, RecvFlags, RecvOptions, SendFlags, SendOptions, SocketAddr
 use linux_raw_sys::net::{
     MSG_PEEK, MSG_TRUNC, SCM_RIGHTS, SOL_SOCKET, cmsghdr, msghdr, sockaddr, socklen_t,
 };
-use starry_vm::{VmBytes, VmBytesMut};
 
 use crate::{
     file::{FileLike, Socket, add_file_like},
     io::{IoVec, IoVectorBuf},
-    mm::{UserConstPtr, UserPtr},
+    mm::{UserConstPtr, UserPtr, VmBytes, VmBytesMut},
     socket::SocketAddrExt,
     syscall::net::{CMsg, CMsgBuilder},
 };