vsock: absorb spurious EPOLLOUT events

This commit changes the vsock connection state machine behavior to absorb any EWOULDBLOCK errors recevied while handling an EPOLLOUT event. Previously, this condition would lead to immediate connection termination. Signed-off-by: Dan Horobeanu <[email protected]> Signed-off-by: Gabriel Ionescu <[email protected]>
wellesonx · Jun 12, 2020 · 109e631 · 109e631
1 parent 660d18c
commit 109e631
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/devices/src/virtio/vsock/csm/connection.rs b/src/devices/src/virtio/vsock/csm/connection.rs
@@ -452,7 +452,13 @@ where
                         "vsock: error flushing TX buf for (lp={}, pp={}): {:?}",
                         self.local_port, self.peer_port, err
                     );
-                    self.kill();
+                    match err {
+                        Error::TxBufFlush(inner) if inner.kind() == ErrorKind::WouldBlock => {
+                            // This should never happen (EWOULDBLOCK after EPOLLOUT), but
+                            // it does, so let's absorb it.
+                        }
+                        _ => self.kill(),
+                    };
                     0
                 });
             self.fwd_cnt += Wrapping(flushed as u32);