Support poll multiple packets

.github/workflows/vsock_interaction.yml

@@ -28,6 +28,6 @@ jobs:
       - name: Run Vsock Client on Host
         id: host_vsock_client
         run: |
-          sleep 5m
+          sleep 6m
           echo "Run vsock client on host...."
           echo "Hello from host" | socat -dd - vsock-connect:3:4321

kernel/aster-nix/src/net/socket/vsock/common.rs

@@ -196,40 +196,16 @@ impl VsockSpace {
     }
 
     /// Poll for each event from the driver
-    pub fn poll(&self) -> Result<Option<VsockEvent>> {
+    pub fn poll(&self) -> Result<()> {
         let mut driver = self.driver.lock_irq_disabled();
         let guest_cid = driver.guest_cid() as u32;
-        // match the socket and store the buffer body (if valid)
-        let result = driver
-            .poll(|event, body| {
+
+        while let Some(event) = self.poll_single(&mut driver)? {
             if !self.is_event_for_socket(&event) {
-                    return Ok(None);
+                debug!("ignore event {:?}", event);
+                continue;
             }
 
-                // Deal with Received before the buffer are recycled.
-                if let VsockEventType::Received { length } = event.event_type {
-                    // Only consider the connected socket and copy body to buffer
-                    if let Some(connected) = self
-                        .connected_sockets
-                        .read_irq_disabled()
-                        .get(&event.into())
-                    {
-                        debug!("Rw matches a connection with id {:?}", connected.id());
-                        if !connected.add_connection_buffer(body) {
-                            return Err(SocketError::BufferTooShort);
-                        }
-                        connected.update_io_events();
-                    } else {
-                        return Ok(None);
-                    }
-                }
-                Ok(Some(event))
-            })
-            .map_err(|e| Error::with_message(Errno::EIO, "driver poll failed, please try again"))?;
-
-        let Some(event) = result else {
-            return Ok(None);
-        };
             debug!("vsock receive event: {:?}", event);
             // The socket must be stored in the VsockSpace.
             if let Some(connected) = self
@@ -286,9 +262,9 @@ impl VsockSpace {
                     let Some(connected) = connected_sockets.get(&event.into()) else {
                         return_errno_with_message!(Errno::ENOTCONN, "the socket hasn't connected");
                     };
-                driver
-                    .credit_update(&connected.get_info())
-                    .map_err(|_| Error::with_message(Errno::EIO, "cannot send credit update"))?;
+                    driver.credit_update(&connected.get_info()).map_err(|_| {
+                        Error::with_message(Errno::EIO, "cannot send credit update")
+                    })?;
                 }
                 VsockEventType::CreditUpdate => {
                     let connected_sockets = self.connected_sockets.read_irq_disabled();
@@ -298,6 +274,26 @@ impl VsockSpace {
                     connected.update_info(&event);
                 }
             }
+        }
+        Ok(())
+    }
+
+    fn poll_single(&self, driver: &mut SocketDevice) -> Result<Option<VsockEvent>> {
+        driver
+            .poll(|event, body| {
+                // Deal with Received before the buffer are recycled.
+                if let VsockEventType::Received { length } = event.event_type {
+                    // Only consider the connected socket and copy body to buffer
+                    let connected_sockets = self.connected_sockets.read_irq_disabled();
+                    let connected = connected_sockets.get(&event.into()).unwrap();
+                    debug!("Rw matches a connection with id {:?}", connected.id());
+                    if !connected.add_connection_buffer(body) {
+                        return Err(SocketError::BufferTooShort);
+                    }
+                    connected.update_io_events();
+                }
                 Ok(Some(event))
+            })
+            .map_err(|e| Error::with_message(Errno::EIO, "driver poll failed"))
     }
 }

kernel/aster-nix/src/net/socket/vsock/stream/connected.rs

@@ -101,8 +101,6 @@ impl Connected {
             }
             let vsockspace = VSOCK_GLOBAL.get().unwrap();
             vsockspace.reset(&connection.info).unwrap();
-            vsockspace.remove_connected_socket(&self.id());
-            vsockspace.recycle_port(&self.local_addr().port);
             connection.set_local_shutdown();
         }
         Ok(())
@@ -143,19 +141,6 @@ impl Connected {
     }
 }
 
-impl Drop for Connected {
-    fn drop(&mut self) {
-        let connection = self.connection.lock_irq_disabled();
-        if connection.is_local_shutdown() {
-            return;
-        }
-        let vsockspace = VSOCK_GLOBAL.get().unwrap();
-        vsockspace.reset(&connection.info).unwrap();
-        vsockspace.remove_connected_socket(&self.id());
-        vsockspace.recycle_port(&self.local_addr().port);
-    }
-}
-
 struct Connection {
     info: ConnectionInfo,
     buffer: HeapRb<u8>,

kernel/aster-nix/src/net/socket/vsock/stream/init.rs

@@ -66,15 +66,6 @@ impl Init {
     }
 }
 
-impl Drop for Init {
-    fn drop(&mut self) {
-        if let Some(addr) = *self.bound_addr.lock() {
-            let vsockspace = VSOCK_GLOBAL.get().unwrap();
-            vsockspace.recycle_port(&addr.port);
-        }
-    }
-}
-
 impl Default for Init {
     fn default() -> Self {
         Self::new()

kernel/aster-nix/src/net/socket/vsock/stream/listen.rs

@@ -3,7 +3,7 @@
 use super::connected::Connected;
 use crate::{
     events::IoEvents,
-    net::socket::vsock::{addr::VsockSocketAddr, VSOCK_GLOBAL},
+    net::socket::vsock::addr::VsockSocketAddr,
     prelude::*,
     process::signal::{Pollee, Poller},
 };
@@ -31,8 +31,9 @@ impl Listen {
     pub fn push_incoming(&self, connect: Arc<Connected>) -> Result<()> {
         let mut incoming_connections = self.incoming_connection.lock_irq_disabled();
         if incoming_connections.len() >= self.backlog {
-            return_errno_with_message!(Errno::ENOMEM, "queue in listenging socket is full")
+            return_errno_with_message!(Errno::ECONNREFUSED, "queue in listenging socket is full")
         }
+        // FIXME: check if the port is already used
         incoming_connections.push_back(connect);
         Ok(())
     }
@@ -62,11 +63,3 @@ impl Listen {
         }
     }
 }
-
-impl Drop for Listen {
-    fn drop(&mut self) {
-        let vsockspace = VSOCK_GLOBAL.get().unwrap();
-        vsockspace.recycle_port(&self.addr.port);
-        vsockspace.remove_listen_socket(&self.addr);
-    }
-}

kernel/aster-nix/src/net/socket/vsock/stream/socket.rs

@@ -339,3 +339,28 @@ impl Socket for VsockStreamSocket {
         }
     }
 }
+
+impl Drop for VsockStreamSocket {
+    fn drop(&mut self) {
+        let vsockspace = VSOCK_GLOBAL.get().unwrap();
+        let inner = self.status.read();
+        match &*inner {
+            Status::Init(init) => {
+                if let Some(addr) = init.bound_addr() {
+                    vsockspace.recycle_port(&addr.port);
+                }
+            }
+            Status::Listen(listen) => {
+                vsockspace.recycle_port(&listen.addr().port);
+                vsockspace.remove_listen_socket(&listen.addr());
+            }
+            Status::Connected(connected) => {
+                if !connected.is_closed() {
+                    vsockspace.reset(&connected.get_info()).unwrap();
+                }
+                vsockspace.remove_connected_socket(&connected.id());
+                vsockspace.recycle_port(&connected.local_addr().port);
+            }
+        }
+    }
+}