Shmem

.buildkite/custom-tests.json

@@ -1,25 +1,4 @@
 {
     "tests": [
-        {
-            "test_name": "build-vhost-kern",
-            "command": "cargo build --features=vhost-kern",
-            "platform": [
-                "x86_64"
-            ]
-        },
-        {
-            "test_name": "build-vhost-user-frontend",
-            "command": "cargo build --features=vhost-user-frontend",
-            "platform": [
-                "x86_64"
-            ]
-        },
-        {
-            "test_name": "build-vhost-user-backend",
-            "command": "cargo build --features=vhost-user-backend",
-            "platform": [
-                "x86_64"
-            ]
-        }
     ]
 }

.buildkite/rust-vmm-ci-tests.json

@@ -0,0 +1 @@
+../rust-vmm-ci/.buildkite/test_description.json

CODEOWNERS

@@ -1,2 +1,2 @@
 # Add the list of code owners here (using their GitHub username)
-* @Ablu @eryugey @germag @jiangliu @sboeuf @slp @stefano-garzarella
+* @Ablu @epilys @eryugey @germag @jiangliu @sboeuf @slp @stefano-garzarella

Cargo.toml

@@ -7,7 +7,7 @@ members = [
 ]
 
 [workspace.dependencies]
-virtio-bindings = "0.2.1"
-virtio-queue = "0.14.0"
-vm-memory = "0.16.0"
-vmm-sys-util = "0.12.1"
+virtio-bindings = "0.2.6"
+virtio-queue = "0.17.0"
+vm-memory = "0.17.1"
+vmm-sys-util = "0.15.0"

coverage_config_x86_64.json

@@ -1,5 +1,5 @@
 {
-  "coverage_score": 86.24,
+  "coverage_score": 86.22,
   "exclude_path": "vhost/src/vhost_kern/",
   "crate_features": "vhost/vhost-user-frontend,vhost/vhost-user-backend,vhost-user-backend/postcopy"
 }

vhost-user-backend/CHANGELOG.md

@@ -1,14 +1,36 @@
 # Changelog
+
 ## [Unreleased]
 
 ### Added
-- [[#268]](https://github.com/rust-vmm/vhost/pull/268) Add support for `VHOST_USER_GET_SHARED_OBJECT`
+### Changed
+### Deprecated
+### Fixed
+
+## v0.21.0
 
 ### Changed
+- [[#308]](https://github.com/rust-vmm/vhost/pull/308) Replace Eventfd with EventNotifier/EventConsumer.
+- [[#321]](https://github.com/rust-vmm/vhost/pull/321) Don't take ownership of listener in `VhostUserDaemon::start`.
+- [[#333]](https://github.com/rust-vmm/vhost/pull/333) Updated virtio-queue to 0.17.0, vm-memory to 0.17.1, vmm-sys-util to 0.15.0 and vhost to 0.15.0
 
-### Deprecated
+## v0.20.0
 
-### Fixed
+### Changed
+- [[306]](https://github.com/rust-vmm/vhost/pull/306) Updated virtio-queue to v0.16.0 and virtio-bindings to v0.2.6
+
+## v0.19.0
+
+### Changed
+- [[299]](https://github.com/rust-vmm/vhost/pull/299) Updated virtio-queue to v0.15.0 and virtio-bindings to v0.2.5
+
+## v0.18.0
+
+### Added
+- [[#268]](https://github.com/rust-vmm/vhost/pull/268) Add support for `VHOST_USER_GET_SHARED_OBJECT`
+
+### Changed
+- [[#295]](https://github.com/rust-vmm/vhost/pull/295) Updated vm-memory to 0.16.2 and vmm-sys-util to 0.14.0
 
 ## v0.17.0
 

vhost-user-backend/Cargo.toml

@@ -1,30 +1,42 @@
 [package]
 name = "vhost-user-backend"
-version = "0.17.0"
+version = "0.21.0"
 authors = ["The Cloud Hypervisor Authors"]
 keywords = ["vhost-user", "virtio"]
 description = "A framework to build vhost-user backend service daemon"
 repository = "https://github.com/rust-vmm/vhost"
 edition = "2021"
 license = "Apache-2.0"
 
+[package.metadata.docs.rs]
+all-features = true
+rustc-args  = ['--cfg RUSTDOC_disable_feature_compat_errors']
+
 [features]
 xen = ["vm-memory/xen", "vhost/xen"]
 postcopy = ["vhost/postcopy", "userfaultfd"]
 
 [dependencies]
 libc = "0.2.39"
 log = "0.4.17"
-userfaultfd = { version = "0.8.1", optional = true }
-vhost = { path = "../vhost", version = "0.13.0", features = ["vhost-user-backend"] }
+userfaultfd = { version = "0.9.0", optional = true }
+vhost = { path = "../vhost", version = "0.15.0", features = ["vhost-user-backend"] }
 virtio-bindings = { workspace = true }
 virtio-queue = { workspace = true }
 vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vmm-sys-util = { workspace = true }
 
 [dev-dependencies]
-nix = { version = "0.29", features = ["fs"] }
+nix = { version = "0.30", features = ["fs"] }
 uuid = { version = "1.8.0", features=["v4"] }
-vhost = { path = "../vhost", version = "0.13.0", features = ["test-utils", "vhost-user-frontend", "vhost-user-backend"] }
+vhost = { path = "../vhost", version = "0.15.0", features = ["test-utils", "vhost-user-frontend", "vhost-user-backend"] }
 vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }
 tempfile = "3.2.0"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(RUSTDOC_disable_feature_compat_errors)'] }
+
+[package.metadata.cargo-all-features]
+skip_feature_sets = [
+    ["xen", "postcopy"]
+]

vhost-user-backend/src/backend.rs

@@ -30,7 +30,7 @@ use vhost::vhost_user::message::{
 use vhost::vhost_user::Backend;
 use vm_memory::bitmap::Bitmap;
 use vmm_sys_util::epoll::EventSet;
-use vmm_sys_util::eventfd::EventFd;
+use vmm_sys_util::event::{EventConsumer, EventNotifier};
 
 use vhost::vhost_user::GpuBackend;
 
@@ -132,7 +132,8 @@ pub trait VhostUserBackend: Send + Sync {
     ///
     /// The returned `EventFd` will be monitored for IO events. When the
     /// returned EventFd is written to, the worker thread will exit.
-    fn exit_event(&self, _thread_index: usize) -> Option<EventFd> {
+    // TODO: Refine this API to return only EventNotifier.
+    fn exit_event(&self, _thread_index: usize) -> Option<(EventConsumer, EventNotifier)> {
         None
     }
 
@@ -275,7 +276,8 @@ pub trait VhostUserBackendMut: Send + Sync {
     /// If an (`EventFd`, `token`) pair is returned, the returned `EventFd` will be monitored for IO
     /// events by using epoll with the specified `token`. When the returned EventFd is written to,
     /// the worker thread will exit.
-    fn exit_event(&self, _thread_index: usize) -> Option<EventFd> {
+    // TODO: Refine this API to return only EventNotifier.
+    fn exit_event(&self, _thread_index: usize) -> Option<(EventConsumer, EventNotifier)> {
         None
     }
 
@@ -382,7 +384,7 @@ impl<T: VhostUserBackend> VhostUserBackend for Arc<T> {
         self.deref().queues_per_thread()
     }
 
-    fn exit_event(&self, thread_index: usize) -> Option<EventFd> {
+    fn exit_event(&self, thread_index: usize) -> Option<(EventConsumer, EventNotifier)> {
         self.deref().exit_event(thread_index)
     }
 
@@ -471,7 +473,7 @@ impl<T: VhostUserBackendMut> VhostUserBackend for Mutex<T> {
         self.lock().unwrap().queues_per_thread()
     }
 
-    fn exit_event(&self, thread_index: usize) -> Option<EventFd> {
+    fn exit_event(&self, thread_index: usize) -> Option<(EventConsumer, EventNotifier)> {
         self.lock().unwrap().exit_event(thread_index)
     }
 
@@ -563,7 +565,7 @@ impl<T: VhostUserBackendMut> VhostUserBackend for RwLock<T> {
         self.read().unwrap().queues_per_thread()
     }
 
-    fn exit_event(&self, thread_index: usize) -> Option<EventFd> {
+    fn exit_event(&self, thread_index: usize) -> Option<(EventConsumer, EventNotifier)> {
         self.read().unwrap().exit_event(thread_index)
     }
 
@@ -599,16 +601,16 @@ impl<T: VhostUserBackendMut> VhostUserBackend for RwLock<T> {
 pub mod tests {
     use super::*;
     use crate::VringRwLock;
-    use libc::EFD_NONBLOCK;
     use std::sync::Mutex;
     use uuid::Uuid;
     use vm_memory::{GuestAddress, GuestMemoryAtomic, GuestMemoryMmap};
+    use vmm_sys_util::event::{new_event_consumer_and_notifier, EventFlag};
 
     pub struct MockVhostBackend {
         events: u64,
         event_idx: bool,
         acked_features: u64,
-        exit_event_fds: Vec<EventFd>,
+        exit_event_fds: Vec<(EventConsumer, EventNotifier)>,
     }
 
     impl MockVhostBackend {
@@ -624,7 +626,10 @@ pub mod tests {
             // order to allow tests maximum flexibility in checking whether
             // signals arrived or not.
             backend.exit_event_fds = (0..backend.queues_per_thread().len())
-                .map(|_| EventFd::new(EFD_NONBLOCK).unwrap())
+                .map(|_| {
+                    new_event_consumer_and_notifier(EventFlag::NONBLOCK)
+                        .expect("Failed to new EventNotifier and EventConsumer")
+                })
                 .collect();
 
             backend
@@ -695,13 +700,13 @@ pub mod tests {
             vec![1, 1]
         }
 
-        fn exit_event(&self, thread_index: usize) -> Option<EventFd> {
-            Some(
-                self.exit_event_fds
-                    .get(thread_index)?
-                    .try_clone()
-                    .expect("Could not clone exit eventfd"),
-            )
+        fn exit_event(&self, thread_index: usize) -> Option<(EventConsumer, EventNotifier)> {
+            self.exit_event_fds.get(thread_index).map(|(s, r)| {
+                (
+                    s.try_clone().expect("Failed to clone EventConsumer"),
+                    r.try_clone().expect("Failed to clone EventNotifier"),
+                )
+            })
         }
 
         fn handle_event(

vhost-user-backend/src/bitmap.rs

@@ -87,7 +87,7 @@ impl Bitmap for BitmapMmapRegion {
             .is_some_and(|bitmap| bitmap.dirty_at(self.base_address.saturating_add(offset)))
     }
 
-    fn slice_at(&self, offset: usize) -> <Self as WithBitmapSlice>::S {
+    fn slice_at(&self, offset: usize) -> <Self as WithBitmapSlice<'_>>::S {
         Self {
             inner: Arc::clone(&self.inner),
             base_address: self.base_address.saturating_add(offset),