Skip to content

Commit 28f93e3

Browse files
akitaSummerakitaSummer
committed
fix: fix CI
Signed-off-by: akitaSummer <[email protected]>
1 parent d33ff9c commit 28f93e3

File tree

4 files changed

+97
-51
lines changed

4 files changed

+97
-51
lines changed

‎src/passthrough/inode_store.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ use super::file_handle::FileHandle;
1010
use super::stat::Stat;
1111
#[cfg(target_os = "linux")]
1212
use super::statx::StatExt;
13-
use super::{InoT, Inode, InodeData, InodeHandle};
13+
14+
#[cfg(target_os = "linux")]
15+
use super::InodeHandle;
16+
use super::{InoT, Inode, InodeData};
1417

1518
#[derive(Clone, Copy, Default, PartialOrd, Ord, PartialEq, Eq, Debug)]
1619
/// Identify an inode in `PassthroughFs` by `InodeId`.

‎src/passthrough/mod.rs

+24-8
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,33 @@
1313
1414
use std::any::Any;
1515
use std::collections::{btree_map, BTreeMap};
16-
use std::ffi::{CStr, CString, OsString};
16+
#[cfg(target_os = "linux")]
17+
use std::ffi::OsString;
18+
use std::ffi::{CStr, CString};
1719
use std::fs::File;
1820
use std::io;
1921
use std::marker::PhantomData;
2022
use std::ops::{Deref, DerefMut};
2123
use std::os::fd::{AsFd, BorrowedFd};
24+
#[cfg(target_os = "linux")]
2225
use std::os::unix::ffi::OsStringExt;
2326
use std::os::unix::io::{AsRawFd, RawFd};
2427
use std::path::PathBuf;
2528
use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering};
2629
use std::sync::{Arc, Mutex, MutexGuard, RwLock, RwLockWriteGuard};
2730
use std::time::Duration;
2831

29-
use vm_memory::{bitmap::BitmapSlice, ByteValued};
30-
3132
pub use self::config::{CachePolicy, Config};
3233
#[cfg(target_os = "linux")]
3334
use self::file_handle::{FileHandle, OpenableFileHandle};
3435
use self::inode_store::{InodeId, InodeStore};
3536
#[cfg(target_os = "linux")]
3637
use self::mount_fd::MountFds;
38+
use vm_memory::bitmap::BitmapSlice;
39+
#[cfg(target_os = "linux")]
40+
use vm_memory::ByteValued;
3741

42+
#[cfg(target_os = "macos")]
3843
use self::stat::{open, stat, Stat};
3944
#[cfg(target_os = "linux")]
4045
use self::statx::{statx, StatExt};
@@ -46,9 +51,11 @@ use self::util::{reopen_fd_through_proc, stat_fd};
4651
use crate::abi::fuse_abi as fuse;
4752
use crate::abi::fuse_abi::Opcode;
4853
use crate::api::filesystem::Entry;
54+
#[cfg(target_os = "linux")]
55+
use crate::api::PROC_SELF_FD_CSTR;
4956
use crate::api::{
5057
validate_path_component, BackendFileSystem, CURRENT_DIR_CSTR, EMPTY_CSTR, PARENT_DIR_CSTR,
51-
PROC_SELF_FD_CSTR, SLASH_ASCII, VFS_MAX_INO,
58+
SLASH_ASCII, VFS_MAX_INO,
5259
};
5360

5461
#[cfg(feature = "async-io")]
@@ -108,6 +115,7 @@ const MAX_HOST_INO: u64 = 0x7fff_ffff_ffff;
108115
*/
109116
#[derive(Debug)]
110117
enum InodeFile<'a> {
118+
#[cfg(target_os = "linux")]
111119
Owned(File),
112120
Ref(&'a File),
113121
}
@@ -117,6 +125,7 @@ impl AsRawFd for InodeFile<'_> {
117125
/// Note: This fd is only valid as long as the `InodeFile` exists.
118126
fn as_raw_fd(&self) -> RawFd {
119127
match self {
128+
#[cfg(target_os = "linux")]
120129
Self::Owned(file) => file.as_raw_fd(),
121130
Self::Ref(file_ref) => file_ref.as_raw_fd(),
122131
}
@@ -126,6 +135,7 @@ impl AsRawFd for InodeFile<'_> {
126135
impl AsFd for InodeFile<'_> {
127136
fn as_fd(&self) -> BorrowedFd<'_> {
128137
match self {
138+
#[cfg(target_os = "linux")]
129139
Self::Owned(file) => file.as_fd(),
130140
Self::Ref(file_ref) => file_ref.as_fd(),
131141
}
@@ -490,6 +500,7 @@ pub struct PassthroughFs<S: BitmapSlice + Send + Sync = ()> {
490500
no_opendir: AtomicBool,
491501

492502
// Whether kill_priv_v2 is enabled.
503+
#[cfg(target_os = "linux")]
493504
killpriv_v2: AtomicBool,
494505

495506
// Whether no_readdir is enabled.
@@ -562,6 +573,7 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
562573
writeback: AtomicBool::new(false),
563574
no_open: AtomicBool::new(false),
564575
no_opendir: AtomicBool::new(false),
576+
#[cfg(target_os = "linux")]
565577
killpriv_v2: AtomicBool::new(false),
566578
no_readdir: AtomicBool::new(cfg.no_readdir),
567579
seal_size: AtomicBool::new(cfg.seal_size),
@@ -995,7 +1007,8 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
9951007
file_size: u64,
9961008
offset: u64,
9971009
size: u64,
998-
mode: i32,
1010+
#[cfg(target_os = "linux")] mode: i32,
1011+
#[cfg(target_os = "macos")] _mode: i32,
9991012
) -> io::Result<()> {
10001013
if offset.checked_add(size).is_none() {
10011014
error!(
@@ -1121,8 +1134,8 @@ macro_rules! scoped_cred {
11211134
fn drop(&mut self) {
11221135
#[cfg(target_os = "linux")]
11231136
let res = unsafe { libc::syscall($syscall_nr, -1, 0, -1) };
1124-
let res = unsafe { $syscall_nr(0) };
11251137
#[cfg(target_os = "macos")]
1138+
let res = unsafe { $syscall_nr(0) };
11261139
if res < 0 {
11271140
error!(
11281141
"fuse: failed to change credentials back to root: {}",
@@ -1226,23 +1239,26 @@ mod tests {
12261239
use super::*;
12271240
use crate::abi::fuse_abi::CreateIn;
12281241
use crate::api::filesystem::*;
1242+
#[cfg(target_os = "linux")]
12291243
use crate::api::{Vfs, VfsOptions};
12301244
#[cfg(target_os = "linux")]
12311245
use caps::{CapSet, Capability};
12321246
use log;
12331247
use std::io::Read;
1248+
#[cfg(target_os = "linux")]
12341249
use std::ops::Deref;
12351250
use std::os::unix::prelude::MetadataExt;
12361251

12371252
use std::fs;
1253+
#[cfg(target_os = "linux")]
12381254
use std::fs::Permissions;
12391255
use std::os::unix::fs::PermissionsExt;
12401256

12411257
#[cfg(target_os = "linux")]
12421258
use vmm_sys_util::{tempdir::TempDir, tempfile::TempFile};
12431259

12441260
#[cfg(target_os = "macos")]
1245-
use tempfile::{tempdir, tempdir_in, NamedTempFile, TempDir};
1261+
use tempfile::{tempdir, tempdir_in, NamedTempFile};
12461262

12471263
#[cfg(target_os = "linux")]
12481264
fn prepare_passthroughfs() -> PassthroughFs {
@@ -1276,7 +1292,7 @@ mod tests {
12761292
.expect("Failed to get directory metadata")
12771293
.permissions();
12781294
permissions.set_mode(0o40777);
1279-
let r = permissions.mode();
1295+
let _r = permissions.mode();
12801296
set_permissions_recursive(&dir_path).expect("Failed to set permissions");
12811297
}
12821298

‎src/passthrough/sync_io.rs

+62-41
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
use std::ffi::{CStr, CString};
99
use std::fs::File;
1010
use std::io;
11-
use std::mem::{self, size_of, ManuallyDrop, MaybeUninit};
11+
#[cfg(target_os = "linux")]
12+
use std::mem::size_of;
13+
use std::mem::{self, ManuallyDrop, MaybeUninit};
1214
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
1315
use std::sync::atomic::Ordering;
1416
use std::sync::Arc;
@@ -19,9 +21,9 @@ use super::os_compat::LinuxDirent64;
1921
#[cfg(target_os = "linux")]
2022
use super::util::stat_fd;
2123
use super::*;
24+
use crate::abi::fuse_abi::{CreateIn, Opcode};
2225
#[cfg(target_os = "linux")]
23-
use crate::abi::fuse_abi::WRITE_KILL_PRIV;
24-
use crate::abi::fuse_abi::{CreateIn, Opcode, FOPEN_IN_KILL_SUIDGID};
26+
use crate::abi::fuse_abi::{FOPEN_IN_KILL_SUIDGID, WRITE_KILL_PRIV};
2527
#[cfg(any(feature = "vhost-user-fs", feature = "virtiofs"))]
2628
use crate::abi::virtio_fs;
2729
use crate::api::filesystem::{
@@ -224,7 +226,10 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
224226
add_entry(
225227
DirEntry {
226228
ino: dirent.d_ino,
229+
#[cfg(target_os = "linux")]
227230
offset: dirent.d_seekoff as u64,
231+
#[cfg(target_os = "macos")]
232+
offset: dirent.d_seekoff,
228233
type_: dirent.d_type as u32,
229234
name,
230235
},
@@ -252,7 +257,8 @@ impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
252257
&self,
253258
inode: Inode,
254259
flags: u32,
255-
fuse_flags: u32,
260+
#[cfg(target_os = "linux")] fuse_flags: u32,
261+
#[cfg(target_os = "macos")] _fuse_flags: u32,
256262
) -> io::Result<(Option<Handle>, OpenOptions, Option<u32>)> {
257263
#[cfg(target_os = "linux")]
258264
let killpriv = if self.killpriv_v2.load(Ordering::Relaxed)
@@ -392,52 +398,58 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
392398
type Inode = Inode;
393399
type Handle = Handle;
394400

401+
#[cfg(target_os = "linux")]
395402
fn init(&self, capable: FsOptions) -> io::Result<FsOptions> {
396403
if self.cfg.do_import {
397404
self.import()?;
398405
}
399406

400-
#[cfg(target_os = "linux")]
401407
let mut opts = FsOptions::DO_READDIRPLUS | FsOptions::READDIRPLUS_AUTO;
402408
// !cfg.do_import means we are under vfs, in which case capable is already
403409
// negotiated and must be honored.
404-
#[cfg(target_os = "linux")]
410+
411+
if (!self.cfg.do_import || self.cfg.writeback)
412+
&& capable.contains(FsOptions::WRITEBACK_CACHE)
405413
{
406-
if (!self.cfg.do_import || self.cfg.writeback)
407-
&& capable.contains(FsOptions::WRITEBACK_CACHE)
408-
{
409-
opts |= FsOptions::WRITEBACK_CACHE;
410-
self.writeback.store(true, Ordering::Relaxed);
411-
}
412-
if (!self.cfg.do_import || self.cfg.no_open)
413-
&& capable.contains(FsOptions::ZERO_MESSAGE_OPEN)
414-
{
415-
opts |= FsOptions::ZERO_MESSAGE_OPEN;
416-
// We can't support FUSE_ATOMIC_O_TRUNC with no_open
417-
opts.remove(FsOptions::ATOMIC_O_TRUNC);
418-
self.no_open.store(true, Ordering::Relaxed);
419-
}
420-
if (!self.cfg.do_import || self.cfg.no_opendir)
421-
&& capable.contains(FsOptions::ZERO_MESSAGE_OPENDIR)
422-
{
423-
opts |= FsOptions::ZERO_MESSAGE_OPENDIR;
424-
self.no_opendir.store(true, Ordering::Relaxed);
425-
}
426-
if (!self.cfg.do_import || self.cfg.killpriv_v2)
427-
&& capable.contains(FsOptions::HANDLE_KILLPRIV_V2)
428-
{
429-
opts |= FsOptions::HANDLE_KILLPRIV_V2;
430-
self.killpriv_v2.store(true, Ordering::Relaxed);
431-
}
414+
opts |= FsOptions::WRITEBACK_CACHE;
415+
self.writeback.store(true, Ordering::Relaxed);
416+
}
417+
if (!self.cfg.do_import || self.cfg.no_open)
418+
&& capable.contains(FsOptions::ZERO_MESSAGE_OPEN)
419+
{
420+
opts |= FsOptions::ZERO_MESSAGE_OPEN;
421+
// We can't support FUSE_ATOMIC_O_TRUNC with no_open
422+
opts.remove(FsOptions::ATOMIC_O_TRUNC);
423+
self.no_open.store(true, Ordering::Relaxed);
424+
}
425+
if (!self.cfg.do_import || self.cfg.no_opendir)
426+
&& capable.contains(FsOptions::ZERO_MESSAGE_OPENDIR)
427+
{
428+
opts |= FsOptions::ZERO_MESSAGE_OPENDIR;
429+
self.no_opendir.store(true, Ordering::Relaxed);
430+
}
431+
if (!self.cfg.do_import || self.cfg.killpriv_v2)
432+
&& capable.contains(FsOptions::HANDLE_KILLPRIV_V2)
433+
{
434+
opts |= FsOptions::HANDLE_KILLPRIV_V2;
435+
self.killpriv_v2.store(true, Ordering::Relaxed);
436+
}
432437

433-
if capable.contains(FsOptions::PERFILE_DAX) {
434-
opts |= FsOptions::PERFILE_DAX;
435-
self.perfile_dax.store(true, Ordering::Relaxed);
436-
}
438+
if capable.contains(FsOptions::PERFILE_DAX) {
439+
opts |= FsOptions::PERFILE_DAX;
440+
self.perfile_dax.store(true, Ordering::Relaxed);
437441
}
438442

439-
#[cfg(target_os = "macos")]
440-
let mut opts = FsOptions::FILE_OPS;
443+
Ok(opts)
444+
}
445+
446+
#[cfg(target_os = "macos")]
447+
fn init(&self, _capable: FsOptions) -> io::Result<FsOptions> {
448+
if self.cfg.do_import {
449+
self.import()?;
450+
}
451+
452+
let opts = FsOptions::FILE_OPS;
441453

442454
Ok(opts)
443455
}
@@ -803,7 +815,8 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
803815
_lock_owner: Option<u64>,
804816
_delayed_write: bool,
805817
flags: u32,
806-
fuse_flags: u32,
818+
#[cfg(target_os = "linux")] fuse_flags: u32,
819+
#[cfg(target_os = "macos")] _fuse_flags: u32,
807820
) -> io::Result<usize> {
808821
let data = self.get_data(handle, inode, libc::O_RDWR)?;
809822

@@ -1051,7 +1064,8 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
10511064
oldname: &CStr,
10521065
newdir: Inode,
10531066
newname: &CStr,
1054-
flags: u32,
1067+
#[cfg(target_os = "linux")] flags: u32,
1068+
#[cfg(target_os = "macos")] _flags: u32,
10551069
) -> io::Result<()> {
10561070
self.validate_path_component(oldname)?;
10571071
self.validate_path_component(newname)?;
@@ -1104,7 +1118,9 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
11041118
self.validate_path_component(name)?;
11051119

11061120
let data = self.inode_map.get(parent)?;
1121+
#[cfg(target_os = "linux")]
11071122
let file = data.get_file()?;
1123+
#[cfg(target_os = "macos")]
11081124
let pathname = data.get_path()?;
11091125

11101126
let res = {
@@ -1266,7 +1282,8 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
12661282
&self,
12671283
_ctx: &Context,
12681284
inode: Inode,
1269-
datasync: bool,
1285+
#[cfg(target_os = "linux")] datasync: bool,
1286+
#[cfg(target_os = "macos")] _datasync: bool,
12701287
handle: Handle,
12711288
) -> io::Result<()> {
12721289
let data = self.get_data(handle, inode, libc::O_RDONLY)?;
@@ -1358,6 +1375,7 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
13581375
}
13591376

13601377
let data = self.inode_map.get(inode)?;
1378+
#[cfg(target_os = "linux")]
13611379
let file = data.get_file()?;
13621380
#[cfg(target_os = "linux")]
13631381
let pathname = CString::new(format!("/proc/self/fd/{}", file.as_raw_fd()))
@@ -1409,6 +1427,7 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
14091427
}
14101428

14111429
let data = self.inode_map.get(inode)?;
1430+
#[cfg(target_os = "linux")]
14121431
let file = data.get_file()?;
14131432
let mut buf = Vec::<u8>::with_capacity(size as usize);
14141433
#[cfg(target_os = "linux")]
@@ -1460,6 +1479,7 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
14601479
}
14611480

14621481
let data = self.inode_map.get(inode)?;
1482+
#[cfg(target_os = "linux")]
14631483
let file = data.get_file()?;
14641484
let mut buf = Vec::<u8>::with_capacity(size as usize);
14651485
#[cfg(target_os = "linux")]
@@ -1508,6 +1528,7 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
15081528
}
15091529

15101530
let data = self.inode_map.get(inode)?;
1531+
#[cfg(target_os = "linux")]
15111532
let file = data.get_file()?;
15121533
#[cfg(target_os = "linux")]
15131534
let pathname = CString::new(format!("/proc/self/fd/{}", file.as_raw_fd()))

‎src/passthrough/util.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
// Copyright (C) 2023 Alibaba Cloud. All rights reserved.
44

55
use std::collections::{btree_map, BTreeMap};
6-
use std::ffi::{CStr, CString};
6+
use std::ffi::CStr;
7+
#[cfg(target_os = "linux")]
8+
use std::ffi::CString;
79
use std::fs::File;
810
use std::io;
11+
12+
#[cfg(target_os = "linux")]
913
use std::mem::MaybeUninit;
1014
use std::os::unix::io::{AsRawFd, FromRawFd};
1115
use std::sync::atomic::{AtomicU64, AtomicU8, Ordering};
@@ -14,6 +18,8 @@ use std::sync::Mutex;
1418
use super::inode_store::InodeId;
1519
use super::{InoT, InodeMode, MAX_HOST_INO};
1620
use crate::abi::fuse_abi as fuse;
21+
22+
#[cfg(target_os = "linux")]
1723
use crate::api::EMPTY_CSTR;
1824

1925
/// the 56th bit used to set the inode to 1 indicates virtual inode

0 commit comments

Comments
 (0)