macos: get rid of dependency on the diskarbitration-sys crate

The diskarbitration-sys crate is out of maintenance, and locks the
core-foundataion-sys crate to an very old version. So avoid dependency
on it.

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

Author: useeSol

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuse-backend-rs"
-version = "0.9.3"
+version = "0.9.4"
 keywords = ["fuse", "virtio", "virtio-fs", "vhost-user-fs"]
 categories = ["filesystem", "os::linux-apis"]
 description = "A rust library for Fuse(filesystem in userspace) servers and virtio-fs devices"
@@ -14,6 +14,7 @@ license = "Apache-2.0 AND BSD-3-Clause"
 edition = "2018"
 repository = "https://github.com/cloud-hypervisor/fuse-backend-rs"
 homepage = "https://github.com/cloud-hypervisor/"
+build = "build.rs"
 
 [dependencies]
 arc-swap = ">=0.4.6"
@@ -23,7 +24,7 @@ bitflags = "1.1"
 #iou = { version = "0.3.3", optional = true }
 libc = "0.2.68"
 log = "0.4.6"
-nix = "0.23"
+nix = "0.24"
 lazy_static = "1.4"
 #ringbahn = { version = "0.0.0-experimental.3", optional = true }
 vmm-sys-util = { version = "0.9", optional = true }
@@ -33,8 +34,7 @@ vhost = { version = "0.3", features = ["vhost-user-slave"], optional = true }
 mio = { version = "0.8", features = ["os-poll", "os-ext"]}
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation-sys = { version = "0.2.3", optional = true }
-diskarbitration-sys = { version = "0.0.4", optional = true }
+core-foundation-sys = { version = ">=0.8", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 caps = { version = "0.3", optional = true }
@@ -48,7 +48,7 @@ vm-memory = { version = "0.7", features = ["backend-mmap", "backend-bitmap"] }
 [features]
 default = ["fusedev"]
 #async-io = ["async-trait", "futures", "iou", "ringbahn", "caps]
-fusedev = ["vmm-sys-util", "caps", "core-foundation-sys", "diskarbitration-sys"]
+fusedev = ["vmm-sys-util", "caps", "core-foundation-sys"]
 virtiofs = ["virtio-queue", "caps"]
 vhost-user-fs = ["virtiofs", "vhost", "caps"]
 

build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    #[cfg(target_os = "macos")]
+    println!("cargo:rustc-link-lib=framework=DiskArbitration");
+}

src/transport/fusedev/macos_session.rs

@@ -8,14 +8,12 @@
 //! sequentially. A FUSE session is a connection from a FUSE mountpoint to a FUSE server daemon.
 //! A FUSE session can have multiple FUSE channels so that FUSE requests are handled in parallel.
 
-use core_foundation_sys::base::{CFIndex, CFRelease};
+use core_foundation_sys::base::{CFAllocatorRef, CFIndex, CFRelease};
 use core_foundation_sys::string::{kCFStringEncodingUTF8, CFStringCreateWithBytes};
-use core_foundation_sys::url::{kCFURLPOSIXPathStyle, CFURLCreateWithFileSystemPath};
-use diskarbitration_sys::base::{kDADiskUnmountOptionForce, DADiskUnmount};
-use diskarbitration_sys::disk::{DADiskCreateFromVolumePath, DADiskRef};
-use diskarbitration_sys::session::{DASessionCreate, DASessionRef};
+use core_foundation_sys::url::{kCFURLPOSIXPathStyle, CFURLCreateWithFileSystemPath, CFURLRef};
 use std::ffi::CString;
 use std::fs::File;
+use std::io::IoSliceMut;
 use std::os::unix::ffi::OsStrExt;
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 use std::path::{Path, PathBuf};
@@ -27,9 +25,9 @@ use nix::errno::Errno;
 use nix::fcntl::{fcntl, FdFlag, F_SETFD};
 use nix::sys::signal::{signal, SigHandler, Signal};
 use nix::sys::socket::{
-    recvmsg, socketpair, AddressFamily, ControlMessageOwned, MsgFlags, SockFlag, SockType,
+    recvmsg, socketpair, AddressFamily, ControlMessageOwned, MsgFlags, RecvMsg, SockFlag, SockType,
+    UnixAddr,
 };
-use nix::sys::uio::IoVec;
 use nix::unistd::{close, execv, fork, getpid, read, ForkResult};
 use nix::{cmsg_space, NixPath};
 
@@ -42,6 +40,37 @@ const FUSE_HEADER_SIZE: usize = 0x1000;
 
 const OSXFUSE_MOUNT_PROG: &str = "/Library/Filesystems/macfuse.fs/Contents/Resources/mount_macfuse";
 
+static K_DADISK_UNMOUNT_OPTION_FORCE: u64 = 524288;
+
+#[repr(C)]
+struct __DADisk(c_void);
+type DADiskRef = *const __DADisk;
+#[repr(C)]
+struct __DADissenter(c_void);
+type DADissenterRef = *const __DADissenter;
+#[repr(C)]
+struct __DASession(c_void);
+type DASessionRef = *const __DASession;
+
+type DADiskUnmountCallback = ::std::option::Option<
+    unsafe extern "C" fn(disk: DADiskRef, dissenter: DADissenterRef, context: *mut c_void),
+>;
+
+extern "C" {
+    fn DADiskUnmount(
+        disk: DADiskRef,
+        options: u64,
+        callback: DADiskUnmountCallback,
+        context: *mut c_void,
+    );
+    fn DADiskCreateFromVolumePath(
+        allocator: CFAllocatorRef,
+        session: DASessionRef,
+        path: CFURLRef,
+    ) -> DADiskRef;
+    fn DASessionCreate(allocator: CFAllocatorRef) -> DASessionRef;
+}
+
 mod ioctl {
     use nix::ioctl_write_ptr;
 
@@ -247,8 +276,9 @@ impl FuseChannel {
 fn receive_fd(sock_fd: RawFd) -> Result<RawFd> {
     let mut buffer = vec![0u8; 4];
     let mut cmsgspace = cmsg_space!(RawFd);
-    let iov = [IoVec::from_mut_slice(&mut buffer)];
-    let r = recvmsg(sock_fd, &iov, Some(&mut cmsgspace), MsgFlags::empty()).unwrap();
+    let mut iov = [IoSliceMut::new(&mut buffer)];
+    let r: RecvMsg<UnixAddr> =
+        recvmsg(sock_fd, &mut iov, Some(&mut cmsgspace), MsgFlags::empty()).unwrap();
     if let Some(msg) = r.cmsgs().next() {
         match msg {
             ControlMessageOwned::ScmRights(fds) => {
@@ -362,7 +392,6 @@ fn create_disk(mountpoint: &Path, dasession: DASessionRef) -> DADiskRef {
             path_len as CFIndex,
             kCFStringEncodingUTF8,
             1u8,
-            std::ptr::null(),
         );
         let url =
             CFURLCreateWithFileSystemPath(std::ptr::null(), url_str, kCFURLPOSIXPathStyle, 1u8);
@@ -385,7 +414,12 @@ fn fuse_kern_umount(file: File, disk: Option<DADiskRef>) -> Result<()> {
 
     if let Some(disk) = disk {
         unsafe {
-            DADiskUnmount(disk, kDADiskUnmountOptionForce, None, std::ptr::null_mut());
+            DADiskUnmount(
+                disk,
+                K_DADISK_UNMOUNT_OPTION_FORCE,
+                None,
+                std::ptr::null_mut(),
+            );
             CFRelease(std::mem::transmute(disk));
         }
     }

src/transport/fusedev/mod.rs

@@ -11,7 +11,7 @@ use std::marker::PhantomData;
 use std::mem::ManuallyDrop;
 use std::os::unix::io::RawFd;
 
-use nix::sys::uio::{writev, IoVec};
+use nix::sys::uio::writev;
 use nix::unistd::write;
 use vm_memory::{ByteValued, VolatileMemory, VolatileMemoryError, VolatileSlice};
 
@@ -186,7 +186,7 @@ impl<'a, S: BitmapSlice> Writer<'a, S> {
             (0, _) => write(self.fd, o),
             (_, 0) => write(self.fd, self.buf.as_slice()),
             (_, _) => {
-                let bufs = [IoVec::from_slice(self.buf.as_slice()), IoVec::from_slice(o)];
+                let bufs = [IoSlice::new(self.buf.as_slice()), IoSlice::new(o)];
                 writev(self.fd, &bufs)
             }
         };
@@ -351,16 +351,10 @@ impl<'a, S: BitmapSlice> io::Write for Writer<'a, S> {
             });
             Ok(count)
         } else {
-            let buf: Vec<IoVec<&[u8]>> = bufs
-                .iter()
-                .filter(|b| !b.is_empty())
-                .map(|b| IoVec::from_slice(b))
-                .collect();
-
-            if buf.is_empty() {
+            if bufs.is_empty() {
                 return Ok(0);
             }
-            writev(self.fd, buf.as_slice())
+            writev(self.fd, bufs)
                 .map(|x| {
                     self.account_written(x);
                     x

tests/macfuse_smoke.rs

@@ -66,7 +66,7 @@ mod macfuse_tests {
     }
 
     #[test]
-    // #[ignore] // it depends on privileged mode to pass through /dev/fuse
+    #[ignore] // it depends on privileged mode to pass through /dev/fuse
     fn integration_test_macfuse_hello() -> Result<()> {
         // test the fuse-rs repository
         let tmp_dir = TempDir::new().unwrap();