Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vsock: pop all the received packets #310

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

vsock: pop all the received packets #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf7394
vsock: pop all the received packets
gaojiaqi7 Oct 21, 2024
f568ea1
virtio-serial: pop all the received data
gaojiaqi7 Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/devices/virtio_serial/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,18 @@ impl VirtioSerial {
fn port_queue_pop(port_id: u32) -> Option<Vec<u8>> {
RECEIVE_QUEUES.lock().get_mut(&port_id)?.pop_front()
}

fn can_recv(&self, port_id: u32) -> bool {
RECEIVE_QUEUES
.lock()
.get(&port_id)
.is_some_and(|q| !q.is_empty())
|| self
.queues
.index(Self::port_queue_index(port_id) as usize)
.borrow_mut()
.can_pop()
}
}

/// Align `size` up to a page.
Expand Down
29 changes: 20 additions & 9 deletions src/devices/virtio_serial/src/port.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,37 @@ impl VirtioSerialPort {

pub fn recv(&mut self, data: &mut [u8]) -> Result<usize> {
if self.cache.is_empty() {
let recv_bytes = SERIAL_DEVICE
.lock()
.get_mut()
.ok_or(VirtioSerialError::InvalidParameter)?
.dequeue(self.port_id, DEFAULT_TIMEOUT)?;
self.cache.push_back(recv_bytes);
loop {
let recv_bytes = SERIAL_DEVICE
.lock()
.get_mut()
.ok_or(VirtioSerialError::InvalidParameter)?
.dequeue(self.port_id, DEFAULT_TIMEOUT)?;
self.cache.push_back(recv_bytes);

if !SERIAL_DEVICE
.lock()
.get_mut()
.ok_or(VirtioSerialError::InvalidParameter)?
.can_recv(self.port_id)
{
break;
}
}
}

let mut recvd = 0;
if !self.cache.is_empty() {
while !self.cache.is_empty() {
let front = self.cache.front_mut().unwrap();
let expect = data.len() - recvd;
if front.len() <= expect {
data[..front.len()].copy_from_slice(front);
data[recvd..recvd + front.len()].copy_from_slice(front);
recvd += front.len();
self.cache.pop_front();
} else {
data[recvd..].copy_from_slice(&front[..expect]);
front.drain(..expect);
recvd = expect;
recvd += expect;
}
}

Expand Down
88 changes: 52 additions & 36 deletions src/devices/vsock/src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,60 +326,76 @@ impl VsockStream {
}

if self.data_queue.is_empty() {
let recv = VSOCK_DEVICE
.lock()
.get_mut()
.ok_or(VsockError::DeviceNotAvailable)?
.transport
.dequeue(self, DEFAULT_TIMEOUT)?;
let packet = Packet::new_checked(recv.as_slice())?;

if packet.op() == field::OP_SHUTDOWN {
self.shutdown()?;
return Ok(0);
}
if packet.op() == field::OP_RST {
self.reset()?;
return Err(VsockError::Illegal);
}
if packet.op() != field::OP_RW {
return Err(VsockError::Illegal);
}

if packet.data_len() > 0 {
let mut recv = VSOCK_DEVICE
loop {
let recv = VSOCK_DEVICE
.lock()
.get_mut()
.ok_or(VsockError::DeviceNotAvailable)?
.transport
.dequeue(self, DEFAULT_TIMEOUT)?;

self.rx_cnt += packet.data_len();
if packet.data_len() as usize <= recv.len() {
recv.truncate(packet.data_len() as usize);
} else {
let packet = Packet::new_checked(recv.as_slice())?;

if packet.op() == field::OP_SHUTDOWN {
self.shutdown()?;
return Ok(0);
}
if packet.op() == field::OP_RST {
self.reset()?;
return Err(VsockError::Illegal);
}
if packet.op() != field::OP_RW {
return Err(VsockError::Illegal);
}

if packet.data_len() > 0 {
let mut recv = VSOCK_DEVICE
.lock()
.get_mut()
.ok_or(VsockError::DeviceNotAvailable)?
.transport
.dequeue(self, DEFAULT_TIMEOUT)?;

self.rx_cnt += packet.data_len();
if packet.data_len() as usize <= recv.len() {
recv.truncate(packet.data_len() as usize);
} else {
return Err(VsockError::Illegal);
}

self.data_queue.push_back(recv);
self.data_queue.push_back(recv);
}

// If there are received vsock packets, continue to pop them out and insert to the
// `data_queue`. If there is no vsock packet left in the device, break the loop.
if !VSOCK_DEVICE
.lock()
.get_mut()
.ok_or(VsockError::DeviceNotAvailable)?
.transport
.can_recv()
{
break;
}
}
}

let mut recvd = 0;
if !self.data_queue.is_empty() {
let mut used = 0;
while !self.data_queue.is_empty() && used < buf.len() {
let head = self.data_queue.front_mut().unwrap();
if head.len() <= buf.len() {
buf[..head.len()].copy_from_slice(head);
recvd = head.len();
let free = buf.len() - used;
if head.len() <= free {
buf[used..used + head.len()].copy_from_slice(head);
used += head.len();
self.data_queue.pop_front();
} else {
buf.copy_from_slice(&head[..buf.len()]);
recvd = buf.len();
head.drain(..buf.len());
buf[used..].copy_from_slice(&head[..free]);
used += free;
head.drain(..free);
}
}

Ok(recvd)
Ok(used)
}

fn reset(&mut self) -> Result {
Expand Down
Loading