build: Bump rust-vmm crates

The rust-vmm crates are out-of-date and has security problems, bump to
catch up the security fixes.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>

Author: RuoqingHe

Cargo.toml

@@ -24,11 +24,11 @@ members = [
 
 [workspace.dependencies]
 # rust-vmm crates
-vhost = "0.11.0"
-virtio-bindings = "=0.2.4"
-virtio-queue = "0.12.0"
-vm-memory = "0.14.1"
-vmm-sys-util = "0.12.1"
+vhost = "0.14.0"
+virtio-bindings = "0.2.6"
+virtio-queue = "0.16.0"
+vm-memory = "0.16.1"
+vmm-sys-util = "0.14.0"
 
 [dependencies]
 arc-swap = "1.5"
@@ -65,7 +65,7 @@ vmm-sys-util = { workspace = true }
 vm-memory = { workspace = true, features = ["backend-mmap", "backend-bitmap"] }
 
 [features]
-default = ["fusedev"]
+default = ["vhost-user-fs"]
 async-io = [
     "async-trait",
     "tokio-uring",

src/transport/fs_cache_req_handler.rs

@@ -14,16 +14,7 @@ mod virtiofs {
     use std::io;
     use std::os::unix::io::RawFd;
 
-    #[cfg(feature = "vhost-user-fs")]
-    use vhost::vhost_user::message::{
-        VhostUserFSBackendMsg, VhostUserFSBackendMsgFlags, VHOST_USER_FS_BACKEND_ENTRIES,
-    };
-    #[cfg(feature = "vhost-user-fs")]
-    use vhost::vhost_user::{Backend, VhostUserFrontendReqHandler};
-
     use crate::abi::virtio_fs::RemovemappingOne;
-    #[cfg(feature = "vhost-user-fs")]
-    use crate::abi::virtio_fs::SetupmappingFlags;
 
     /// Trait to support virtio-fs DAX Window operations.
     ///
@@ -52,45 +43,4 @@ mod virtiofs {
         /// Remove those mappings that provide the access to file data.
         fn unmap(&mut self, requests: Vec<RemovemappingOne>) -> io::Result<()>;
     }
-
-    #[cfg(feature = "vhost-user-fs")]
-    impl FsCacheReqHandler for Backend {
-        fn map(
-            &mut self,
-            foffset: u64,
-            moffset: u64,
-            len: u64,
-            flags: u64,
-            fd: RawFd,
-        ) -> io::Result<()> {
-            let mut msg: VhostUserFSBackendMsg = Default::default();
-            msg.fd_offset[0] = foffset;
-            msg.cache_offset[0] = moffset;
-            msg.len[0] = len;
-            msg.flags[0] = if (flags & SetupmappingFlags::WRITE.bits()) != 0 {
-                VhostUserFSBackendMsgFlags::MAP_W | VhostUserFSBackendMsgFlags::MAP_R
-            } else {
-                VhostUserFSBackendMsgFlags::MAP_R
-            };
-
-            self.fs_backend_map(&msg, &fd)?;
-
-            Ok(())
-        }
-
-        fn unmap(&mut self, requests: Vec<RemovemappingOne>) -> io::Result<()> {
-            for chunk in requests.chunks(VHOST_USER_FS_BACKEND_ENTRIES) {
-                let mut msg: VhostUserFSBackendMsg = Default::default();
-
-                for (ind, req) in chunk.iter().enumerate() {
-                    msg.len[ind] = req.len;
-                    msg.cache_offset[ind] = req.moffset;
-                }
-
-                self.fs_backend_unmap(&msg)?;
-            }
-
-            Ok(())
-        }
-    }
 }