pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2025-12-29 00:41:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vsock: try epoll_modify before epoll_register in recv_pkt

Browse Source 
in this context, epoll listener can be already registered via other TX
event, so let it try epoll_modify first to avoid 'silent' failure which
possibly drops packets.

Signed-off-by: Jeongik Cha <jeongik@google.com>
This commit is contained in:
Jeongik Cha 2023-10-27 18:49:04 +09:00 committed by Viresh Kumar
parent a2d9b2e721
commit 4b6451176d
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vhost-device-vsock/src/vsock_conn.rs
View File

@ -6,7 +6,7 @@ use std::{
os::unix::prelude::{AsRawFd, RawFd},
};
use log::info;
use log::{error, info};
use virtio_vsock::packet::{VsockPacket, PKT_HEADER_SIZE};
use vm_memory::{bitmap::BitmapSlice, Bytes, VolatileSlice};
@ -174,11 +174,22 @@ impl<S: AsRawFd + Read + Write> VsockConnection<S> {
pkt.set_op(VSOCK_OP_RW).set_len(read_cnt as u32);
// Re-register the stream file descriptor for read and write events
VhostUserVsockThread::epoll_register(
if VhostUserVsockThread::epoll_modify(
self.epoll_fd,
self.stream.as_raw_fd(),
epoll::Events::EPOLLIN | epoll::Events::EPOLLOUT,
)?;
)
.is_err()
{
if let Err(e) = VhostUserVsockThread::epoll_register(
self.epoll_fd,
self.stream.as_raw_fd(),
epoll::Events::EPOLLIN | epoll::Events::EPOLLOUT,
) {
// TODO: let's move this logic out of this func, and handle it properly
error!("epoll_register failed: {:?}, but proceed further.", e);
}
};
}
// Update the rx_cnt with the amount of data in the vsock packet.
@ -680,13 +691,15 @@ mod tests {
);
// VSOCK_OP_RW: finite data read from stream/file
conn_local.stream.write_all(b"hello").unwrap();
let payload = b"hello";
conn_local.stream.write_all(payload).unwrap();
conn_local.rx_queue.enqueue(RxOps::Rw);
let op_zero_read = conn_local.recv_pkt(&mut pkt);
// below error due to epoll add
assert!(op_zero_read.is_err());
assert!(op_zero_read.is_ok());
assert_eq!(pkt.op(), VSOCK_OP_RW);
assert!(!conn_local.rx_queue.pending_rx());
assert_eq!(conn_local.rx_cnt, Wrapping(payload.len() as u32));
assert_eq!(conn_local.last_fwd_cnt, Wrapping(1024));
assert_eq!(pkt.len(), 5);
let buf = &mut [0u8; 5];
assert!(pkt.data_slice().unwrap().read_slice(buf, 0).is_ok());