External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 11:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: Pass negotiated queue size to vhost-user backend

Browse Source 
The vhost-user backend was always provided the maximum queue size but
this is incorrect. Instead it must be informed of the actual queue size
that has been negotiated with the virtio driver running in the guest.

This ensures proper functioning of vhost-user-block with the Rust
Hypervisor Firmware, which uses a hardcoded queue size of 16.

Partially fixes #4285

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2022-07-06 14:43:59 +02:00 committed by Rob Bradford
parent 00800b8499
commit f94a5fb4e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virtio-devices/src/vhost_user/vu_common_ctrl.rs
View File

@ -173,7 +173,7 @@ impl VhostUserHandle {
// at early stage. // at early stage.
for (queue_index, queue) in queues.iter().enumerate() { for (queue_index, queue) in queues.iter().enumerate() {
self.vu self.vu
.set_vring_num(queue_index, queue.max_size()) .set_vring_num(queue_index, queue.state.size)
.map_err(Error::VhostUserSetVringNum)?; .map_err(Error::VhostUserSetVringNum)?;
} }
@ -184,7 +184,7 @@ impl VhostUserHandle {
mmap_size: 0, mmap_size: 0,
mmap_offset: 0, mmap_offset: 0,
num_queues: queues.len() as u16, num_queues: queues.len() as u16,
queue_size: queues[0].max_size(), queue_size: queues[0].state.size,
}; };
let (info, fd) = self let (info, fd) = self
.vu .vu
@ -203,11 +203,11 @@ impl VhostUserHandle {
let mut vrings_info = Vec::new(); let mut vrings_info = Vec::new();
for (queue_index, queue) in queues.into_iter().enumerate() { for (queue_index, queue) in queues.into_iter().enumerate() {
let actual_size: usize = queue.max_size().try_into().unwrap(); let actual_size: usize = queue.state.size.try_into().unwrap();
let config_data = VringConfigData { let config_data = VringConfigData {
queue_max_size: queue.max_size(), queue_max_size: queue.max_size(),
queue_size: queue.max_size(), queue_size: queue.state.size,
flags: 0u32, flags: 0u32,
desc_table_addr: get_host_address_range( desc_table_addr: get_host_address_range(
mem, mem,