External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-21 23:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: vhost_user: fs: 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 21:58:27 +08:00 committed by Sebastien Boeuf
parent 2e3e64a4cf
commit 0699dc1000
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/fs.rs
View File

@ -7,7 +7,7 @@ use super::vu_common_ctrl::{
}; };
use super::{Error, Result, DEFAULT_VIRTIO_FEATURES}; use super::{Error, Result, DEFAULT_VIRTIO_FEATURES};
use crate::seccomp_filters::{get_seccomp_filter, Thread}; use crate::seccomp_filters::{get_seccomp_filter, Thread};
use crate::vhost_user::VhostUserEpollHandler; use crate::vhost_user::{Inflight, VhostUserEpollHandler};
use crate::{ use crate::{
ActivateError, ActivateResult, Queue, UserspaceMapping, VirtioCommon, VirtioDevice, ActivateError, ActivateResult, Queue, UserspaceMapping, VirtioCommon, VirtioDevice,
VirtioDeviceType, VirtioInterrupt, VirtioSharedMemoryList, VirtioDeviceType, VirtioInterrupt, VirtioSharedMemoryList,
@ -309,7 +309,8 @@ impl Fs {
let mut avail_protocol_features = VhostUserProtocolFeatures::MQ let mut avail_protocol_features = VhostUserProtocolFeatures::MQ
| VhostUserProtocolFeatures::CONFIGURE_MEM_SLOTS | VhostUserProtocolFeatures::CONFIGURE_MEM_SLOTS
| VhostUserProtocolFeatures::REPLY_ACK; | VhostUserProtocolFeatures::REPLY_ACK
| VhostUserProtocolFeatures::INFLIGHT_SHMFD;
let slave_protocol_features = let slave_protocol_features =
VhostUserProtocolFeatures::SLAVE_REQ | VhostUserProtocolFeatures::SLAVE_SEND_FD; VhostUserProtocolFeatures::SLAVE_REQ | VhostUserProtocolFeatures::SLAVE_SEND_FD;
if cache.is_some() { if cache.is_some() {
@ -444,6 +445,14 @@ impl VirtioDevice for Fs {
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.vu.lock().unwrap(), &mut self.vu.lock().unwrap(),
&mem.memory(), &mem.memory(),
@ -452,7 +461,7 @@ impl VirtioDevice for Fs {
&interrupt_cb, &interrupt_cb,
backend_acked_features, backend_acked_features,
&slave_req_handler, &slave_req_handler,
None, inflight.as_mut(),
) )
.map_err(ActivateError::VhostUserFsSetup)?; .map_err(ActivateError::VhostUserFsSetup)?;
@ -472,7 +481,7 @@ impl VirtioDevice for Fs {
socket_path: self.socket_path.clone(), socket_path: self.socket_path.clone(),
server: false, server: false,
slave_req_handler, slave_req_handler,
inflight: None, inflight,
}; };
let paused = self.common.paused.clone(); let paused = self.common.paused.clone();