From 0699dc10002ad11ed1acc9d926e7578a61db4da4 Mon Sep 17 00:00:00 2001
From: Jiachen Zhang <zhangjiachen.jaycee@bytedance.com>
Date: Fri, 11 Jun 2021 21:58:27 +0800
Subject: [PATCH] virtio-devices: vhost_user: fs: Enable inflight I/O tracking

Signed-off-by: Jiachen Zhang <zhangjiachen.jaycee@bytedance.com>
---
 virtio-devices/src/vhost_user/fs.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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