9p: Add support for darwin
v6 cover 9p: Add support for darwin
This is a followup to https://lists.gnu.org/archive/html/qemu-devel/2022-02/msg01506.html,
adding 9p server support for Darwin.
Since v5, the following changes have been made to the following patches:
Patch 6/11: 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX
- For P9_XATTR_SIZE_MAX, ensure that Linux uses XATTR_SIZE_MAX, Darwin uses 64k, and error out for undefined hosts
Patch 9/11: 9p: darwin: Implement compatibility for mknodat
- Move pthread_fchdir_np declaration only to osdep
- Declare pthread_fchdir_np with __attribute__((weak)) to allow checking for its presence before usage
- Move declarations above cplusplus guard
Patch 10/11: 9p: darwin: Adjust assumption on virtio-9p-test (formerly v5 Patch 11/11)
- Move this patch before 9p: darwin: meson patch to avoid qtest breakage during bisecting
Patch 11/11: 9p: darwin: meson: Allow VirtFS on Darwin (formerly v5 Patch 10/11)
- Fully adjust meson virtfs error note to specify macOS
Keno Fischer (10):
9p: linux: Fix a couple Linux assumptions 9p: Rename 9p-util -> 9p-util-linux
9p: darwin: Handle struct stat(fs) differences 9p: darwin: Handle struct dirent differences 9p: darwin: Ignore O_{NOATIME, DIRECT}
9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX 9p: darwin: *xattr_nofollow implementations 9p: darwin: Compatibility for f/l*xattr 9p: darwin: Implement compatibility for mknodat 9p: darwin: meson: Allow VirtFS on Darwin
Will Cohen (1):
9p: darwin: Adjust assumption on virtio-9p-test
fsdev/file-op-9p.h | 9 +++-
fsdev/meson.build | 1 +
hw/9pfs/9p-local.c | 27 ++++++++---
hw/9pfs/9p-proxy.c | 38 +++++++++++++--
hw/9pfs/9p-synth.c | 6 +++
hw/9pfs/9p-util-darwin.c | 64 ++++++++++++++++++++++++++
hw/9pfs/{9p-util.c => 9p-util-linux.c} | 2 +-
hw/9pfs/9p-util.h | 35 ++++++++++++++
hw/9pfs/9p.c | 42 ++++++++++++++---
hw/9pfs/9p.h | 18 ++++++++
hw/9pfs/codir.c | 4 +-
hw/9pfs/meson.build | 3 +-
include/qemu/osdep.h | 12 +++++
include/qemu/xattr.h | 4 +-
meson.build | 14 ++++--
os-posix.c | 35 ++++++++++++++
tests/qtest/virtio-9p-test.c | 2 +-
17 files changed, 291 insertions(+), 25 deletions(-)
create mode 100644 hw/9pfs/9p-util-darwin.c
rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (97%)Signature · 1 line
2.34.1
PATCH v6 1/11 9p: linux: Fix a couple Linux assumptions
From: Keno Fischer <[email protected]>
- Guard Linux only headers.
- Add qemu/statfs.h header to abstract over the which headers are needed for struct statfs
- Define ENOATTR only if not only defined (it's defined in system headers on Darwin).
While it might at first appear that fsdev/virtfs-proxy-header.c would need similar adjustment for darwin as file-op-9p here, a later patch in this series disables virtfs-proxy-helper for non-Linux. Allowing virtfs-proxy-helper on darwin could potentially be an additional optimization later.
[Will Cohen: - Fix headers for Alpine
- Integrate statfs.h back into file-op-9p.h
- Remove superfluous header guards from file-opt-9p
- Add note about virtfs-proxy-helper being disabled on non-Linux for this patch series]
--- fsdev/file-op-9p.h | 9 ++++++++- hw/9pfs/9p-local.c | 2 ++ hw/9pfs/9p.c | 4 ++++ include/qemu/xattr.h | 4 +++- 4 files changed, 17 insertions(+), 2 deletions(-)
fsdev/file-op-9p.h +8 -1
@@ -16,10 +16,17 @@#include <dirent.h> #include <utime.h> -#include <sys/vfs.h> #include "qemu-fsdev-throttle.h" #include "p9array.h" +#ifdef CONFIG_LINUX +# include <sys/vfs.h> +#endif +#ifdef CONFIG_DARWIN +# include <sys/param.h> +# include <sys/mount.h> +#endif +#define SM_LOCAL_MODE_BITS 0600#define SM_LOCAL_DIR_MODE_BITS 0700
hw/9pfs/9p-local.c +2 -0
@@ -32,10 +32,12 @@#include "qemu/error-report.h" #include "qemu/option.h" #include <libgen.h> +#ifdef CONFIG_LINUX #include <linux/fs.h> #ifdef CONFIG_LINUX_MAGIC_H #include <linux/magic.h> #endif +#endif #include <sys/ioctl.h> #ifndef XFS_SUPER_MAGIC
hw/9pfs/9p.c +4 -0
@@ -32,7 +32,11 @@#include "migration/blocker.h" #include "qemu/xxhash.h" #include <math.h> +#ifdef CONFIG_LINUX #include <linux/limits.h> +#else +#include <limits.h> +#endif int open_fd_hw;int total_open_fd;
include/qemu/xattr.h +3 -1
@@ -22,7 +22,9 @@#ifdef CONFIG_LIBATTR # include <attr/xattr.h> #else -# define ENOATTR ENODATA +# if !defined(ENOATTR ) +# define ENOATTR ENODATA +# endif # include <sys/xattr.h> #endif
Signature · 1 line
2.34.1
PATCH v6 2/11 9p: Rename 9p-util -> 9p-util-linux
In reply to Will CohenFrom: Keno Fischer <[email protected]>
The current file only has the Linux versions of these functions. Rename the file accordingly and update the Makefile to only build it on Linux. A Darwin version of these will follow later in the series.
---
hw/9pfs/{9p-util.c => 9p-util-linux.c} | 2 +-
hw/9pfs/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (97%)hw/9pfs/9p-util-linux.c renamed from hw/9pfs/9p-util.c +1 -1
@@ -1,5 +1,5 @@/* -* 9p utilities +* 9p utilities (Linux Implementation) * * Copyright IBM, Corp. 2017 *
hw/9pfs/meson.build +1 -1
@@ -4,7 +4,6 @@ fs_ss.add(files( '9p-posix-acl.c', '9p-proxy.c', '9p-synth.c', - '9p-util.c', '9p-xattr-user.c', '9p-xattr.c', '9p.c',
@@ -14,6 +13,7 @@ fs_ss.add(files( 'coth.c', 'coxattr.c', )) +fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
Signature · 1 line
2.34.1
PATCH v6 3/11 9p: darwin: Handle struct stat(fs) differences
In reply to Will CohenFrom: Keno Fischer <[email protected]>
[Will Cohen: - Note lack of f_namelen and f_frsize on Darwin
- Ensure that tv_sec and tv_nsec are both initialized for Darwin and non-Darwin]
--- hw/9pfs/9p-proxy.c | 22 ++++++++++++++++++++-- hw/9pfs/9p-synth.c | 2 ++ hw/9pfs/9p.c | 16 ++++++++++++++-- 3 files changed, 36 insertions(+), 4 deletions(-)
hw/9pfs/9p-proxy.c +20 -2
@@ -123,10 +123,16 @@ static void prstatfs_to_statfs(struct statfs *stfs, ProxyStatFS *prstfs) stfs->f_bavail = prstfs->f_bavail; stfs->f_files = prstfs->f_files; stfs->f_ffree = prstfs->f_ffree; +#ifdef CONFIG_DARWIN +/* f_namelen and f_frsize do not exist on Darwin */ + stfs->f_fsid.val[0 ] = prstfs->f_fsid[0 ] &0xFFFFFFFFU ; + stfs->f_fsid.val[1 ] = prstfs->f_fsid[1 ] >>32 &0xFFFFFFFFU ; +#else stfs->f_fsid.__val[0 ] = prstfs->f_fsid[0 ] &0xFFFFFFFFU ; stfs->f_fsid.__val[1 ] = prstfs->f_fsid[1 ] >>32 &0xFFFFFFFFU ; stfs->f_namelen = prstfs->f_namelen; stfs->f_frsize = prstfs->f_frsize; +#endif }/* Converts proxy_stat structure to VFS stat structure */
@@ -143,12 +149,24 @@ static void prstat_to_stat(struct stat *stbuf, ProxyStat *prstat) stbuf->st_size = prstat->st_size; stbuf->st_blksize = prstat->st_blksize; stbuf->st_blocks = prstat->st_blocks; + stbuf->st_atime = prstat->st_atim_sec; + stbuf->st_mtime = prstat->st_mtim_sec; + stbuf->st_ctime = prstat->st_ctim_sec; +#ifdef CONFIG_DARWIN + stbuf->st_atimespec.tv_sec = prstat->st_atim_sec; + stbuf->st_mtimespec.tv_sec = prstat->st_mtim_sec; + stbuf->st_ctimespec.tv_sec = prstat->st_ctim_sec; + stbuf->st_atimespec.tv_nsec = prstat->st_atim_nsec; + stbuf->st_mtimespec.tv_nsec = prstat->st_mtim_nsec; + stbuf->st_ctimespec.tv_nsec = prstat->st_ctim_nsec; +#else stbuf->st_atim.tv_sec = prstat->st_atim_sec; + stbuf->st_mtim.tv_sec = prstat->st_mtim_sec; + stbuf->st_ctim.tv_sec = prstat->st_ctim_sec; stbuf->st_atim.tv_nsec = prstat->st_atim_nsec; - stbuf->st_mtime = prstat->st_mtim_sec; stbuf->st_mtim.tv_nsec = prstat->st_mtim_nsec; - stbuf->st_ctime = prstat->st_ctim_sec; stbuf->st_ctim.tv_nsec = prstat->st_ctim_nsec; +#endif }/*
hw/9pfs/9p-synth.c +2 -0
@@ -427,7 +427,9 @@ static int synth_statfs(FsContext *s, V9fsPath *fs_path, stbuf->f_bsize =512 ; stbuf->f_blocks =0 ; stbuf->f_files = synth_node_count; +#ifndef CONFIG_DARWIN stbuf->f_namelen =NAME_MAX ; +#endif return 0 ; }
hw/9pfs/9p.c +14 -2
@@ -1313,11 +1313,17 @@ static int stat_to_v9stat_dotl(V9fsPDU *pdu, const struct stat *stbuf, v9lstat->st_blksize =stat_to_iounit (pdu, stbuf); v9lstat->st_blocks = stbuf->st_blocks; v9lstat->st_atime_sec = stbuf->st_atime; - v9lstat->st_atime_nsec = stbuf->st_atim.tv_nsec; v9lstat->st_mtime_sec = stbuf->st_mtime; - v9lstat->st_mtime_nsec = stbuf->st_mtim.tv_nsec; v9lstat->st_ctime_sec = stbuf->st_ctime; +#ifdef CONFIG_DARWIN + v9lstat->st_atime_nsec = stbuf->st_atimespec.tv_nsec; + v9lstat->st_mtime_nsec = stbuf->st_mtimespec.tv_nsec; + v9lstat->st_ctime_nsec = stbuf->st_ctimespec.tv_nsec; +#else + v9lstat->st_atime_nsec = stbuf->st_atim.tv_nsec; + v9lstat->st_mtime_nsec = stbuf->st_mtim.tv_nsec; v9lstat->st_ctime_nsec = stbuf->st_ctim.tv_nsec; +#endif /* Currently we only support BASIC fields in stat */ v9lstat->st_result_mask =P9_STATS_BASIC ;
@@ -3519,9 +3525,15 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf) f_bavail = stbuf->f_bavail / bsize_factor; f_files = stbuf->f_files; f_ffree = stbuf->f_ffree; +#ifdef CONFIG_DARWIN + fsid_val = (unsigned int )stbuf->f_fsid.val[0 ] | + (unsigned long long )stbuf->f_fsid.val[1 ] <<32 ; + f_namelen =NAME_MAX ; +#else fsid_val = (unsigned int ) stbuf->f_fsid.__val[0 ] | (unsigned long long )stbuf->f_fsid.__val[1 ] <<32 ; f_namelen = stbuf->f_namelen; +#endif return pdu_marshal(pdu, offset, "ddqqqqqqd", f_type, f_bsize, f_blocks, f_bfree,
Signature · 1 line
2.34.1
PATCH v6 4/11 9p: darwin: Handle struct dirent differences
In reply to Will CohenFrom: Keno Fischer <[email protected]>
On darwin d_seekoff exists, but is optional and does not seem to be commonly used by file systems. Use telldir instead to obtain the seek offset and inject it into d_seekoff, and create a qemu_dirent_off helper to call it appropriately when appropriate.
[Will Cohen: - Adjust to pass testing
- Ensure that d_seekoff is filled using telldir on darwin, and create qemu_dirent_off helper to decide which to access]
[Will Cohen: - Ensure that telldir error handling uses
signed int
- Cleanup of telldir error handling
- Remove superfluous error handling for qemu_dirent_off
- Adjust formatting
- Use qemu_dirent_off in codir.c]
--- hw/9pfs/9p-local.c | 9 +++++++++ hw/9pfs/9p-proxy.c | 16 +++++++++++++++- hw/9pfs/9p-synth.c | 4 ++++ hw/9pfs/9p-util.h | 16 ++++++++++++++++ hw/9pfs/9p.c | 7 +++++-- hw/9pfs/codir.c | 4 +++- 6 files changed, 52 insertions(+), 4 deletions(-)
hw/9pfs/9p-local.c +9 -0
@@ -562,6 +562,15 @@ again:if (!entry) {return NULL ; } +#ifdef CONFIG_DARWIN +int off; + off =telldir (fs->dir.stream); +/* If telldir fails, fail the entire readdir call */ +if (off <0 ) { +return NULL ; + } + entry->d_seekoff = off; +#endif if (ctx->export_flags &V9FS_SM_MAPPED ) { entry->d_type =DT_UNKNOWN ;
hw/9pfs/9p-proxy.c +15 -1
@@ -706,7 +706,21 @@ static off_t proxy_telldir(FsContext *ctx, V9fsFidOpenState *fs)static struct dirent *proxy_readdir (FsContext *ctx,V9fsFidOpenState *fs) { -return readdir (fs->dir.stream); +struct dirent *entry; + entry =readdir (fs->dir.stream); +#ifdef CONFIG_DARWIN +if (!entry) { +return NULL ; + } +int td; + td =telldir (fs->dir.stream); +/* If telldir fails, fail the entire readdir call */ +if (td <0 ) { +return NULL ; + } + entry->d_seekoff = td; +#endif +return entry; }static void proxy_seekdir (FsContext *ctx,V9fsFidOpenState *fs,off_t off)
hw/9pfs/9p-synth.c +4 -0
@@ -222,7 +222,11 @@ static void synth_direntry(V9fsSynthNode *node, {strcpy (entry->d_name, node->name); entry->d_ino = node->attr->inode; +#ifdef CONFIG_DARWIN + entry->d_seekoff = off +1 ; +#else entry->d_off = off +1 ; +#endif } static struct dirent *synth_get_dentry(V9fsSynthNode *dir,
hw/9pfs/9p-util.h +16 -0
@@ -79,3 +79,19 @@ ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, const char *name);#endif + + +/** +* Darwin has d_seekoff, which appears to function similarly to d_off. +* However, it does not appear to be supported on all file systems, +* so ensure it is manually injected earlier and call here when +* needed. +*/ +inline off_t qemu_dirent_off (struct dirent *dent) +{ +#ifdef CONFIG_DARWIN +return dent->d_seekoff; +#else +return dent->d_off; +#endif +}
hw/9pfs/9p.c +5 -2
@@ -27,6 +27,7 @@#include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "9p-xattr.h" +#include "9p-util.h" #include "coth.h" #include "trace.h" #include "migration/blocker.h"
@@ -2281,7 +2282,7 @@ static int coroutine_fn v9fs_do_readdir_with_stat(V9fsPDU *pdu, count += len;v9fs_stat_free (&v9stat);v9fs_path_free (&path); - saved_dir_pos = dent->d_off; + saved_dir_pos =qemu_dirent_off (dent); }v9fs_readdir_unlock (&fidp->fs.dir);
@@ -2420,6 +2421,7 @@ static int coroutine_fn v9fs_do_readdir(V9fsPDU *pdu, V9fsFidState *fidp,V9fsString name;int len, err =0 ;int32_t count =0 ; +off_t off;struct dirent *dent;struct stat *st;struct V9fsDirEnt *entries =NULL ;
@@ -2480,12 +2482,13 @@ static int coroutine_fn v9fs_do_readdir(V9fsPDU *pdu, V9fsFidState *fidp, qid.version =0 ; } + off =qemu_dirent_off (dent);v9fs_string_init (&name);v9fs_string_sprintf (&name,"%s" , dent->d_name);/* 11 = 7 + 4 (7 = start offset, 4 = space for storing count) */ len =pdu_marshal (pdu,11 + count,"Qqbs" , - &qid, dent->d_off, + &qid, off, dent->d_type, &name);v9fs_string_free (&name);
hw/9pfs/codir.c +3 -1
@@ -22,6 +22,8 @@#include "qemu/coroutine.h" #include "qemu/main-loop.h" #include "coth.h" +#include "9p-xattr.h" +#include "9p-util.h" /* * Intended to be called from bottom-half (e.g. background I/O thread)
@@ -167,7 +169,7 @@ static int do_readdir_many(V9fsPDU *pdu, V9fsFidState *fidp, } size += len; - saved_dir_pos = dent->d_off; + saved_dir_pos =qemu_dirent_off (dent); }/* restore (last) saved position */
Signature · 1 line
2.34.1
PATCH v6 5/11 9p: darwin: Ignore O_{NOATIME, DIRECT}
In reply to Will CohenFrom: Keno Fischer <[email protected]>
Darwin doesn't have either of these flags. Darwin does have F_NOCACHE, which is similar to O_DIRECT, but has different enough semantics that other projects don't generally map them automatically. In any case, we don't support O_DIRECT on Linux at the moment either.
--- hw/9pfs/9p-util.h | 2 ++ hw/9pfs/9p.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
hw/9pfs/9p-util.h +2 -0
@@ -41,6 +41,7 @@ again: fd =openat (dirfd, name, flags |O_NOFOLLOW |O_NOCTTY |O_NONBLOCK , mode);if (fd ==-1 ) { +#ifndef CONFIG_DARWIN if (errno ==EPERM && (flags &O_NOATIME )) {/* * The client passed O_NOATIME but we lack permissions to honor it.
@@ -53,6 +54,7 @@ again: flags &= ~O_NOATIME ; goto again; } +#endif return -1 ; }
hw/9pfs/9p.c +12 -1
@@ -138,11 +138,20 @@ static int dotl_to_open_flags(int flags) { P9_DOTL_NONBLOCK, O_NONBLOCK } , { P9_DOTL_DSYNC, O_DSYNC }, { P9_DOTL_FASYNC, FASYNC }, +#ifndef CONFIG_DARWIN + { P9_DOTL_NOATIME, O_NOATIME }, +/* +* On Darwin, we could map to F_NOCACHE, which is +* similar, but doesn't quite have the same +* semantics. However, we don't support O_DIRECT +* even on linux at the moment, so we just ignore +* it here. +*/ { P9_DOTL_DIRECT, O_DIRECT }, +#endif { P9_DOTL_LARGEFILE, O_LARGEFILE }, { P9_DOTL_DIRECTORY, O_DIRECTORY }, { P9_DOTL_NOFOLLOW, O_NOFOLLOW }, - { P9_DOTL_NOATIME, O_NOATIME }, { P9_DOTL_SYNC, O_SYNC }, };
@@ -171,10 +180,12 @@ static int get_dotl_openflags(V9fsState *s, int oflags)*/ flags =dotl_to_open_flags (oflags); flags &= ~(O_NOCTTY |O_ASYNC |O_CREAT ); +#ifndef CONFIG_DARWIN /* * Ignore direct disk access hint until the server supports it. */ flags &= ~O_DIRECT ; +#endif return flags; }
Signature · 1 line
2.34.1
PATCH v6 6/11 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX
In reply to Will CohenFrom: Keno Fischer <[email protected]>
Because XATTR_SIZE_MAX is not defined on Darwin, create a cross-platform P9_XATTR_SIZE_MAX instead.
[Will Cohen: - Adjust coding style
- Lower XATTR_SIZE_MAX to 64k
- Add explanatory context related to XATTR_SIZE_MAX]
[Fabian Franz: - Move XATTR_SIZE_MAX reference from 9p.c to
P9_XATTR_SIZE_MAX in 9p.h]
[Will Cohen: - For P9_XATTR_MAX, ensure that Linux uses
XATTR_SIZE_MAX, Darwin uses 64k, and error out for undefined hosts]
--- hw/9pfs/9p.c | 2 +- hw/9pfs/9p.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
hw/9pfs/9p.c +1 -1
@@ -3949,7 +3949,7 @@ static void coroutine_fn v9fs_xattrcreate(void *opaque) rflags |=XATTR_REPLACE ; } -if (size >XATTR_SIZE_MAX ) { +if (size >P9_XATTR_SIZE_MAX ) { err = -E2BIG ; goto out_nofid; }
hw/9pfs/9p.h +18 -0
@@ -479,4 +479,22 @@ struct V9fsTransport { void (*push_and_notify)(V9fsPDU *pdu); }; +#if defined(XATTR_SIZE_MAX ) +/* Linux */ +#define P9_XATTR_SIZE_MAX XATTR_SIZE_MAX +#elif defined(CONFIG_DARWIN ) +/* +* Darwin doesn't seem to define a maximum xattr size in its user +* space header, so manually configure it across platforms as 64k. +* +* Having no limit at all can lead to QEMU crashing during large g_malloc() +* calls. Because QEMU does not currently support macOS guests, the below +* preliminary solution only works due to its being a reflection of the limit of +* Linux guests. +*/ +#define P9_XATTR_SIZE_MAX 65536 +#else +#error Missing definition for P9_XATTR_SIZE_MAX for this host system +#endif +#endif
Signature · 1 line
2.34.1
PATCH v6 7/11 9p: darwin: *xattr_nofollow implementations
In reply to Will CohenFrom: Keno Fischer <[email protected]>
This implements the darwin equivalent of the functions that were moved to 9p-util(-linux) earlier in this series in the new 9p-util-darwin file.
--- hw/9pfs/9p-util-darwin.c | 64 ++++++++++++++++++++++++++++++++++++++++ hw/9pfs/meson.build | 1 + 2 files changed, 65 insertions(+) create mode 100644 hw/9pfs/9p-util-darwin.c
hw/9pfs/9p-util-darwin.c new file +64 -0
@@ -0,0 +1,64 @@ +/* +* 9p utilities (Darwin Implementation) +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "qemu/xattr.h" +#include "9p-util.h" + +ssize_t fgetxattrat_nofollow (int dirfd,const char *filename,const char *name, +void *value,size_t size) +{ +int ret; +int fd =openat_file (dirfd, filename, +O_RDONLY |O_PATH_9P_UTIL |O_NOFOLLOW ,0 ); +if (fd ==-1 ) { +return -1 ; + } + ret =fgetxattr (fd, name, value, size,0 ,0 ); +close_preserve_errno (fd); +return ret; +} + +ssize_t flistxattrat_nofollow (int dirfd,const char *filename, +char *list,size_t size) +{ +int ret; +int fd =openat_file (dirfd, filename, +O_RDONLY |O_PATH_9P_UTIL |O_NOFOLLOW ,0 ); +if (fd ==-1 ) { +return -1 ; + } + ret =flistxattr (fd, list, size,0 ); +close_preserve_errno (fd); +return ret; +} + +ssize_t fremovexattrat_nofollow (int dirfd,const char *filename, +const char *name) +{ +int ret; +int fd =openat_file (dirfd, filename,O_PATH_9P_UTIL |O_NOFOLLOW ,0 ); +if (fd ==-1 ) { +return -1 ; + } + ret =fremovexattr (fd, name,0 ); +close_preserve_errno (fd); +return ret; +} + +int fsetxattrat_nofollow (int dirfd,const char *filename,const char *name, +void *value,size_t size,int flags) +{ +int ret; +int fd =openat_file (dirfd, filename,O_PATH_9P_UTIL |O_NOFOLLOW ,0 ); +if (fd ==-1 ) { +return -1 ; + } + ret =fsetxattr (fd, name, value, size,0 , flags); +close_preserve_errno (fd); +return ret; +}
hw/9pfs/meson.build +1 -0
@@ -14,6 +14,7 @@ fs_ss.add(files( 'coxattr.c', )) fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) +fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c')) fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
Signature · 1 line
2.34.1
PATCH v6 8/11 9p: darwin: Compatibility for f/l*xattr
In reply to Will CohenFrom: Keno Fischer <[email protected]>
On darwin fgetxattr takes two extra optional arguments, and the l* variants are not defined (in favor of an extra flag to the regular variants.
--- hw/9pfs/9p-local.c | 12 ++++++++---- hw/9pfs/9p-util.h | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-)
hw/9pfs/9p-local.c +8 -4
@@ -790,16 +790,20 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,mode_t tmp_mode;dev_t tmp_dev; -if (fgetxattr (fd,"user.virtfs.uid" , &tmp_uid,sizeof (uid_t)) >0 ) { +if (qemu_fgetxattr (fd,"user.virtfs.uid" , + &tmp_uid,sizeof (uid_t)) >0 ) { stbuf->st_uid =le32_to_cpu (tmp_uid); } -if (fgetxattr (fd,"user.virtfs.gid" , &tmp_gid,sizeof (gid_t)) >0 ) { +if (qemu_fgetxattr (fd,"user.virtfs.gid" , + &tmp_gid,sizeof (gid_t)) >0 ) { stbuf->st_gid =le32_to_cpu (tmp_gid); } -if (fgetxattr (fd,"user.virtfs.mode" , &tmp_mode,sizeof (mode_t)) >0 ) { +if (qemu_fgetxattr (fd,"user.virtfs.mode" , + &tmp_mode,sizeof (mode_t)) >0 ) { stbuf->st_mode =le32_to_cpu (tmp_mode); } -if (fgetxattr (fd,"user.virtfs.rdev" , &tmp_dev,sizeof (dev_t)) >0 ) { +if (qemu_fgetxattr (fd,"user.virtfs.rdev" , + &tmp_dev,sizeof (dev_t)) >0 ) { stbuf->st_rdev =le64_to_cpu (tmp_dev); } }else if (fs_ctx->export_flags &V9FS_SM_MAPPED_FILE ) {
hw/9pfs/9p-util.h +17 -0
@@ -19,6 +19,23 @@#define O_PATH_9P_UTIL 0#endif +#ifdef CONFIG_DARWIN +#define qemu_fgetxattr (...) fgetxattr(__VA_ARGS__, 0, 0) +#define qemu_lgetxattr (...) getxattr(__VA_ARGS__, 0, XATTR_NOFOLLOW) +#define qemu_llistxattr (...) listxattr(__VA_ARGS__, XATTR_NOFOLLOW) +#define qemu_lremovexattr (...) removexattr(__VA_ARGS__, XATTR_NOFOLLOW) +static inline int qemu_lsetxattr (const char *path,const char *name, +const void *value,size_t size,int flags) { +return setxattr (path, name, value, size,0 , flags |XATTR_NOFOLLOW ); +} +#else +#define qemu_fgetxattr fgetxattr +#define qemu_lgetxattr lgetxattr +#define qemu_llistxattr llistxattr +#define qemu_lremovexattr lremovexattr +#define qemu_lsetxattr lsetxattr +#endif +static inline void close_preserve_errno (int fd) {int serrno = errno;
Signature · 1 line
2.34.1
PATCH v6 9/11 9p: darwin: Implement compatibility for mknodat
In reply to Will CohenFrom: Keno Fischer <[email protected]>
Darwin does not support mknodat. However, to avoid race conditions with later setting the permissions, we must avoid using mknod on the full path instead. We could try to fchdir, but that would cause problems if multiple threads try to call mknodat at the same time. However, luckily there is a solution: Darwin includes a function that sets the cwd for the current thread only.
This should suffice to use mknod safely.
This function (pthread_fchdir_np) is protected by a check in meson in a patch later in this series.
[Will Cohen: - Adjust coding style
- Replace clang references with gcc
- Note radar filed with Apple for missing syscall
- Replace direct syscall with pthread_fchdir_np and adjust patch notes accordingly
- Move qemu_mknodat from 9p-util to osdep and os-posix
- Move pthread_fchdir_np declaration only to osdep
- Declare pthread_fchdir_np with
- __attribute__((weak_import)) to allow checking for its presence before usage
- Move declarations above cplusplus guard]
--- hw/9pfs/9p-local.c | 4 ++-- include/qemu/osdep.h | 12 ++++++++++++ os-posix.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-)
hw/9pfs/9p-local.c +2 -2
@@ -682,7 +682,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path,if (fs_ctx->export_flags &V9FS_SM_MAPPED || fs_ctx->export_flags &V9FS_SM_MAPPED_FILE ) { - err =mknodat (dirfd, name, fs_ctx->fmode |S_IFREG ,0 ); + err =qemu_mknodat (dirfd, name, fs_ctx->fmode |S_IFREG ,0 );if (err ==-1 ) { goto out; }
@@ -697,7 +697,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath *dir_path, } }else if (fs_ctx->export_flags &V9FS_SM_PASSTHROUGH || fs_ctx->export_flags &V9FS_SM_NONE ) { - err =mknodat (dirfd, name, credp->fc_mode, credp->fc_rdev); + err =qemu_mknodat (dirfd, name, credp->fc_mode, credp->fc_rdev);if (err ==-1 ) { goto out; }
include/qemu/osdep.h +12 -0
@@ -805,6 +805,18 @@ static inline int platform_does_not_support_system(const char *command) }#endif /* !HAVE_SYSTEM_FUNCTION */ +/* +* As long as mknodat is not available on macOS, this workaround +* using pthread_fchdir_np is needed. qemu_mknodat is defined in +* os-posix.c. pthread_fchdir_np is weakly linked here as a guard +* in case it disappears in future macOS versions, because it is +* is a private API. +*/ +#ifdef CONFIG_DARWIN +int pthread_fchdir_np (int fd) __attribute__((weak_import)); +#endif +int qemu_mknodat (int dirfd,const char *filename,mode_t mode,dev_t dev); +#ifdef __cplusplus }#endif
os-posix.c +35 -0
@@ -332,3 +332,38 @@ int os_mlock(void)return -ENOSYS ;#endif } + +/* +* As long as mknodat is not available on macOS, this workaround +* using pthread_fchdir_np is needed. +* +* Radar filed with Apple for implementing mknodat: +* rdar://FB9862426 (https://openradar.appspot.com/FB9862426) +*/ +#ifdef CONFIG_DARWIN + +int qemu_mknodat (int dirfd,const char *filename,mode_t mode,dev_t dev) +{ +int preserved_errno, err; +if (!pthread_fchdir_np) { +error_report_once ("pthread_fchdir_np() is not available on this version of macOS" ); +return -ENOTSUP ; + } +if (pthread_fchdir_np (dirfd) <0 ) { +return -1 ; + } + err =mknod (filename, mode, dev); + preserved_errno = errno; +/* Stop using the thread-local cwd */ +pthread_fchdir_np (-1 ); +if (err <0 ) { + errno = preserved_errno; + } +return err; +} +#else +int qemu_mknodat (int dirfd,const char *filename,mode_t mode,dev_t dev) +{ +return mknodat (dirfd, filename, mode, dev); +} +#endif
Signature · 1 line
2.34.1
Re: [PATCH v6 09/11] 9p: darwin: Implement compatibility for mknodat
Quoted 33 lines · Will Cohen
From: Keno Fischer <[email protected]>
Darwin does not support mknodat. However, to avoid race conditions with later setting the permissions, we must avoid using mknod on the full path instead. We could try to fchdir, but that would cause problems if multiple threads try to call mknodat at the same time. However, luckily there is a solution: Darwin includes a function that sets the cwd for the current thread only.
This should suffice to use mknod safely.This function (
pthread_fchdir_np) is protected by a check in meson in a patch later in this series.Signed-off-by Keno Fischer <[email protected]>Signed-off-by Michael Roitzsch <[email protected]>[Will Cohen: - Adjust coding style
- Replace clang references with gcc
- Note radar filed with Apple for missing syscall
- Replace direct syscall withpthread_fchdir_npand adjust patch notes accordingly
- Moveqemu_mknodatfrom 9p-util to osdep and os-posix
- Movepthread_fchdir_npdeclaration only to osdep
- Declarepthread_fchdir_npwith
- __attribute__((weak_import)) to allow checking for its presence before usage
- Move declarations above cplusplus guard]Signed-off-by Will Cohen <[email protected]>--- hw/9pfs/9p-local.c | 4 ++-- include/qemu/osdep.h | 12 ++++++++++++ os-posix.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-)
include/qemu/osdep.h static inline int platform_does_not_support_system(const char *command) · line 817
Quoted 10 lines
include/qemu/osdep.h +10
-0+/* +* As long as mknodat is not available on macOS, this workaround +* using pthread_fchdir_np is needed. qemu_mknodat is defined in +* os-posix.c. pthread_fchdir_np is weakly linked here as a guard +* in case it disappears in future macOS versions, because it is +* is a private API. +*/ +#ifdef CONFIG_DARWIN +int pthread_fchdir_np (int fd) __attribute__((weak_import)); +#endif
Please use Meson to define CONFIG_PTHREAD_FCHDIR_NP, similar to commits 10f6b23187 ("configure, meson: move pthread_setname_np checks to Meson") and 479a57475e ("util: Implement debug-threads for macOS").
PATCH v6 10/11 9p: darwin: Adjust assumption on virtio-9p-test
In reply to Will CohenThe previous test depended on the assumption that P9_DOTL_AT_REMOVEDIR and AT_REMOVEDIR have the same value.
While this is true on Linux, it is not true everywhere, and leads to an incorrect test failure on unlink_at, noticed when adding 9p to darwin:
Received response 7 (RLERROR) instead of 77 (RUNLINKAT) Rlerror has errno 22 (Invalid argument)
**
ERROR:../tests/qtest/virtio-9p-test.c:305:v9fs_req_recv: assertion failed (hdr.id == id): (7 == 77) Bail out!
ERROR:../tests/qtest/virtio-9p-test.c:305:v9fs_req_recv: assertion failed (hdr.id == id): (7 == 77)
[Will Cohen: - Add explanation of patch and description
of pre-patch test failure]
[Will Cohen: - Move this patch before 9p: darwin: meson
patch to avoid qtest breakage during bisecting]
--- tests/qtest/virtio-9p-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/virtio-9p-test.c +1 -1
@@ -1270,7 +1270,7 @@ static void fs_unlinkat_dir(void *obj, void *data, QGuestAllocator *t_alloc)/* ... and is actually a directory */ g_assert ((st.st_mode &S_IFMT ) ==S_IFDIR ); -do_unlinkat (v9p,"/" ,"02" ,AT_REMOVEDIR ); +do_unlinkat (v9p,"/" ,"02" ,P9_DOTL_AT_REMOVEDIR );/* directory should be gone now */ g_assert (stat (new_dir, &st) !=0 );
Signature · 1 line
2.34.1
PATCH v6 11/11 9p: darwin: meson: Allow VirtFS on Darwin
In reply to Will CohenFrom: Keno Fischer <[email protected]>
To allow VirtFS on darwin, we need to check that pthread_fchdir_np is available, which has only been available since macOS 10.12.
Additionally, virtfs_proxy_helper is disabled on Darwin. This patch series does not currently provide an implementation of the proxy-helper, but this functionality could be implemented later on.
[Will Cohen: - Add check for pthread_fchdir_np to virtfs
- Add comments to patch commit
- Note that virtfs_proxy_helper does not work on macOS
- Fully adjust meson virtfs error note to specify macOS]
--- fsdev/meson.build | 1 + meson.build | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-)
fsdev/meson.build +1 -0
@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( 'qemu-fsdev.c', ), if_false: files('qemu-fsdev-dummy.c')) softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) +softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss) if have_virtfs_proxy_helper executable('virtfs-proxy-helper',
meson.build +10 -4
@@ -1421,17 +1421,23 @@ if not get_option('dbus_display').disabled() endif endif -have_virtfs = (targetos == 'linux' and +if targetos == 'darwin' and cc.has_function('pthread_fchdir_np') + have_virtfs = have_system +else + have_virtfs = (targetos == 'linux' and have_system and libattr.found() and libcap_ng.found()) +endif -have_virtfs_proxy_helper = have_virtfs and have_tools +have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools if get_option('virtfs').enabled() if not have_virtfs - if targetos != 'linux' - error('virtio-9p (virtfs) requires Linux') + if targetos != 'linux' and targetos != 'darwin' + error('virtio-9p (virtfs) requires Linux or macOS') + elif targetos == 'darwin' and not cc.has_function('pthread_fchdir_np') + error('virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') elif not libcap_ng.found() or not libattr.found() error('virtio-9p (virtfs) requires libcap-ng-devel and libattr-devel') elif not have_system
Signature · 1 line
2.34.1
Hello all,
I'm seeing on the updated release schedule that we're now looking at March 8 for soft feature freeze (
https://wiki.qemu.org/Planning/7.0#Release_Schedule). Is there anything additional that should be prepared for this patch set to hopefully be able to target 7.0?
Will
Quoted 65 lines · Will Cohen
This is a followup to
https://lists.gnu.org/archive/html/qemu-devel/2022-02/msg01506.html,
adding 9p server support for Darwin.Since v5, the following changes have been made to the following patches:
Patch 6/11: 9p: darwin: Move
XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX
- ForP9_XATTR_SIZE_MAX, ensure that Linux usesXATTR_SIZE_MAX, Darwin uses 64k, and error out for undefined hostsPatch 9/11: 9p: darwin: Implement compatibility for mknodat
- Movepthread_fchdir_npdeclaration only to osdep
- Declarepthread_fchdir_npwith __attribute__((weak)) to allow checking for its presence before usage
- Move declarations above cplusplus guardPatch 10/11: 9p: darwin: Adjust assumption on virtio-9p-test (formerly v5 Patch 11/11)
- Move this patch before 9p: darwin: meson patch to avoid qtest breakage during bisectingPatch 11/11: 9p: darwin: meson: Allow VirtFS on Darwin (formerly v5 Patch 10/11)
- Fully adjust meson virtfs error note to specify macOSKeno Fischer (10):
9p: linux: Fix a couple Linux assumptions 9p: Rename 9p-util -> 9p-util-linux
9p: darwin: Handle struct stat(fs) differences 9p: darwin: Handle struct dirent differences 9p: darwin: Ignore O_{NOATIME, DIRECT}
9p: darwin: MoveXATTR_SIZE_MAX->P9_XATTR_SIZE_MAX9p: darwin:*xattr_nofollowimplementations 9p: darwin: Compatibility for f/l*xattr 9p: darwin: Implement compatibility for mknodat 9p: darwin: meson: Allow VirtFS on DarwinWill Cohen (1):
9p: darwin: Adjust assumption on virtio-9p-testfsdev/file-op-9p.h | 9 +++- fsdev/meson.build | 1 + hw/9pfs/9p-local.c | 27 ++++++++--- hw/9pfs/9p-proxy.c | 38 +++++++++++++-- hw/9pfs/9p-synth.c | 6 +++ hw/9pfs/9p-util-darwin.c | 64 ++++++++++++++++++++++++++ hw/9pfs/{9p-util.c => 9p-util-linux.c} | 2 +- hw/9pfs/9p-util.h | 35 ++++++++++++++ hw/9pfs/9p.c | 42 ++++++++++++++--- hw/9pfs/9p.h | 18 ++++++++ hw/9pfs/codir.c | 4 +- hw/9pfs/meson.build | 3 +- include/qemu/osdep.h | 12 +++++ include/qemu/xattr.h | 4 +- meson.build | 14 ++++-- os-posix.c | 35 ++++++++++++++ tests/qtest/virtio-9p-test.c | 2 +- 17 files changed, 291 insertions(+), 25 deletions(-) create mode 100644 hw/9pfs/9p-util-darwin.c rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (97%)--
2.34.1
Quoted 9 lines · On Montag, 14. Februar 2022 21:33:37 CET Will Cohen wrote:
Hello all,
I'm seeing on the updated release schedule that we're now looking at March 8 for soft feature freeze (
https://wiki.qemu.org/Planning/7.0#Release_Schedule). Is there anything additional that should be prepared for this patch set to hopefully be able to target 7.0?Will
That's in three weeks. I'm optimistic that we get this merged before the QEMU 7.0 soft freeze deadline.
Best regards,
Christian Schoenebeck