[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 028/109] virtiofsd: add --fd=FDNUM fd passing option
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH v2 028/109] virtiofsd: add --fd=FDNUM fd passing option |
Date: |
Tue, 21 Jan 2020 12:23:12 +0000 |
From: Stefan Hajnoczi <address@hidden>
Although --socket-path=PATH is useful for manual invocations, management
tools typically create the UNIX domain socket themselves and pass it to
the vhost-user device backend. This way QEMU can be launched
immediately with a valid socket. No waiting for the vhost-user device
backend is required when fd passing is used.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
tools/virtiofsd/fuse_i.h | 1 +
tools/virtiofsd/fuse_lowlevel.c | 14 +++++++++++---
tools/virtiofsd/fuse_virtio.c | 31 +++++++++++++++++++++++++------
3 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h
index 1126723d18..45995f3246 100644
--- a/tools/virtiofsd/fuse_i.h
+++ b/tools/virtiofsd/fuse_i.h
@@ -68,6 +68,7 @@ struct fuse_session {
size_t bufsize;
int error;
char *vu_socket_path;
+ int vu_listen_fd;
int vu_socketfd;
struct fv_VuDev *virtio_dev;
};
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 5c182676a6..db144c3fd6 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2132,6 +2132,7 @@ static const struct fuse_opt fuse_ll_opts[] = {
LL_OPTION("--debug", debug, 1),
LL_OPTION("allow_root", deny_others, 1),
LL_OPTION("--socket-path=%s", vu_socket_path, 0),
+ LL_OPTION("--fd=%d", vu_listen_fd, 0),
FUSE_OPT_END
};
@@ -2151,6 +2152,7 @@ void fuse_lowlevel_help(void)
" -o allow_other allow access by all users\n"
" -o allow_root allow access by root\n"
" --socket-path=PATH path for the vhost-user socket\n"
+ " --fd=FDNUM fd number of vhost-user socket\n"
" -o auto_unmount auto unmount on process
termination\n");
}
@@ -2195,6 +2197,7 @@ struct fuse_session *fuse_session_new(struct fuse_args
*args,
goto out1;
}
se->fd = -1;
+ se->vu_listen_fd = -1;
se->conn.max_write = UINT_MAX;
se->conn.max_readahead = UINT_MAX;
@@ -2230,8 +2233,13 @@ struct fuse_session *fuse_session_new(struct fuse_args
*args,
goto out4;
}
- if (!se->vu_socket_path) {
- fprintf(stderr, "fuse: missing -o vhost_user_socket option\n");
+ if (!se->vu_socket_path && se->vu_listen_fd < 0) {
+ fuse_log(FUSE_LOG_ERR, "fuse: missing --socket-path or --fd option\n");
+ goto out4;
+ }
+ if (se->vu_socket_path && se->vu_listen_fd >= 0) {
+ fuse_log(FUSE_LOG_ERR,
+ "fuse: --socket-path and --fd cannot be given together\n");
goto out4;
}
@@ -2271,7 +2279,7 @@ void fuse_session_unmount(struct fuse_session *se)
int fuse_lowlevel_is_virtio(struct fuse_session *se)
{
- return se->vu_socket_path != NULL;
+ return !!se->virtio_dev;
}
#ifdef linux
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 7e2711b504..635f87756a 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -638,18 +638,21 @@ int virtio_loop(struct fuse_session *se)
return 0;
}
-int virtio_session_mount(struct fuse_session *se)
+static int fv_create_listen_socket(struct fuse_session *se)
{
struct sockaddr_un un;
mode_t old_umask;
+ /* Nothing to do if fd is already initialized */
+ if (se->vu_listen_fd >= 0) {
+ return 0;
+ }
+
if (strlen(se->vu_socket_path) >= sizeof(un.sun_path)) {
fuse_log(FUSE_LOG_ERR, "Socket path too long\n");
return -1;
}
- se->fd = -1;
-
/*
* Create the Unix socket to communicate with qemu
* based on QEMU's vhost-user-bridge
@@ -682,15 +685,31 @@ int virtio_session_mount(struct fuse_session *se)
return -1;
}
+ se->vu_listen_fd = listen_sock;
+ return 0;
+}
+
+int virtio_session_mount(struct fuse_session *se)
+{
+ int ret;
+
+ ret = fv_create_listen_socket(se);
+ if (ret < 0) {
+ return ret;
+ }
+
+ se->fd = -1;
+
fuse_log(FUSE_LOG_INFO, "%s: Waiting for vhost-user socket
connection...\n",
__func__);
- int data_sock = accept(listen_sock, NULL, NULL);
+ int data_sock = accept(se->vu_listen_fd, NULL, NULL);
if (data_sock == -1) {
fuse_log(FUSE_LOG_ERR, "vhost socket accept: %m\n");
- close(listen_sock);
+ close(se->vu_listen_fd);
return -1;
}
- close(listen_sock);
+ close(se->vu_listen_fd);
+ se->vu_listen_fd = -1;
fuse_log(FUSE_LOG_INFO, "%s: Received vhost-user socket connection\n",
__func__);
--
2.24.1
- [PATCH v2 018/109] virtiofsd: Start wiring up vhost-user, (continued)
- [PATCH v2 018/109] virtiofsd: Start wiring up vhost-user, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 020/109] virtiofsd: get/set features callbacks, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 019/109] virtiofsd: Add main virtio loop, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 022/109] virtiofsd: Poll kick_fd for queue, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 021/109] virtiofsd: Start queue threads, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 023/109] virtiofsd: Start reading commands from queue, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 025/109] virtiofsd: Keep track of replies, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 024/109] virtiofsd: Send replies to messages, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 026/109] virtiofsd: Add Makefile wiring for virtiofsd contrib, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 027/109] virtiofsd: Fast path for virtio read, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 028/109] virtiofsd: add --fd=FDNUM fd passing option,
Dr. David Alan Gilbert (git) <=
- [PATCH v2 029/109] virtiofsd: make -f (foreground) the default, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 030/109] virtiofsd: add vhost-user.json file, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 031/109] virtiofsd: add --print-capabilities option, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 033/109] virtiofsd: passthrough_ll: create new files in caller's context, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 032/109] virtiofs: Add maintainers entry, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 034/109] virtiofsd: passthrough_ll: add lo_map for ino/fh indirection, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 035/109] virtiofsd: passthrough_ll: add ino_map to hide lo_inode pointers, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 036/109] virtiofsd: passthrough_ll: add dirp_map to hide lo_dirp pointers, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 037/109] virtiofsd: passthrough_ll: add fd_map to hide file descriptors, Dr. David Alan Gilbert (git), 2020/01/21
- [PATCH v2 038/109] virtiofsd: passthrough_ll: add fallback for racy ops, Dr. David Alan Gilbert (git), 2020/01/21