transport: enable io-uring based async io

Enhance the transport layer to support io-uring based async io.

Signed-off-by: Jiang Liu <[email protected]>

Author: jiangliu

Cargo.toml

@@ -47,7 +47,7 @@ vm-memory = { version = "0.7", features = ["backend-mmap", "backend-bitmap"] }
 [features]
 default = ["fusedev"]
 #async-io = ["async-trait", "futures", "caps]
-async_io = ["async-trait", "futures", "tokio-uring"]
+async-io = ["async-trait", "futures", "tokio-uring"]
 fusedev = ["vmm-sys-util", "caps", "core-foundation-sys"]
 virtiofs = ["virtio-queue", "caps"]
 vhost-user-fs = ["virtiofs", "vhost", "caps"]

Makefile

@@ -4,6 +4,9 @@ build:
 	cargo build --features="fusedev"
 	cargo build --features="virtiofs"
 	cargo build --features="vhost-user-fs"
+	cargo build --features="fusedev,async-io"
+	cargo build --features="virtiofs,async-io"
+	cargo build --features="vhost-user-fs,async-io"
 
 build-macos:
 	cargo build --features="fusedev"
@@ -18,9 +21,12 @@ check: build
 	cargo clippy --features="fusedev" -- -Dwarnings
 	cargo clippy --features="virtiofs" -- -Dwarnings
 	cargo clippy --features="vhost-user-fs" -- -Dwarnings
-	cargo test --features="virtiofs" -- --nocapture --skip integration
 	cargo test --features="fusedev" -- --nocapture --skip integration
+	cargo test --features="virtiofs" -- --nocapture --skip integration
 	cargo test --features="vhost-user-fs" -- --nocapture --skip integration
+	cargo test --features="fusedev,async-io" -- --nocapture --skip integration
+	cargo test --features="virtiofs,async-io" -- --nocapture --skip integration
+	cargo test --features="vhost-user-fs,async-io" -- --nocapture --skip integration
 
 smoke: check
 	cargo test --features="fusedev" -- --nocapture

src/api/filesystem/mod.rs

@@ -22,9 +22,9 @@ pub use fuse::ROOT_ID;
 
 use crate::abi::fuse_abi::{ino64_t, stat64};
 
-#[cfg(feature = "async-io")]
+#[cfg(feature = "async_io")]
 mod async_io;
-#[cfg(feature = "async-io")]
+#[cfg(feature = "async_io")]
 pub use async_io::{AsyncFileSystem, AsyncZeroCopyReader, AsyncZeroCopyWriter};
 
 mod sync_io;
@@ -384,7 +384,7 @@ pub struct Context {
     /// The thread group ID of the calling process.
     pub pid: libc::pid_t,
 
-    #[cfg(feature = "async-io")]
+    #[cfg(feature = "async_io")]
     /// Asynchronous event drive
     pub drive: usize,
 }
@@ -402,15 +402,15 @@ impl From<&fuse::InHeader> for Context {
             uid: source.uid,
             gid: source.gid,
             pid: source.pid as i32,
-            #[cfg(feature = "async-io")]
+            #[cfg(feature = "async_io")]
             drive: 0,
         }
     }
 }
 
 // The design is very ugly, but it helps to avoid adding a generic type parameter "D: AsyncDrive"
 // to the FileSystem trait.
-#[cfg(feature = "async-io")]
+#[cfg(feature = "async_io")]
 impl Context {
     /// Set the asynchronous event drive.
     ///

src/api/server/mod.rs

@@ -30,7 +30,7 @@ use crate::async_util::{AsyncDrive, AsyncDriver};
 use crate::transport::{FileReadWriteVolatile, Reader, Writer};
 use crate::{bytes_to_cstr, BitmapSlice, Error, Result};
 
-#[cfg(feature = "async-io")]
+#[cfg(feature = "async_io")]
 mod async_io;
 mod sync_io;
 

src/api/vfs/mod.rs

@@ -33,7 +33,7 @@ use crate::abi::fuse_abi::*;
 use crate::api::filesystem::*;
 use crate::async_util::{AsyncDrive, AsyncDriver};
 
-#[cfg(feature = "async-io")]
+#[cfg(feature = "async_io")]
 mod async_io;
 mod sync_io;
 
@@ -165,7 +165,7 @@ use Either::*;
 /// D refers to the type of asynchronous event driver
 pub type BackFileSystem<D> = Box<dyn BackendFileSystem<D, Inode = u64, Handle = u64> + Sync + Send>;
 
-#[cfg(not(feature = "async-io"))]
+#[cfg(not(feature = "async_io"))]
 /// BackendFileSystem abstracts all backend file systems under vfs
 pub trait BackendFileSystem<D: AsyncDrive = AsyncDriver>: FileSystem {
     /// mount returns the backend file system root inode entry and
@@ -180,7 +180,7 @@ pub trait BackendFileSystem<D: AsyncDrive = AsyncDriver>: FileSystem {
     fn as_any(&self) -> &dyn Any;
 }
 
-#[cfg(feature = "async-io")]
+#[cfg(feature = "async_io")]
 /// BackendFileSystem abstracts all backend file systems under vfs
 pub trait BackendFileSystem<D: AsyncDrive = AsyncDriver>: AsyncFileSystem<D> {
     /// mount returns the backend file system root inode entry and
@@ -639,7 +639,7 @@ mod tests {
         assert!(!is_dot_or_dotdot(name));
     }
 
-    #[cfg(feature = "async-io")]
+    #[cfg(feature = "async_io")]
     mod async_io {
         use super::*;
         use crate::abi::fuse_abi::{OpenOptions, SetattrValid};
@@ -907,7 +907,7 @@ mod tests {
         }
     }
 
-    #[cfg(not(feature = "async-io"))]
+    #[cfg(not(feature = "async_io"))]
     impl BackendFileSystem<AsyncDriver> for FakeFileSystemOne {
         fn mount(&self) -> Result<(Entry, u64)> {
             Ok((
@@ -924,7 +924,7 @@ mod tests {
         }
     }
 
-    #[cfg(not(feature = "async-io"))]
+    #[cfg(not(feature = "async_io"))]
     impl BackendFileSystem<AsyncDriver> for FakeFileSystemTwo {
         fn mount(&self) -> Result<(Entry, u64)> {
             Ok((