网络socket的系统调用接口。

.gitignore

@@ -3,6 +3,7 @@
 !.gitkeep
 DragonOS.iso
 .idea/
+/tmp/
 kernel/kernel
 .DS_Store
 

kernel/src/driver/disk/ahci/ahci_inode.rs

@@ -108,9 +108,7 @@ impl IndexNode for LockedAhciInode {
     }
 
     fn poll(&self) -> Result<PollStatus, SystemError> {
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK | PollStatus::WRITE_MASK,
-        });
+        return Ok(PollStatus::READ | PollStatus::WRITE);
     }
 
     /// 读设备 - 应该调用设备的函数读写，而不是通过文件系统读写

kernel/src/driver/keyboard/ps2_keyboard.rs

@@ -150,9 +150,7 @@ impl IndexNode for LockedPS2KeyBoardInode {
     }
 
     fn poll(&self) -> Result<PollStatus, SystemError> {
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK,
-        });
+        return Ok(PollStatus::READ);
     }
 
     fn metadata(&self) -> Result<Metadata, SystemError> {

kernel/src/driver/net/virtio_net.rs

@@ -10,7 +10,7 @@ use virtio_drivers::{device::net::VirtIONet, transport::Transport};
 
 use crate::{
     driver::{virtio::virtio_impl::HalImpl, Driver},
-    kdebug, kerror, kinfo,
+    kerror, kinfo,
     libs::spinlock::SpinLock,
     net::{generate_iface_id, NET_DRIVERS},
     syscall::SystemError,

kernel/src/exception/trap.c

@@ -245,8 +245,9 @@ void do_page_fault(struct pt_regs *regs, unsigned long error_code)
     printk_color(RED, BLACK, "CR2:%#018lx\n", cr2);
 
     traceback(regs);
-    current_pcb->state = PROC_STOPPED;
-    sched();
+    process_do_exit(-1);
+    // current_pcb->state = PROC_STOPPED;
+    // sched();
 }
 
 // 15 Intel保留，请勿使用

kernel/src/filesystem/devfs/mod.rs

@@ -465,9 +465,7 @@ impl IndexNode for LockedDevFSInode {
             return Err(SystemError::EISDIR);
         }
 
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK | PollStatus::WRITE_MASK,
-        });
+        return Ok(PollStatus::READ | PollStatus::WRITE);
     }
 
     /// 读设备 - 应该调用设备的函数读写，而不是通过文件系统读写

kernel/src/filesystem/devfs/null_dev.rs

@@ -102,9 +102,7 @@ impl IndexNode for LockedNullInode {
     }
 
     fn poll(&self) -> Result<PollStatus, SystemError> {
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK | PollStatus::WRITE_MASK,
-        });
+        return Ok(PollStatus::READ | PollStatus::WRITE);
     }
 
     /// 读设备 - 应该调用设备的函数读写，而不是通过文件系统读写

kernel/src/filesystem/devfs/zero_dev.rs

@@ -102,9 +102,7 @@ impl IndexNode for LockedZeroInode {
     }
 
     fn poll(&self) -> Result<PollStatus, SystemError> {
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK | PollStatus::WRITE_MASK,
-        });
+        return Ok(PollStatus::READ | PollStatus::WRITE);
     }
 
     /// 读设备 - 应该调用设备的函数读写，而不是通过文件系统读写

kernel/src/filesystem/fat/fs.rs

@@ -1411,9 +1411,7 @@ impl IndexNode for LockedFATInode {
             return Err(SystemError::EISDIR);
         }
 
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK | PollStatus::WRITE_MASK,
-        });
+        return Ok(PollStatus::READ | PollStatus::WRITE);
     }
 
     fn create(

kernel/src/filesystem/procfs/mod.rs

@@ -425,9 +425,7 @@ impl IndexNode for LockedProcFSInode {
             return Err(SystemError::EISDIR);
         }
 
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK,
-        });
+        return Ok(PollStatus::READ);
     }
 
     fn fs(&self) -> Arc<dyn FileSystem> {

kernel/src/filesystem/ramfs/mod.rs

@@ -186,9 +186,7 @@ impl IndexNode for LockedRamFSInode {
             return Err(SystemError::EISDIR);
         }
 
-        return Ok(PollStatus {
-            flags: PollStatus::READ_MASK | PollStatus::WRITE_MASK,
-        });
+        return Ok(PollStatus::READ | PollStatus::WRITE);
     }
 
     fn fs(&self) -> Arc<dyn FileSystem> {

kernel/src/filesystem/vfs/file.rs

@@ -290,6 +290,12 @@ impl File {
 
         return Some(res);
     }
+
+    /// @brief 获取文件的类型
+    #[inline]
+    pub fn file_type(&self) -> FileType {
+        return self.file_type;
+    }
 }
 
 impl Drop for File {

kernel/src/filesystem/vfs/mod.rs

@@ -3,14 +3,14 @@
 pub mod core;
 pub mod file;
 pub mod mount;
-mod syscall;
+pub mod syscall;
 mod utils;
 
 use ::core::{any::Any, fmt::Debug};
 
 use alloc::{string::String, sync::Arc, vec::Vec};
 
-use crate::{syscall::SystemError, time::TimeSpec};
+use crate::{libs::casting::DowncastArc, syscall::SystemError, time::TimeSpec};
 
 use self::{core::generate_inode_id, file::FileMode};
 pub use self::{core::ROOT_INODE, file::FilePrivateData, mount::MountFS};
@@ -36,6 +36,8 @@ pub enum FileType {
     Pipe,
     /// 符号链接
     SymLink,
+    /// 套接字
+    Socket,
 }
 
 /* these are defined by POSIX and also present in glibc's dirent.h */
@@ -68,20 +70,18 @@ impl FileType {
             FileType::CharDevice => DT_CHR,
             FileType::Pipe => DT_FIFO,
             FileType::SymLink => DT_LNK,
+            FileType::Socket => DT_SOCK,
         };
     }
 }
 
-/// @brief inode的状态（由poll方法返回）
-#[derive(Debug, Default, PartialEq)]
-pub struct PollStatus {
-    pub flags: u8,
-}
-
-impl PollStatus {
-    pub const WRITE_MASK: u8 = (1u8 << 0);
-    pub const READ_MASK: u8 = (1u8 << 1);
-    pub const ERR_MASK: u8 = (1u8 << 2);
+bitflags! {
+    /// @brief inode的状态（由poll方法返回）
+    pub struct PollStatus: u8 {
+        const WRITE = 1u8 << 0;
+        const READ = 1u8 << 1;
+        const ERROR = 1u8 << 2;
+    }
 }
 
 pub trait IndexNode: Any + Sync + Send + Debug {
@@ -336,6 +336,12 @@ pub trait IndexNode: Any + Sync + Send + Debug {
     }
 }
 
+impl DowncastArc for dyn IndexNode {
+    fn as_any_arc(self: Arc<Self>) -> Arc<dyn Any> {
+        self
+    }
+}
+
 impl dyn IndexNode {
     /// @brief 将当前Inode转换为一个具体的结构体（类型由T指定）
     /// 如果类型正确，则返回Some,否则返回None
@@ -482,6 +488,27 @@ pub struct Metadata {
     pub raw_dev: usize,
 }
 
+impl Default for Metadata {
+    fn default() -> Self {
+        return Self {
+            dev_id: 0,
+            inode_id: 0,
+            size: 0,
+            blk_size: 0,
+            blocks: 0,
+            atime: TimeSpec::default(),
+            mtime: TimeSpec::default(),
+            ctime: TimeSpec::default(),
+            file_type: FileType::File,
+            mode: 0,
+            nlinks: 1,
+            uid: 0,
+            gid: 0,
+            raw_dev: 0,
+        };
+    }
+}
+
 /// @brief 所有文件系统都应该实现的trait
 pub trait FileSystem: Any + Sync + Send + Debug {
     /// @brief 获取当前文件系统的root inode的指针

kernel/src/filesystem/vfs/syscall.rs

@@ -1,6 +1,6 @@
 use core::ffi::{c_char, CStr};
 
-use alloc::{boxed::Box, string::ToString};
+use alloc::{boxed::Box, string::ToString, vec::Vec};
 
 use crate::{
     arch::asm::{current::current_pcb, ptrace::user_mode},
@@ -435,3 +435,106 @@ pub extern "C" fn sys_dup2(regs: &pt_regs) -> u64 {
         return r.unwrap_err().to_posix_errno() as u64;
     }
 }
+
+#[repr(C)]
+#[derive(Debug, Clone, Copy)]
+pub struct IoVec {
+    /// 缓冲区的起始地址
+    pub iov_base: *mut u8,
+    /// 缓冲区的长度
+    pub iov_len: usize,
+}
+
+/// 用于存储多个来自用户空间的IoVec
+///
+/// 由于目前内核中的文件系统还不支持分散读写，所以暂时只支持将用户空间的IoVec聚合成一个缓冲区，然后进行操作。
+/// TODO：支持分散读写
+#[derive(Debug)]
+pub struct IoVecs(Vec<&'static mut [u8]>);
+
+impl IoVecs {
+    /// 从用户空间的IoVec中构造IoVecs
+    ///
+    /// @param iov 用户空间的IoVec
+    /// @param iovcnt 用户空间的IoVec的数量
+    /// @param readv 是否为readv系统调用
+    ///
+    /// @return 构造成功返回IoVecs，否则返回错误码
+    pub unsafe fn from_user(
+        iov: *const IoVec,
+        iovcnt: usize,
+        _readv: bool,
+    ) -> Result<Self, SystemError> {
+        // 检查iov指针所在空间是否合法
+        if !verify_area(
+            iov as usize as u64,
+            (iovcnt * core::mem::size_of::<IoVec>()) as u64,
+        ) {
+            return Err(SystemError::EFAULT);
+        }
+
+        // 将用户空间的IoVec转换为引用（注意：这里的引用是静态的，因为用户空间的IoVec不会被释放）
+        let iovs: &[IoVec] = core::slice::from_raw_parts(iov, iovcnt);
+
+        let mut slices: Vec<&mut [u8]> = vec![];
+        slices.reserve(iovs.len());
+
+        for iov in iovs.iter() {
+            if iov.iov_len == 0 {
+                continue;
+            }
+
+            if !verify_area(iov.iov_base as usize as u64, iov.iov_len as u64) {
+                return Err(SystemError::EFAULT);
+            }
+
+            slices.push(core::slice::from_raw_parts_mut(iov.iov_base, iov.iov_len));
+        }
+
+        return Ok(Self(slices));
+    }
+
+    /// @brief 将IoVecs中的数据聚合到一个缓冲区中
+    ///
+    /// @return 返回聚合后的缓冲区
+    pub fn gather(&self) -> Vec<u8> {
+        let mut buf = Vec::new();
+        for slice in self.0.iter() {
+            buf.extend_from_slice(slice);
+        }
+        return buf;
+    }
+
+    /// @brief 将给定的数据分散写入到IoVecs中
+    pub fn scatter(&mut self, data: &[u8]) {
+        let mut data: &[u8] = data;
+        for slice in self.0.iter_mut() {
+            let len = core::cmp::min(slice.len(), data.len());
+            if len == 0 {
+                continue;
+            }
+
+            slice[..len].copy_from_slice(&data[..len]);
+            data = &data[len..];
+        }
+    }
+
+    /// @brief 创建与IoVecs等长的缓冲区
+    ///
+    /// @param set_len 是否设置返回的Vec的len。
+    /// 如果为true，则返回的Vec的len为所有IoVec的长度之和;
+    /// 否则返回的Vec的len为0，capacity为所有IoVec的长度之和.
+    ///
+    /// @return 返回创建的缓冲区
+    pub fn new_buf(&self, set_len: bool) -> Vec<u8> {
+        let total_len: usize = self.0.iter().map(|slice| slice.len()).sum();
+        let mut buf: Vec<u8> = Vec::with_capacity(total_len);
+
+        if set_len {
+            unsafe {
+                buf.set_len(total_len);
+            }
+        }
+        return buf;
+    }
+}

kernel/src/lib.rs

@@ -6,6 +6,7 @@
 #![feature(panic_info_message)]
 #![feature(drain_filter)] // 允许Vec的drain_filter特性
 #![feature(c_void_variant)]
+#![feature(trait_upcasting)]
 #[allow(non_upper_case_globals)]
 #[allow(non_camel_case_types)]
 #[allow(non_snake_case)]
@@ -99,6 +100,9 @@ pub fn panic(info: &PanicInfo) -> ! {
 #[no_mangle]
 pub extern "C" fn __rust_demo_func() -> i32 {
     printk_color!(GREEN, BLACK, "__rust_demo_func()\n");
-    net_init().expect("Failed to init network");
+    let r = net_init();
+    if r.is_err() {
+        kwarn!("net_init() failed: {:?}", r.err().unwrap());
+    }
     return 0;
 }

kernel/src/libs/casting.rs

@@ -53,7 +53,7 @@ use alloc::sync::Arc;
 ///     assert!(a_arc2.is_some());
 /// }
 /// ```
-trait DowncastArc: Any + Send + Sync {
+pub trait DowncastArc: Any + Send + Sync {
     /// 请在具体类型中实现这个函数，返回self
     fn as_any_arc(self: Arc<Self>) -> Arc<dyn Any>;
 

kernel/src/libs/spinlock.rs

@@ -244,6 +244,10 @@ impl<T> DerefMut for SpinLockGuard<'_, T> {
 /// @brief 为SpinLockGuard实现Drop方法，那么，一旦守卫的生命周期结束，就会自动释放自旋锁，避免了忘记放锁的情况
 impl<T> Drop for SpinLockGuard<'_, T> {
     fn drop(&mut self) {
-        self.lock.lock.unlock();
+        if self.flag != 0 {
+            self.lock.lock.unlock_irqrestore(&self.flag);
+        } else {
+            self.lock.lock.unlock();
+        }
     }
 }