External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-22 07:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: vhost_user: blk: Enable inflight I/O tracking

Browse Source 
Signed-off-by: Jiachen Zhang <zhangjiachen.jaycee@bytedance.com>
This commit is contained in:
Jiachen Zhang 2021-06-11 19:08:16 +08:00 committed by Sebastien Boeuf
parent bfd4aa2fed
commit 36d336841c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
virtio-devices/src/vhost_user/blk.rs
View File

@ -9,7 +9,7 @@ use super::vu_common_ctrl::{
setup_vhost_user, update_mem_table, VhostUserConfig, setup_vhost_user, update_mem_table, VhostUserConfig,
}; };
use super::{Error, Result, DEFAULT_VIRTIO_FEATURES}; use super::{Error, Result, DEFAULT_VIRTIO_FEATURES};
use crate::vhost_user::VhostUserEpollHandler; use crate::vhost_user::{Inflight, VhostUserEpollHandler};
use crate::VirtioInterrupt; use crate::VirtioInterrupt;
use crate::{GuestMemoryMmap, GuestRegionMmap}; use crate::{GuestMemoryMmap, GuestRegionMmap};
use block_util::VirtioBlockConfig; use block_util::VirtioBlockConfig;
@ -78,7 +78,8 @@ impl Blk {
let avail_protocol_features = VhostUserProtocolFeatures::CONFIG let avail_protocol_features = VhostUserProtocolFeatures::CONFIG
| VhostUserProtocolFeatures::MQ | VhostUserProtocolFeatures::MQ
| VhostUserProtocolFeatures::CONFIGURE_MEM_SLOTS | VhostUserProtocolFeatures::CONFIGURE_MEM_SLOTS
| VhostUserProtocolFeatures::REPLY_ACK; | VhostUserProtocolFeatures::REPLY_ACK
| VhostUserProtocolFeatures::INFLIGHT_SHMFD;
let (acked_features, acked_protocol_features) = negotiate_features_vhost_user( let (acked_features, acked_protocol_features) = negotiate_features_vhost_user(
&mut vhost_user_blk, &mut vhost_user_blk,
@ -223,6 +224,14 @@ impl VirtioDevice for Blk {
let backend_acked_features = self.common.acked_features let backend_acked_features = self.common.acked_features
| (self.common.avail_features & VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits()); | (self.common.avail_features & VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits());
let mut inflight: Option<Inflight> =
if self.acked_protocol_features & VhostUserProtocolFeatures::INFLIGHT_SHMFD.bits() != 0
{
Some(Inflight::default())
} else {
None
};
setup_vhost_user( setup_vhost_user(
&mut self.vhost_user_blk.lock().unwrap(), &mut self.vhost_user_blk.lock().unwrap(),
&mem.memory(), &mem.memory(),
@ -231,7 +240,7 @@ impl VirtioDevice for Blk {
&interrupt_cb, &interrupt_cb,
backend_acked_features, backend_acked_features,
&slave_req_handler, &slave_req_handler,
None, inflight.as_mut(),
) )
.map_err(ActivateError::VhostUserBlkSetup)?; .map_err(ActivateError::VhostUserBlkSetup)?;
@ -252,7 +261,7 @@ impl VirtioDevice for Blk {
socket_path: self.socket_path.clone(), socket_path: self.socket_path.clone(),
server: false, server: false,
slave_req_handler: None, slave_req_handler: None,
inflight: None, inflight,
}; };
let paused = self.common.paused.clone(); let paused = self.common.paused.clone();