github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-31 07:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8634 from justxuewei/disable-packed-vq

Browse Source 
dragonball: Disable packed virtqueue for vhost-user devices
This commit is contained in:
Xuewei Niu 2023-12-13 17:03:05 +08:00 committed by GitHub
commit 855adbc63b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_user/connection.rs
View File

@ -13,6 +13,7 @@ use vhost_rs::vhost_user::{
Error as VhostUserError, Listener as VhostUserListener, Master, VhostUserMaster,
};
use vhost_rs::{VhostBackend, VhostUserMemoryRegionInfo, VringConfigData};
use virtio_bindings::bindings::virtio_net::VIRTIO_F_RING_PACKED;
use virtio_queue::QueueT;
use vm_memory::{
Address, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryRegion, MemoryRegionAddress,
@ -50,7 +51,12 @@ impl Listener {
pub fn accept(&self) -> VirtioResult<(Master, u64)> {
loop {
match self.try_accept() {
Ok(Some((master, feature))) => return Ok((master, feature)),
Ok(Some((master, mut feature))) => {
// Disable VIRTIO_F_RING_PACKED since the layout of packed virtqueue isn't
// supported by `Endpoint::negotiate()`.
feature &= !(1 << VIRTIO_F_RING_PACKED);
return Ok((master, feature));
}
Ok(None) => continue,
Err(e) => return Err(e),
}