Simplifies uio construction

Author: ultimaweapon

kernel-1100/src/uio.rs

@@ -16,36 +16,20 @@ pub struct Uio {
 }
 
 impl okf::uio::Uio<Kernel> for Uio {
-    unsafe fn new(
-        td: *mut Thread,
-        op: UioRw,
-        seg: UioSeg,
-        iov: *mut IoVec,
-        len: usize,
-    ) -> Option<Self> {
-        // Check vec count.
-        if len > Self::vec_max() {
-            return None;
-        }
-
-        // Get total length.
-        let mut res = 0usize;
-
-        for i in 0..len {
-            res = res.checked_add((*iov.add(i)).len)?;
-        }
+    unsafe fn write(td: *mut Thread, iov: *mut IoVec) -> Option<Self> {
+        let res = (*iov).len;
 
         if res > Self::io_max() {
             return None;
         }
 
         Some(Self {
             iov,
-            len: len.try_into().unwrap(),
+            len: 1,
             off: -1,
             res: res.try_into().unwrap(),
-            seg,
-            op,
+            seg: UioSeg::Kernel,
+            op: UioRw::Write,
             td,
         })
     }

src/fd/mod.rs

@@ -1,6 +1,6 @@
 use crate::pcpu::Pcpu;
 use crate::thread::Thread;
-use crate::uio::{IoVec, Uio, UioRw, UioSeg};
+use crate::uio::{IoVec, Uio, UioSeg};
 use crate::Kernel;
 use bitflags::bitflags;
 use core::ffi::{c_char, c_int};
@@ -40,11 +40,10 @@ pub unsafe fn write_all<K: Kernel>(
     kern: K,
     fd: c_int,
     mut data: &[u8],
-    seg: UioSeg,
     td: *mut K::Thread,
 ) -> Result<(), NonZero<c_int>> {
     while !data.is_empty() {
-        let written = match write(kern, fd, data, seg, td) {
+        let written = match write(kern, fd, data, td) {
             Ok(v) => v,
             Err(e) if e == K::EINTR => continue,
             Err(e) => return Err(e),
@@ -67,7 +66,6 @@ pub unsafe fn write<K: Kernel>(
     kern: K,
     fd: c_int,
     data: &[u8],
-    seg: UioSeg,
     td: *mut K::Thread,
 ) -> Result<usize, NonZero<c_int>> {
     // Setup iovec.
@@ -77,7 +75,7 @@ pub unsafe fn write<K: Kernel>(
     };
 
     // Write.
-    let mut uio = K::Uio::new(td, UioRw::Write, seg, &mut vec, 1).unwrap();
+    let mut uio = K::Uio::write(td, &mut vec).unwrap();
     let errno = kern.kern_writev(td, fd, &mut uio);
 
     match NonZero::new(errno) {

src/uio/mod.rs

@@ -2,19 +2,12 @@ use crate::Kernel;
 
 /// Represents `uio` structure.
 pub trait Uio<K: Kernel>: Sized {
-    /// Returns [`None`] if `len` is geater than [`Uio::vec_max()`] or total length of `iov` is
-    /// greater than [`Uio::io_max()`].
+    /// Returns [`None`] if [`IoVec::len`] of `iov` is greater than [`Uio::io_max()`].
     ///
     /// # Safety
     /// - `td` cannot be null.
-    /// - `iov` cannot be null and must be valid up to `len`.
-    unsafe fn new(
-        td: *mut K::Thread,
-        op: UioRw,
-        seg: UioSeg,
-        iov: *mut IoVec,
-        len: usize,
-    ) -> Option<Self>;
+    /// - `iov` cannot be null.
+    unsafe fn write(td: *mut K::Thread, iov: *mut IoVec) -> Option<Self>;
 
     /// Returns value of `UIO_MAXIOV`.
     fn vec_max() -> usize {