* [PATCH 01/17] Refactor mount code / move common functions to mount_util.c
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
@ 2026-03-27 1:25 ` Darrick J. Wong
2026-03-27 1:25 ` [PATCH 02/17] mount_service: add systemd/inetd socket service mounting helper Darrick J. Wong
` (15 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:25 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Bernd Schubert <bschubert@ddn.com>
Also create the new "mount_i.h", which is independent of the
the rest of libfuse.
This is preparation for the new mount API, which goes into a new file.
This is to allow fusermount to use the code from mount_fsmount.c.
I.e. avoid code dup and add just re-use the new linux api mount
functions from that file for fusermount.
Signed-off-by: Bernd Schubert <bschubert@ddn.com>
[djwong: extract only the parts we need for mount services]
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
lib/mount_common_i.h | 18 +++++++++++++++++
lib/mount_util.h | 8 ++++++++
lib/mount.c | 53 ++++++++++++++++++++++++++++++++++++--------------
lib/mount_util.c | 9 ++++++++
util/fusermount.c | 5 +----
5 files changed, 74 insertions(+), 19 deletions(-)
create mode 100644 lib/mount_common_i.h
diff --git a/lib/mount_common_i.h b/lib/mount_common_i.h
new file mode 100644
index 00000000000000..6bcb055ff1c23f
--- /dev/null
+++ b/lib/mount_common_i.h
@@ -0,0 +1,18 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
+ * 2026 Bernd Schubert <bernd@bsbernd.com>
+ *
+ * This program can be distributed under the terms of the GNU LGPLv2.
+ * See the file LGPL2.txt
+ */
+
+#ifndef FUSE_MOUNT_COMMON_I_H_
+#define FUSE_MOUNT_COMMON_I_H_
+
+struct mount_opts;
+
+char *fuse_mnt_build_source(const struct mount_opts *mo);
+char *fuse_mnt_build_type(const struct mount_opts *mo);
+
+#endif /* FUSE_MOUNT_COMMON_I_H_ */
diff --git a/lib/mount_util.h b/lib/mount_util.h
index 9cb9077dd17738..b54392abb8b07d 100644
--- a/lib/mount_util.h
+++ b/lib/mount_util.h
@@ -6,6 +6,9 @@
See the file LGPL2.txt.
*/
+#ifndef FUSE_MOUNT_UTIL_H_
+#define FUSE_MOUNT_UTIL_H_
+
#include <sys/types.h>
int fuse_mnt_add_mount(const char *progname, const char *fsname,
@@ -16,3 +19,8 @@ int fuse_mnt_umount(const char *progname, const char *abs_mnt,
char *fuse_mnt_resolve_path(const char *progname, const char *orig);
int fuse_mnt_check_fuseblk(void);
int fuse_mnt_parse_fuse_fd(const char *mountpoint);
+
+/* Helper functions for mount operations */
+const char *fuse_mnt_get_devname(void);
+
+#endif /* FUSE_MOUNT_UTIL_H_ */
diff --git a/lib/mount.c b/lib/mount.c
index 398bf9e7a86743..6cf98a0769ba8c 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -31,6 +31,7 @@
#include <sys/wait.h>
#include "fuse_mount_compat.h"
+#include "mount_common_i.h"
#ifdef __NetBSD__
#include <perfuse.h>
@@ -49,7 +50,6 @@
#define FUSERMOUNT_PROG "fusermount3"
#define FUSE_COMMFD_ENV "_FUSE_COMMFD"
#define FUSE_COMMFD2_ENV "_FUSE_COMMFD2"
-#define FUSE_KERN_DEVICE_ENV "FUSE_KERN_DEVICE"
#ifndef MS_DIRSYNC
#define MS_DIRSYNC 128
@@ -510,7 +510,7 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
const char *mnt_opts)
{
char tmp[128];
- const char *devname = getenv(FUSE_KERN_DEVICE_ENV) ?: "/dev/fuse";
+ const char *devname = fuse_mnt_get_devname();
char *source = NULL;
char *type = NULL;
struct stat stbuf;
@@ -550,24 +550,13 @@ static int fuse_mount_sys(const char *mnt, struct mount_opts *mo,
if (res == -1)
goto out_close;
- source = malloc((mo->fsname ? strlen(mo->fsname) : 0) +
- (mo->subtype ? strlen(mo->subtype) : 0) +
- strlen(devname) + 32);
-
- type = malloc((mo->subtype ? strlen(mo->subtype) : 0) + 32);
+ source = fuse_mnt_build_source(mo);
+ type = fuse_mnt_build_type(mo);
if (!type || !source) {
fuse_log(FUSE_LOG_ERR, "fuse: failed to allocate memory\n");
goto out_close;
}
- strcpy(type, mo->blkdev ? "fuseblk" : "fuse");
- if (mo->subtype) {
- strcat(type, ".");
- strcat(type, mo->subtype);
- }
- strcpy(source,
- mo->fsname ? mo->fsname : (mo->subtype ? mo->subtype : devname));
-
res = mount(source, mnt, type, mo->flags, mo->kernel_opts);
if (res == -1 && errno == ENODEV && mo->subtype) {
/* Probably missing subtype support */
@@ -727,3 +716,37 @@ int fuse_kern_mount(const char *mountpoint, struct mount_opts *mo)
free(mnt_opts);
return res;
}
+
+char *fuse_mnt_build_source(const struct mount_opts *mo)
+{
+ const char *devname = fuse_mnt_get_devname();
+ char *source;
+
+ source = malloc((mo->fsname ? strlen(mo->fsname) : 0) +
+ (mo->subtype ? strlen(mo->subtype) : 0) +
+ strlen(devname) + 32);
+ if (!source)
+ return NULL;
+
+ strcpy(source,
+ mo->fsname ? mo->fsname : (mo->subtype ? mo->subtype : devname));
+
+ return source;
+}
+
+char *fuse_mnt_build_type(const struct mount_opts *mo)
+{
+ char *type;
+
+ type = malloc((mo->subtype ? strlen(mo->subtype) : 0) + 32);
+ if (!type)
+ return NULL;
+
+ strcpy(type, mo->blkdev ? "fuseblk" : "fuse");
+ if (mo->subtype) {
+ strcat(type, ".");
+ strcat(type, mo->subtype);
+ }
+
+ return type;
+}
diff --git a/lib/mount_util.c b/lib/mount_util.c
index 8c0cdf72d978da..ad5354ebc8673c 100644
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -375,3 +375,12 @@ int fuse_mnt_parse_fuse_fd(const char *mountpoint)
return -1;
}
+
+#define FUSE_KERN_DEVICE_ENV "FUSE_KERN_DEVICE"
+
+const char *fuse_mnt_get_devname(void)
+{
+ const char *devname = getenv(FUSE_KERN_DEVICE_ENV);
+
+ return devname ? devname : "/dev/fuse";
+}
diff --git a/util/fusermount.c b/util/fusermount.c
index f17b44f51142c6..6e66bf07300d6d 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -47,9 +47,6 @@
#endif
#define FUSE_COMMFD_ENV "_FUSE_COMMFD"
-#define FUSE_KERN_DEVICE_ENV "FUSE_KERN_DEVICE"
-
-#define FUSE_DEV "/dev/fuse"
static const char *progname;
@@ -1260,7 +1257,7 @@ static int mount_fuse(const char *mnt, const char *opts, const char **type)
{
int res;
int fd;
- const char *dev = getenv(FUSE_KERN_DEVICE_ENV) ?: FUSE_DEV;
+ const char *dev = fuse_mnt_get_devname();
struct stat stbuf;
char *source = NULL;
char *mnt_opts = NULL;
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 02/17] mount_service: add systemd/inetd socket service mounting helper
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
2026-03-27 1:25 ` [PATCH 01/17] Refactor mount code / move common functions to mount_util.c Darrick J. Wong
@ 2026-03-27 1:25 ` Darrick J. Wong
2026-03-30 20:44 ` Bernd Schubert
2026-03-27 1:25 ` [PATCH 03/17] mount_service: create high level fuse helpers Darrick J. Wong
` (14 subsequent siblings)
16 siblings, 1 reply; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:25 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Create a mount helper program that can start a fuse server that runs as
a socket-based systemd service, and a new libfuse module to wrap all the
details of communicating between the mount helper and the containerized
fuse server.
This enables untrusted ext4 mounts via systemd service containers, which
avoids the problem of malicious filesystems compromising the integrity
of the running kernel through memory corruption.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
include/fuse_service.h | 215 +++++
include/fuse_service_priv.h | 127 +++
lib/mount_common_i.h | 3
util/mount_service.h | 32 +
.github/workflows/abicheck.yml | 2
.github/workflows/abicheck_prev_release.yml | 2
.github/workflows/pr-ci.yml | 2
doc/fuservicemount3.8 | 24 +
doc/meson.build | 3
include/meson.build | 4
lib/fuse_service.c | 989 +++++++++++++++++++++++++
lib/fuse_service_stub.c | 96 ++
lib/fuse_versionscript | 16
lib/helper.c | 53 +
lib/meson.build | 16
lib/mount.c | 12
meson.build | 29 +
meson_options.txt | 6
util/fuservicemount.c | 18
util/meson.build | 9
util/mount_service.c | 1088 +++++++++++++++++++++++++++
21 files changed, 2741 insertions(+), 5 deletions(-)
create mode 100644 include/fuse_service.h
create mode 100644 include/fuse_service_priv.h
create mode 100644 util/mount_service.h
create mode 100644 doc/fuservicemount3.8
create mode 100644 lib/fuse_service.c
create mode 100644 lib/fuse_service_stub.c
create mode 100644 util/fuservicemount.c
create mode 100644 util/mount_service.c
diff --git a/include/fuse_service.h b/include/fuse_service.h
new file mode 100644
index 00000000000000..f0a4e63b2f11a7
--- /dev/null
+++ b/include/fuse_service.h
@@ -0,0 +1,215 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * This program can be distributed under the terms of the GNU LGPLv2.
+ * See the file LGPL2.txt.
+ */
+#ifndef FUSE_SERVICE_H_
+#define FUSE_SERVICE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
+
+struct fuse_service;
+
+/**
+ * Accept a socket created by mount.service for information exchange.
+ *
+ * @param sfp pointer to pointer to a service context. The pointer will always
+ * be initialized by this function; use fuse_service_accepted to
+ * find out if the fuse server is actually running as a service.
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_accept(struct fuse_service **sfp);
+
+/**
+ * Has the fuse server accepted a service context?
+ *
+ * @param sf service context
+ * @return true if it has, false if not
+ */
+static inline bool fuse_service_accepted(struct fuse_service *sf)
+{
+ return sf != NULL;
+}
+
+/**
+ * Will the mount service helper accept the allow_other option?
+ *
+ * @param sf service context
+ * @return true if it has, false if not
+ */
+bool fuse_service_can_allow_other(struct fuse_service *sf);
+
+/**
+ * Release all resources associated with the service context.
+ *
+ * @param sfp service context
+ */
+void fuse_service_release(struct fuse_service *sf);
+
+/**
+ * Destroy a service context and release all resources
+ *
+ * @param sfp pointer to pointer to a service context
+ */
+void fuse_service_destroy(struct fuse_service **sfp);
+
+/**
+ * Append the command line arguments from the mount service helper to an
+ * existing fuse_args structure. The fuse_args should have been initialized
+ * with the argc and argv passed to main().
+ *
+ * @param sfp service context
+ * @param args arguments to modify (input+output)
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_append_args(struct fuse_service *sf, struct fuse_args *args);
+
+/**
+ * Generate the effective fuse server command line from the args structure.
+ * The args structure should be the outcome from fuse_service_append_args.
+ * The resulting string is suitable for setproctitle and must be freed by the
+ * callre.
+ *
+ * @param argc argument count passed to main()
+ * @param argv argument vector passed to main()
+ * @param args fuse args structure
+ * @return effective command line string, or NULL
+ */
+char *fuse_service_cmdline(int argc, char *argv[], struct fuse_args *args);
+
+struct fuse_cmdline_opts;
+
+/**
+ * Utility function to parse common options for simple file systems
+ * using the low-level API. A help text that describes the available
+ * options can be printed with `fuse_cmdline_help`. A single
+ * non-option argument is treated as the mountpoint. Multiple
+ * non-option arguments will result in an error.
+ *
+ * If neither -o subtype= or -o fsname= options are given, a new
+ * subtype option will be added and set to the basename of the program
+ * (the fsname will remain unset, and then defaults to "fuse").
+ *
+ * Known options will be removed from *args*, unknown options will
+ * remain. The mountpoint will not be checked here; that is the job of
+ * mount.service.
+ *
+ * @param args argument vector (input+output)
+ * @param opts output argument for parsed options
+ * @return 0 on success, -1 on failure
+ */
+int fuse_service_parse_cmdline_opts(struct fuse_args *args,
+ struct fuse_cmdline_opts *opts);
+
+/**
+ * Ask the mount.service helper to open a file on behalf of the fuse server.
+ *
+ * @param sf service context
+ * @param path the path to file
+ * @param open_flags O_ flags
+ * @param create_mode mode with which to create the file
+ * @param request_flags set of FUSE_SERVICE_REQUEST_* flags
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_request_file(struct fuse_service *sf, const char *path,
+ int open_flags, mode_t create_mode,
+ unsigned int request_flags);
+
+/**
+ * Ask the mount.service helper to open a block device on behalf of the fuse
+ * server.
+ *
+ * @param sf service context
+ * @param path the path to file
+ * @param open_flags O_ flags
+ * @param create_mode mode with which to create the file
+ * @param request_flags set of FUSE_SERVICE_REQUEST_* flags
+ * @param block_size set the block device block size to this value
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_request_blockdev(struct fuse_service *sf, const char *path,
+ int open_flags, mode_t create_mode,
+ unsigned int request_flags,
+ unsigned int block_size);
+
+/**
+ * Receive a file previously requested.
+ *
+ * @param sf service context
+ * @param path to file
+ * @fdp pointer to file descriptor, which will be set a non-negative file
+ * descriptor value on success, or negative errno on failure
+ * @return 0 on success, or negative errno on socket communication failure
+ */
+int fuse_service_receive_file(struct fuse_service *sf,
+ const char *path, int *fdp);
+
+/**
+ * Prevent the mount.service server from sending us any more open files.
+ *
+ * @param sf service context
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_finish_file_requests(struct fuse_service *sf);
+
+/**
+ * Require that the filesystem mount point have the expected file format
+ * (S_IFDIR/S_IFREG). Can be overridden when calling
+ * fuse_service_session_mount.
+ *
+ * @param sf service context
+ * @param expected_fmt expected mode (S_IFDIR/S_IFREG) for mount point, or 0
+ * to skip checks
+ */
+void fuse_service_expect_mount_mode(struct fuse_service *sf,
+ mode_t expected_fmt);
+
+/**
+ * Bind a FUSE file system to the fuse session inside a fuse service process,
+ * then ask the mount.service helper to mount the filesystem for us. The fuse
+ * client will begin sending requests to the fuse server immediately after
+ * this.
+ *
+ * @param sf service context
+ * @param se fuse session
+ * @param expected_fmt expected mode (S_IFDIR/S_IFREG) for mount point, or 0
+ * to skip checks
+ * @param opts command line options
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
+ mode_t expected_fmt,
+ struct fuse_cmdline_opts *opts);
+
+/**
+ * Bid farewell to the mount.service helper. It is still necessary to call
+ * fuse_service_destroy after this.
+ *
+ * @param sf service context
+ * @param exitcode fuse server process exit status
+ * @return 0 on success, or negative errno on failure
+ */
+int fuse_service_send_goodbye(struct fuse_service *sf, int exitcode);
+
+/**
+ * Exit routine for a fuse server running as a systemd service.
+ *
+ * @param ret 0 for success, nonzero for service failure.
+ * @return a value to be passed to exit() or returned from main
+ */
+int fuse_service_exit(int ret);
+
+#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FUSE_SERVICE_H_ */
diff --git a/include/fuse_service_priv.h b/include/fuse_service_priv.h
new file mode 100644
index 00000000000000..d1fdd6221b5268
--- /dev/null
+++ b/include/fuse_service_priv.h
@@ -0,0 +1,127 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * This program can be distributed under the terms of the GNU LGPLv2.
+ * See the file LGPL2.txt.
+ */
+#ifndef FUSE_SERVICE_PRIV_H_
+#define FUSE_SERVICE_PRIV_H_
+
+/* All numeric fields are network order (big-endian) when going across the socket */
+
+struct fuse_service_memfd_arg {
+ uint32_t pos;
+ uint32_t len;
+};
+
+struct fuse_service_memfd_argv {
+ uint32_t magic;
+ uint32_t argc;
+};
+
+#define FUSE_SERVICE_ARGS_MAGIC 0x41524753 /* ARGS */
+
+/* mount.service sends a hello to the server and it replies */
+#define FUSE_SERVICE_HELLO_CMD 0x53414654 /* SAFT */
+#define FUSE_SERVICE_HELLO_REPLY 0x4c415354 /* LAST */
+
+/* fuse servers send commands to mount.service */
+#define FUSE_SERVICE_OPEN_CMD 0x4f50454e /* OPEN */
+#define FUSE_SERVICE_OPEN_BDEV_CMD 0x42444556 /* BDEV */
+#define FUSE_SERVICE_FSOPEN_CMD 0x54595045 /* TYPE */
+#define FUSE_SERVICE_SOURCE_CMD 0x4e414d45 /* NAME */
+#define FUSE_SERVICE_MNTOPTS_CMD 0x4f505453 /* OPTS */
+#define FUSE_SERVICE_MNTPT_CMD 0x4d4e5450 /* MNTP */
+#define FUSE_SERVICE_MOUNT_CMD 0x444f4954 /* DOIT */
+#define FUSE_SERVICE_BYE_CMD 0x42594545 /* BYEE */
+
+/* mount.service sends replies to the fuse server */
+#define FUSE_SERVICE_OPEN_REPLY 0x46494c45 /* FILE */
+#define FUSE_SERVICE_SIMPLE_REPLY 0x5245504c /* REPL */
+
+struct fuse_service_packet {
+ uint32_t magic; /* FUSE_SERVICE_*_{CMD,REPLY} */
+};
+
+#define FUSE_SERVICE_PROTO (1)
+#define FUSE_SERVICE_MIN_PROTO (1)
+#define FUSE_SERVICE_MAX_PROTO (1)
+
+#define FUSE_SERVICE_FLAG_ALLOW_OTHER (1U << 0)
+
+#define FUSE_SERVICE_FLAGS (FUSE_SERVICE_FLAG_ALLOW_OTHER)
+
+struct fuse_service_hello {
+ struct fuse_service_packet p;
+ uint16_t min_version;
+ uint16_t max_version;
+ uint32_t flags;
+};
+
+struct fuse_service_hello_reply {
+ struct fuse_service_packet p;
+ uint16_t version;
+};
+
+struct fuse_service_simple_reply {
+ struct fuse_service_packet p;
+ uint32_t error; /* positive errno */
+};
+
+struct fuse_service_requested_file {
+ struct fuse_service_packet p;
+ uint32_t error; /* positive errno */
+ char path[];
+};
+
+static inline size_t sizeof_fuse_service_requested_file(size_t pathlen)
+{
+ return sizeof(struct fuse_service_requested_file) + pathlen + 1;
+}
+
+#define FUSE_SERVICE_OPEN_FLAGS (0)
+
+struct fuse_service_open_command {
+ struct fuse_service_packet p;
+ uint32_t open_flags;
+ uint32_t create_mode;
+ uint32_t request_flags;
+ uint32_t block_size;
+ char path[];
+};
+
+static inline size_t sizeof_fuse_service_open_command(size_t pathlen)
+{
+ return sizeof(struct fuse_service_open_command) + pathlen + 1;
+}
+
+struct fuse_service_string_command {
+ struct fuse_service_packet p;
+ char value[];
+};
+
+static inline size_t sizeof_fuse_service_string_command(size_t len)
+{
+ return sizeof(struct fuse_service_string_command) + len + 1;
+}
+
+struct fuse_service_bye_command {
+ struct fuse_service_packet p;
+ uint32_t exitcode;
+};
+
+struct fuse_service_mount_command {
+ struct fuse_service_packet p;
+ uint32_t ms_flags;
+ uint16_t expected_fmt;
+};
+
+int fuse_parse_cmdline_service(struct fuse_args *args,
+ struct fuse_cmdline_opts *opts);
+
+#define FUSE_SERVICE_ARGV "argv"
+#define FUSE_SERVICE_FUSEDEV "fusedev"
+
+#endif /* FUSE_SERVICE_PRIV_H_ */
diff --git a/lib/mount_common_i.h b/lib/mount_common_i.h
index 6bcb055ff1c23f..631dff3e6f8aaf 100644
--- a/lib/mount_common_i.h
+++ b/lib/mount_common_i.h
@@ -14,5 +14,8 @@ struct mount_opts;
char *fuse_mnt_build_source(const struct mount_opts *mo);
char *fuse_mnt_build_type(const struct mount_opts *mo);
+char *fuse_mnt_kernel_opts(const struct mount_opts *mo);
+unsigned int fuse_mnt_flags(const struct mount_opts *mo);
+
#endif /* FUSE_MOUNT_COMMON_I_H_ */
diff --git a/util/mount_service.h b/util/mount_service.h
new file mode 100644
index 00000000000000..2b670c5569aa88
--- /dev/null
+++ b/util/mount_service.h
@@ -0,0 +1,32 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ */
+#ifndef MOUNT_SERVICE_H_
+#define MOUNT_SERVICE_H_
+
+/**
+ * Connect to a fuse service socket and try to mount the filesystem as
+ * specified with the CLI arguments.
+ *
+ * @argc argument count
+ * @argv vector of argument strings
+ * @return EXIT_SUCCESS for success, EXIT_FAILURE if mount fails
+ */
+int mount_service_main(int argc, char *argv[]);
+
+/**
+ * Return the fuse filesystem subtype from a full fuse filesystem type
+ * specification. IOWs, fuse.Y -> Y; fuseblk.Z -> Z; or A -> A. The returned
+ * pointer is within the caller's string.
+ *
+ * @param fstype full fuse filesystem type
+ * @return fuse subtype
+ */
+const char *mount_service_subtype(const char *fstype);
+
+#endif /* MOUNT_SERVICE_H_ */
diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index b4bcdad08bd4b7..872d0455cffd93 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -26,7 +26,7 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update
- sudo apt-get -y install abigail-tools clang gcc liburing-dev libnuma-dev
+ sudo apt-get -y install abigail-tools clang gcc liburing-dev libnuma-dev libsystemd-dev systemd-dev
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
diff --git a/.github/workflows/abicheck_prev_release.yml b/.github/workflows/abicheck_prev_release.yml
index d619806613deb9..8545b3a85776ef 100644
--- a/.github/workflows/abicheck_prev_release.yml
+++ b/.github/workflows/abicheck_prev_release.yml
@@ -26,7 +26,7 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update
- sudo apt-get -y install abigail-tools clang gcc liburing-dev libnuma-dev
+ sudo apt-get -y install abigail-tools clang gcc liburing-dev libnuma-dev libsystemd-dev systemd-dev
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index 9f7bef9f1c0d24..0cd8c741544e7d 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -32,7 +32,7 @@ jobs:
sudo apt-get install -y clang doxygen gcc gcc-10 gcc-9 valgrind \
gcc-multilib g++-multilib libc6-dev-i386 \
libpcap0.8-dev:i386 libudev-dev:i386 pkg-config:i386 \
- liburing-dev libnuma-dev
+ liburing-dev libnuma-dev libsystemd-dev systemd-dev
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/setup-python@v6
with:
diff --git a/doc/fuservicemount3.8 b/doc/fuservicemount3.8
new file mode 100644
index 00000000000000..e45d6a89c8b81a
--- /dev/null
+++ b/doc/fuservicemount3.8
@@ -0,0 +1,24 @@
+.TH fuservicemount3 "8"
+.SH NAME
+fuservicemount3 \- mount a FUSE filesystem that runs as a system socket service
+.SH SYNOPSIS
+.B fuservicemount3
+.B source
+.B mountpoint
+.BI -t " fstype"
+[
+.I options
+]
+.SH DESCRIPTION
+Mount a filesystem using a FUSE server that runs as a socket service.
+These servers can be contained using the platform's service management
+framework.
+.SH "AUTHORS"
+.LP
+The author of the fuse socket service code is Darrick J. Wong <djwong@kernel.org>.
+Debian GNU/Linux distribution.
+.SH SEE ALSO
+.BR fusermount3 (1)
+.BR fusermount (1)
+.BR mount (8)
+.BR fuse (4)
diff --git a/doc/meson.build b/doc/meson.build
index db3e0b26f71975..c105cf3471fdf4 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -2,3 +2,6 @@ if not platform.endswith('bsd') and platform != 'dragonfly'
install_man('fusermount3.1', 'mount.fuse3.8')
endif
+if private_cfg.get('HAVE_SERVICEMOUNT', false)
+ install_man('fuservicemount3.8')
+endif
diff --git a/include/meson.build b/include/meson.build
index bf671977a5a6a9..da51180f87eea2 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,4 +1,8 @@
libfuse_headers = [ 'fuse.h', 'fuse_common.h', 'fuse_lowlevel.h',
'fuse_opt.h', 'cuse_lowlevel.h', 'fuse_log.h' ]
+if private_cfg.get('HAVE_SERVICEMOUNT', false)
+ libfuse_headers += [ 'fuse_service.h' ]
+endif
+
install_headers(libfuse_headers, subdir: 'fuse3')
diff --git a/lib/fuse_service.c b/lib/fuse_service.c
new file mode 100644
index 00000000000000..795453693da09b
--- /dev/null
+++ b/lib/fuse_service.c
@@ -0,0 +1,989 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * Library functions to support fuse servers that can be run as "safe" systemd
+ * containers.
+ *
+ * This program can be distributed under the terms of the GNU LGPLv2.
+ * See the file LGPL2.txt
+ */
+
+#define _GNU_SOURCE
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <systemd/sd-daemon.h>
+#include <arpa/inet.h>
+
+#include "fuse_config.h"
+#include "fuse_i.h"
+#include "fuse_service_priv.h"
+#include "fuse_service.h"
+#include "mount_common_i.h"
+
+struct fuse_service {
+ /* expected file format of the mount point */
+ mode_t expected_fmt;
+
+ /* socket fd */
+ int sockfd;
+
+ /* /dev/fuse device */
+ int fusedevfd;
+
+ /* memfd for cli arguments */
+ int argvfd;
+
+ /* do we own fusedevfd? */
+ bool owns_fusedevfd;
+
+ /* can we use allow_other? */
+ bool allow_other;
+};
+
+static int __recv_fd(int sockfd, struct fuse_service_requested_file *buf,
+ ssize_t bufsize, int *fdp)
+{
+ struct iovec iov = {
+ .iov_base = buf,
+ .iov_len = bufsize,
+ };
+ union {
+ struct cmsghdr cmsghdr;
+ char control[CMSG_SPACE(sizeof(int))];
+ } cmsgu;
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = cmsgu.control,
+ .msg_controllen = sizeof(cmsgu.control),
+ };
+ struct cmsghdr *cmsg;
+ ssize_t size;
+
+ memset(&cmsgu, 0, sizeof(cmsgu));
+
+ size = recvmsg(sockfd, &msg, MSG_TRUNC);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service file reply: %s\n",
+ strerror(error));
+ return -error;
+ }
+ if (size > bufsize ||
+ size < offsetof(struct fuse_service_requested_file, path)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: wrong service file reply size %zd, expected %zd\n",
+ size, bufsize);
+ return -EBADMSG;
+ }
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ if (!cmsg) {
+ /* no control message means mount.service sent us an error */
+ return 0;
+ }
+ if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) {
+ fuse_log(FUSE_LOG_ERR,
+ "fuse: wrong service file reply control data size %zd, expected %zd\n",
+ cmsg->cmsg_len, CMSG_LEN(sizeof(int)));
+ return -EBADMSG;
+ }
+ if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
+ fuse_log(FUSE_LOG_ERR,
+"fuse: wrong service file reply control data level %d type %d, expected %d and %d\n",
+ cmsg->cmsg_level, cmsg->cmsg_type, SOL_SOCKET,
+ SCM_RIGHTS);
+ return -EBADMSG;
+ }
+
+ memcpy(fdp, (int *)CMSG_DATA(cmsg), sizeof(int));
+ return 0;
+}
+
+static int recv_requested_file(int sockfd, const char *path, int *fdp)
+{
+ struct fuse_service_requested_file *req;
+ const size_t req_sz = sizeof_fuse_service_requested_file(strlen(path));
+ int fd = -ENOENT;
+ int ret;
+
+ *fdp = -ENOENT;
+
+ req = calloc(1, req_sz + 1);
+ if (!req) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: alloc service file reply: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ ret = __recv_fd(sockfd, req, req_sz, &fd);
+ if (ret)
+ goto out_req;
+
+ if (req->p.magic != ntohl(FUSE_SERVICE_OPEN_REPLY)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service file reply contains wrong magic!\n");
+ ret = -EBADMSG;
+ goto out_close;
+ }
+ if (strcmp(req->path, path)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: `%s': not the requested service file, got `%s'\n",
+ path, req->path);
+ ret = -EBADMSG;
+ goto out_close;
+ }
+
+ if (req->error) {
+ *fdp = -ntohl(req->error);
+ goto out_close;
+ }
+
+ if (fd == -ENOENT)
+ fuse_log(FUSE_LOG_ERR, "fuse: did not receive `%s' but no error?\n",
+ path);
+
+ *fdp = fd;
+ goto out_req;
+
+out_close:
+ close(fd);
+out_req:
+ free(req);
+ return ret;
+}
+
+int fuse_service_receive_file(struct fuse_service *sf, const char *path,
+ int *fdp)
+{
+ return recv_requested_file(sf->sockfd, path, fdp);
+}
+
+#define FUSE_SERVICE_REQUEST_FILE_FLAGS (0)
+
+static int fuse_service_request_path(struct fuse_service *sf, const char *path,
+ mode_t expected_fmt, int open_flags,
+ mode_t create_mode,
+ unsigned int request_flags,
+ unsigned int block_size)
+{
+ struct iovec iov = {
+ .iov_len = sizeof_fuse_service_open_command(strlen(path)),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ struct fuse_service_open_command *cmd;
+ ssize_t size;
+ unsigned int rqflags = 0;
+ int ret;
+
+ if (request_flags & ~FUSE_SERVICE_REQUEST_FILE_FLAGS) {
+ fuse_log(FUSE_LOG_ERR, "fuse: invalid fuse service file request flags 0x%x\n",
+ request_flags);
+ return -EINVAL;
+ }
+
+ cmd = calloc(1, iov.iov_len);
+ if (!cmd) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: alloc service file request: %s\n",
+ strerror(error));
+ return -error;
+ }
+ if (S_ISBLK(expected_fmt)) {
+ cmd->p.magic = htonl(FUSE_SERVICE_OPEN_BDEV_CMD);
+ cmd->block_size = htonl(block_size);
+ } else {
+ cmd->p.magic = htonl(FUSE_SERVICE_OPEN_CMD);
+ }
+ cmd->open_flags = htonl(open_flags);
+ cmd->create_mode = htonl(create_mode);
+ cmd->request_flags = htonl(rqflags);
+ strcpy(cmd->path, path);
+ iov.iov_base = cmd;
+
+ size = sendmsg(sf->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: request service file: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_free;
+ }
+
+ ret = 0;
+out_free:
+ free(cmd);
+ return ret;
+}
+
+int fuse_service_request_file(struct fuse_service *sf, const char *path,
+ int open_flags, mode_t create_mode,
+ unsigned int request_flags)
+{
+ return fuse_service_request_path(sf, path, S_IFREG, open_flags,
+ create_mode, request_flags, 0);
+}
+
+int fuse_service_request_blockdev(struct fuse_service *sf, const char *path,
+ int open_flags, mode_t create_mode,
+ unsigned int request_flags,
+ unsigned int block_size)
+{
+ return fuse_service_request_path(sf, path, S_IFBLK, open_flags,
+ create_mode, request_flags,
+ block_size);
+}
+
+int fuse_service_send_goodbye(struct fuse_service *sf, int exitcode)
+{
+ struct fuse_service_bye_command c = {
+ .p.magic = htonl(FUSE_SERVICE_BYE_CMD),
+ .exitcode = htonl(exitcode),
+ };
+ struct iovec iov = {
+ .iov_base = &c,
+ .iov_len = sizeof(c),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ ssize_t size;
+
+ /* already gone? */
+ if (sf->sockfd < 0)
+ return 0;
+
+ size = sendmsg(sf->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: send service goodbye: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ shutdown(sf->sockfd, SHUT_RDWR);
+ close(sf->sockfd);
+ sf->sockfd = -1;
+ return 0;
+}
+
+static int find_socket_fd(void)
+{
+ struct stat statbuf;
+ struct sockaddr_un urk;
+ char *listen_fds;
+ socklen_t urklen = sizeof(urk);
+ int nr_fds;
+ int ret;
+
+ /*
+ * No environment variable means we're not running as a system socket
+ * service, so we'll back out without logging anything.
+ */
+ listen_fds = getenv("LISTEN_FDS");
+ if (!listen_fds)
+ return -ENOENT;
+
+ nr_fds = atoi(listen_fds);
+ if (nr_fds != 1) {
+ fuse_log(FUSE_LOG_ERR, "fuse: can only handle 1 service socket, got %d.\n",
+ nr_fds);
+ return -E2BIG;
+ }
+
+ ret = fstat(SD_LISTEN_FDS_START, &statbuf);
+ if (ret) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service socket: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ if (!S_ISSOCK(statbuf.st_mode)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: expected service fd %d to be a socket\n",
+ SD_LISTEN_FDS_START);
+ return -ENOTSOCK;
+ }
+
+ ret = getsockname(SD_LISTEN_FDS_START, &urk, &urklen);
+ if (ret < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service socket family: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ if (ret > 0 || urk.sun_family != AF_UNIX) {
+ /*
+ * If getsockname wanted to return more data than fits in a
+ * sockaddr_un, then it's obviously not an AF_UNIX socket.
+ *
+ * If it filled the buffer exactly but the family isn't AF_UNIX
+ * then we also return false.
+ */
+ fuse_log(FUSE_LOG_ERR, "fuse: service socket is not AF_UNIX\n");
+ return -EAFNOSUPPORT;
+ }
+
+ return SD_LISTEN_FDS_START;
+}
+
+static int negotiate_hello(struct fuse_service *sf)
+{
+ struct fuse_service_hello hello = { };
+ struct fuse_service_hello_reply reply = {
+ .p.magic = htonl(FUSE_SERVICE_HELLO_REPLY),
+ .version = htons(FUSE_SERVICE_PROTO),
+ };
+ struct iovec iov = {
+ .iov_base = &hello,
+ .iov_len = sizeof(hello),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ uint64_t flags;
+ ssize_t size;
+
+ size = recvmsg(sf->sockfd, &msg, MSG_TRUNC);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: receive service hello: %s\n",
+ strerror(error));
+ return -error;
+ }
+ if (size != sizeof(hello)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: wrong service hello size %zd, expected %zd\n",
+ size, sizeof(hello));
+ return -EBADMSG;
+ }
+
+ if (hello.p.magic != ntohl(FUSE_SERVICE_HELLO_CMD)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service server did not send hello command\n");
+ return -EBADMSG;
+ }
+
+ if (ntohs(hello.min_version) < FUSE_SERVICE_MIN_PROTO) {
+ fuse_log(FUSE_LOG_ERR, "fuse: unsupported min service protocol version %u\n",
+ ntohs(hello.min_version));
+ return -EOPNOTSUPP;
+ }
+
+ if (ntohs(hello.max_version) > FUSE_SERVICE_MAX_PROTO) {
+ fuse_log(FUSE_LOG_ERR, "fuse: unsupported max service protocol version %u\n",
+ ntohs(hello.min_version));
+ return -EOPNOTSUPP;
+ }
+
+ flags = ntohl(hello.flags);
+ if (flags & FUSE_SERVICE_FLAG_ALLOW_OTHER)
+ sf->allow_other = true;
+
+ iov.iov_base = &reply;
+ iov.iov_len = sizeof(reply);
+
+ size = sendmsg(sf->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service hello reply: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ return 0;
+}
+
+int fuse_service_accept(struct fuse_service **sfp)
+{
+ struct fuse_service *sf;
+ int ret = 0;
+
+ *sfp = NULL;
+
+ sf = calloc(1, sizeof(struct fuse_service));
+ if (!sf) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service alloc: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ /* Find the socket that connects us to mount.service */
+ ret = find_socket_fd();
+ if (ret == -ENOENT) {
+ /*
+ * No socket found, so we're not running as a service. Don't
+ * fail the request, but leave *sfp set to NULL.
+ */
+ ret = 0;
+ goto out_sf;
+ }
+ if (ret < 0)
+ goto out_sf;
+ sf->sockfd = ret;
+
+ ret = negotiate_hello(sf);
+ if (ret)
+ goto out_sf;
+
+ /* Receive the two critical sockets */
+ ret = recv_requested_file(sf->sockfd, FUSE_SERVICE_ARGV, &sf->argvfd);
+ if (ret < 0)
+ goto out_sockfd;
+ if (sf->argvfd < 0) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service mount options file: %s\n",
+ strerror(-sf->argvfd));
+ ret = sf->argvfd;
+ goto out_sockfd;
+ }
+
+ ret = recv_requested_file(sf->sockfd, FUSE_SERVICE_FUSEDEV,
+ &sf->fusedevfd);
+ if (ret < 0)
+ goto out_argvfd;
+ if (sf->fusedevfd < 0) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service fuse device: %s\n",
+ strerror(-sf->argvfd));
+ ret = sf->argvfd;
+ goto out_argvfd;
+ }
+
+ sf->owns_fusedevfd = true;
+ *sfp = sf;
+ return 0;
+
+out_argvfd:
+ close(sf->argvfd);
+out_sockfd:
+ shutdown(sf->sockfd, SHUT_RDWR);
+ close(sf->sockfd);
+out_sf:
+ free(sf);
+ return ret;
+}
+
+bool fuse_service_can_allow_other(struct fuse_service *sf)
+{
+ return sf->allow_other;
+}
+
+int fuse_service_append_args(struct fuse_service *sf,
+ struct fuse_args *existing_args)
+{
+ struct fuse_service_memfd_argv memfd_args = { };
+ struct fuse_args new_args = {
+ .allocated = 1,
+ };
+ char *str = NULL;
+ off_t memfd_pos = 0;
+ ssize_t received;
+ unsigned int i;
+ int ret;
+
+ /* Figure out how many arguments we're getting from the mount helper. */
+ received = pread(sf->argvfd, &memfd_args, sizeof(memfd_args), 0);
+ if (received < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service args file: %s\n",
+ strerror(error));
+ return -error;
+ }
+ if (received < sizeof(memfd_args)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service args file length unreadable\n");
+ return -EBADMSG;
+ }
+ if (ntohl(memfd_args.magic) != FUSE_SERVICE_ARGS_MAGIC) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service args file corrupt\n");
+ return -EBADMSG;
+ }
+ memfd_args.magic = ntohl(memfd_args.magic);
+ memfd_args.argc = ntohl(memfd_args.argc);
+ memfd_pos += sizeof(memfd_args);
+
+ /* Allocate a new array of argv string pointers */
+ new_args.argv = calloc(memfd_args.argc + existing_args->argc,
+ sizeof(char *));
+ if (!new_args.argv) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service new args: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ /*
+ * Copy the fuse server's CLI arguments. We'll leave new_args.argv[0]
+ * unset for now, because we'll set it in the next step with the fstype
+ * that the mount helper sent us.
+ */
+ new_args.argc++;
+ for (i = 1; i < existing_args->argc; i++) {
+ if (existing_args->allocated) {
+ new_args.argv[new_args.argc] = existing_args->argv[i];
+ existing_args->argv[i] = NULL;
+ } else {
+ char *dup = strdup(existing_args->argv[i]);
+
+ if (!dup) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR,
+ "fuse: service duplicate existing args: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_new_args;
+ }
+
+ new_args.argv[new_args.argc] = dup;
+ }
+
+ new_args.argc++;
+ }
+
+ /* Copy the rest of the arguments from the helper */
+ for (i = 0; i < memfd_args.argc; i++) {
+ struct fuse_service_memfd_arg memfd_arg = { };
+
+ /* Read argv iovec */
+ received = pread(sf->argvfd, &memfd_arg, sizeof(memfd_arg),
+ memfd_pos);
+ if (received < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service args file iovec read: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_new_args;
+ }
+ if (received < sizeof(struct fuse_service_memfd_arg)) {
+ fuse_log(FUSE_LOG_ERR,
+ "fuse: service args file argv[%u] iovec short read %zd",
+ i, received);
+ ret = -EBADMSG;
+ goto out_new_args;
+ }
+ memfd_arg.pos = ntohl(memfd_arg.pos);
+ memfd_arg.len = ntohl(memfd_arg.len);
+ memfd_pos += sizeof(memfd_arg);
+
+ /* read arg string from file */
+ str = calloc(1, memfd_arg.len + 1);
+ if (!str) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service arg alloc: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_new_args;
+ }
+
+ received = pread(sf->argvfd, str, memfd_arg.len, memfd_arg.pos);
+ if (received < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service args file read: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_str;
+ }
+ if (received < memfd_arg.len) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service args file argv[%u] short read %zd",
+ i, received);
+ ret = -EBADMSG;
+ goto out_str;
+ }
+
+ /* move string into the args structure */
+ if (i == 0) {
+ /* the first argument is the fs type */
+ new_args.argv[0] = str;
+ } else {
+ new_args.argv[new_args.argc] = str;
+ new_args.argc++;
+ }
+ str = NULL;
+ }
+
+ /* drop existing args, move new args to existing args */
+ fuse_opt_free_args(existing_args);
+ memcpy(existing_args, &new_args, sizeof(*existing_args));
+
+ close(sf->argvfd);
+ sf->argvfd = -1;
+
+ return 0;
+
+out_str:
+ free(str);
+out_new_args:
+ fuse_opt_free_args(&new_args);
+ return ret;
+}
+
+#ifdef SO_PASSRIGHTS
+int fuse_service_finish_file_requests(struct fuse_service *sf)
+{
+ int zero = 0;
+ int ret;
+
+ /*
+ * Don't let a malicious mount helper send us more fds. If the kernel
+ * doesn't know about this new(ish) option that's ok, we'll trust the
+ * servicemount helper.
+ */
+ ret = setsockopt(sf->sockfd, SOL_SOCKET, SO_PASSRIGHTS, &zero,
+ sizeof(zero));
+ if (ret && errno == ENOPROTOOPT)
+ ret = 0;
+ if (ret) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: disabling fd passing: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ return 0;
+}
+#else
+int fuse_service_finish_file_requests(struct fuse_service *sf)
+{
+ (void)sf;
+ return 0;
+}
+#endif
+
+static int send_string(struct fuse_service *sf, uint32_t command,
+ const char *value, int *error)
+{
+ struct fuse_service_simple_reply reply = { };
+ struct iovec iov = {
+ .iov_len = sizeof_fuse_service_string_command(strlen(value)),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ struct fuse_service_string_command *cmd;
+ ssize_t size;
+
+ cmd = malloc(iov.iov_len);
+ if (!cmd) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: alloc service string send: %s\n",
+ strerror(error));
+ return -error;
+ }
+ cmd->p.magic = ntohl(command);
+ strcpy(cmd->value, value);
+ iov.iov_base = cmd;
+
+ size = sendmsg(sf->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: send service string: %s\n",
+ strerror(error));
+ return -error;
+ }
+ free(cmd);
+
+ iov.iov_base = &reply;
+ iov.iov_len = sizeof(reply);
+ size = recvmsg(sf->sockfd, &msg, MSG_TRUNC);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service string reply: %s\n",
+ strerror(error));
+ return -error;
+ }
+ if (size != sizeof(reply)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: wrong service string reply size %zd, expected %zd\n",
+ size, sizeof(reply));
+ return -EBADMSG;
+ }
+
+ if (ntohl(reply.p.magic) != FUSE_SERVICE_SIMPLE_REPLY) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service string reply contains wrong magic!\n");
+ return -EBADMSG;
+ }
+
+ *error = ntohl(reply.error);
+ return 0;
+}
+
+static int send_mount(struct fuse_service *sf, unsigned int ms_flags,
+ mode_t expected_fmt, int *error)
+{
+ struct fuse_service_simple_reply reply = { };
+ struct fuse_service_mount_command c = {
+ .p.magic = htonl(FUSE_SERVICE_MOUNT_CMD),
+ .ms_flags = htonl(ms_flags),
+ .expected_fmt = htons(expected_fmt),
+ };
+ struct iovec iov = {
+ .iov_base = &c,
+ .iov_len = sizeof(c),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ ssize_t size;
+
+ size = sendmsg(sf->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: send service mount command: %s\n",
+ strerror(error));
+ return -error;
+ }
+
+ iov.iov_base = &reply;
+ iov.iov_len = sizeof(reply);
+ size = recvmsg(sf->sockfd, &msg, MSG_TRUNC);
+ if (size < 0) {
+ int error = errno;
+
+ fuse_log(FUSE_LOG_ERR, "fuse: service mount reply: %s\n",
+ strerror(error));
+ return -error;
+ }
+ if (size != sizeof(reply)) {
+ fuse_log(FUSE_LOG_ERR, "fuse: wrong service mount reply size %zd, expected %zd\n",
+ size, sizeof(reply));
+ return -EBADMSG;
+ }
+
+ if (ntohl(reply.p.magic) != FUSE_SERVICE_SIMPLE_REPLY) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service mount reply contains wrong magic!\n");
+ return -EBADMSG;
+ }
+
+ *error = ntohl(reply.error);
+ return 0;
+}
+
+void fuse_service_expect_mount_mode(struct fuse_service *sf,
+ mode_t expected_fmt)
+{
+ sf->expected_fmt = expected_fmt;
+}
+
+int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
+ mode_t expected_fmt,
+ struct fuse_cmdline_opts *opts)
+{
+ char *fstype = fuse_mnt_build_type(se->mo);
+ char *source = fuse_mnt_build_source(se->mo);
+ char *mntopts = fuse_mnt_kernel_opts(se->mo);
+ char path[32];
+ int ret;
+ int error;
+
+ if (!fstype || !source) {
+ fuse_log(FUSE_LOG_ERR, "fuse: cannot allocate service strings\n");
+ ret = -ENOMEM;
+ goto out_strings;
+ }
+
+ if (!expected_fmt)
+ expected_fmt = sf->expected_fmt;
+
+ /* The fuse session takes the fusedev fd if this succeeds */
+ snprintf(path, sizeof(path), "/dev/fd/%d", sf->fusedevfd);
+ errno = 0;
+ ret = fuse_session_mount(se, path);
+ if (ret) {
+ /* Try to return richer errors than fuse_session_mount's -1 */
+ ret = errno ? -errno : -EINVAL;
+ goto out_strings;
+ }
+ sf->owns_fusedevfd = false;
+
+ ret = send_string(sf, FUSE_SERVICE_FSOPEN_CMD, fstype, &error);
+ if (ret)
+ goto out_strings;
+ if (error) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service fsopen: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_strings;
+ }
+
+ ret = send_string(sf, FUSE_SERVICE_SOURCE_CMD, source, &error);
+ if (ret)
+ goto out_strings;
+ if (error) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service fs source: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_strings;
+ }
+
+ ret = send_string(sf, FUSE_SERVICE_MNTPT_CMD, opts->mountpoint, &error);
+ if (ret)
+ goto out_strings;
+ if (error) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service fs mountpoint: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_strings;
+ }
+
+ if (mntopts) {
+ ret = send_string(sf, FUSE_SERVICE_MNTOPTS_CMD, mntopts,
+ &error);
+ if (ret)
+ goto out_strings;
+ if (error) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service fs mount options: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_strings;
+ }
+ }
+
+ ret = send_mount(sf, fuse_mnt_flags(se->mo), expected_fmt, &error);
+ if (ret)
+ goto out_strings;
+ if (error) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service mount: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_strings;
+ }
+
+ /*
+ * foreground mode is needed so that systemd actually tracks the
+ * service correctly and doesn't try to kill it; and so that
+ * stdout/stderr don't get zapped
+ */
+ opts->foreground = 1;
+
+out_strings:
+ free(mntopts);
+ free(source);
+ free(fstype);
+ return ret;
+}
+
+void fuse_service_release(struct fuse_service *sf)
+{
+ if (sf->owns_fusedevfd)
+ close(sf->fusedevfd);
+ sf->owns_fusedevfd = false;
+ sf->fusedevfd = -1;
+ close(sf->argvfd);
+ sf->argvfd = -1;
+ shutdown(sf->sockfd, SHUT_RDWR);
+ close(sf->sockfd);
+ sf->sockfd = -1;
+}
+
+void fuse_service_destroy(struct fuse_service **sfp)
+{
+ struct fuse_service *sf = *sfp;
+
+ if (sf) {
+ fuse_service_release(*sfp);
+ free(sf);
+ }
+
+ *sfp = NULL;
+}
+
+char *fuse_service_cmdline(int argc, char *argv[], struct fuse_args *args)
+{
+ char *p, *dst;
+ size_t len = 1;
+ ssize_t ret;
+ char *argv0;
+ unsigned int i;
+
+ /* Try to preserve argv[0] */
+ if (argc > 0)
+ argv0 = argv[0];
+ else if (args->argc > 0)
+ argv0 = args->argv[0];
+ else
+ return NULL;
+
+ /* Pick up the alleged fstype from args->argv[0] */
+ if (args->argc == 0)
+ return NULL;
+
+ len += strlen(argv0) + 1;
+ len += 3; /* " -t" */
+ for (i = 0; i < args->argc; i++)
+ len += strlen(args->argv[i]) + 1;
+
+ p = malloc(len);
+ if (!p)
+ return NULL;
+ dst = p;
+
+ /* Format: argv0 -t alleged_fstype [all other options...] */
+ ret = sprintf(dst, "%s -t", argv0);
+ dst += ret;
+ for (i = 0; i < args->argc; i++) {
+ ret = sprintf(dst, " %s", args->argv[i]);
+ dst += ret;
+ }
+
+ return p;
+}
+
+int fuse_service_parse_cmdline_opts(struct fuse_args *args,
+ struct fuse_cmdline_opts *opts)
+{
+ return fuse_parse_cmdline_service(args, opts);
+}
+
+int fuse_service_exit(int ret)
+{
+ /*
+ * We have to sleep 2 seconds here because journald uses the pid to
+ * connect our log messages to the systemd service. This is critical
+ * for capturing all the log messages if the service fails, because
+ * failure analysis tools use the service name to gather log messages
+ * for reporting.
+ */
+ sleep(2);
+
+ /*
+ * If we're being run as a service, the return code must fit the LSB
+ * init script action error guidelines, which is to say that we
+ * compress all errors to 1 ("generic or unspecified error", LSB 5.0
+ * section 22.2) and hope the admin will scan the log for what actually
+ * happened.
+ */
+ return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/lib/fuse_service_stub.c b/lib/fuse_service_stub.c
new file mode 100644
index 00000000000000..bb816844c033f0
--- /dev/null
+++ b/lib/fuse_service_stub.c
@@ -0,0 +1,96 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * Stub functions for platforms where we cannot have fuse servers run as "safe"
+ * systemd containers.
+ *
+ * This program can be distributed under the terms of the GNU LGPLv2.
+ * See the file LGPL2.txt
+ */
+
+/* we don't use any parameters at all */
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
+#define _GNU_SOURCE
+#include <errno.h>
+
+#include "fuse_config.h"
+#include "fuse_i.h"
+#include "fuse_service.h"
+
+int fuse_service_receive_file(struct fuse_service *sf, const char *path,
+ int *fdp)
+{
+ return -EOPNOTSUPP;
+}
+
+int fuse_service_request_file(struct fuse_service *sf, const char *path,
+ int open_flags, mode_t create_mode,
+ unsigned int request_flags)
+{
+ return -EOPNOTSUPP;
+}
+
+int fuse_service_request_blockdev(struct fuse_service *sf, const char *path,
+ int open_flags, mode_t create_mode,
+ unsigned int request_flags,
+ unsigned int block_size)
+{
+ return -EOPNOTSUPP;
+}
+
+int fuse_service_send_goodbye(struct fuse_service *sf, int error)
+{
+ return -EOPNOTSUPP;
+}
+
+int fuse_service_accept(struct fuse_service **sfp)
+{
+ *sfp = NULL;
+ return -EOPNOTSUPP;
+}
+
+int fuse_service_append_args(struct fuse_service *sf,
+ struct fuse_args *existing_args)
+{
+ return -EOPNOTSUPP;
+}
+
+int fuse_service_finish_file_requests(struct fuse_service *sf)
+{
+ return -EOPNOTSUPP;
+}
+
+void fuse_service_expect_mount_mode(struct fuse_service *sf,
+ mode_t expected_fmt)
+{
+}
+
+int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
+ mode_t expected_fmt,
+ struct fuse_cmdline_opts *opts)
+{
+ return -EOPNOTSUPP;
+}
+
+void fuse_service_release(struct fuse_service *sf)
+{
+}
+
+void fuse_service_destroy(struct fuse_service **sfp)
+{
+ *sfp = NULL;
+}
+
+int fuse_service_parse_cmdline_opts(struct fuse_args *args,
+ struct fuse_cmdline_opts *opts)
+{
+ return -1;
+}
+
+int fuse_service_exit(int ret)
+{
+ return ret;
+}
diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index cce09610316f4b..1fc73f417f90a0 100644
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -227,6 +227,22 @@ FUSE_3.19 {
fuse_session_start_teardown_watchdog;
fuse_session_stop_teardown_watchdog;
fuse_lowlevel_notify_prune;
+
+ fuse_service_accept;
+ fuse_service_append_args;
+ fuse_service_can_allow_other;
+ fuse_service_cmdline;
+ fuse_service_destroy;
+ fuse_service_exit;
+ fuse_service_expect_mount_mode;
+ fuse_service_finish_file_requests;
+ fuse_service_parse_cmdline_opts;
+ fuse_service_receive_file;
+ fuse_service_release;
+ fuse_service_request_file;
+ fuse_service_request_blockdev;
+ fuse_service_send_goodbye;
+ fuse_service_session_mount;
} FUSE_3.18;
# Local Variables:
diff --git a/lib/helper.c b/lib/helper.c
index 5c13b93a473181..533526273207d5 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -26,6 +26,11 @@
#include <errno.h>
#include <sys/param.h>
+#ifdef HAVE_SERVICEMOUNT
+# include <linux/types.h>
+# include "fuse_service_priv.h"
+#endif
+
#define FUSE_HELPER_OPT(t, p) \
{ t, offsetof(struct fuse_cmdline_opts, p), 1 }
@@ -174,6 +179,27 @@ static int fuse_helper_opt_proc(void *data, const char *arg, int key,
}
}
+#ifdef HAVE_SERVICEMOUNT
+static int fuse_helper_opt_proc_service(void *data, const char *arg, int key,
+ struct fuse_args *outargs)
+{
+ (void) outargs;
+ struct fuse_cmdline_opts *opts = data;
+
+ switch (key) {
+ case FUSE_OPT_KEY_NONOPT:
+ if (!opts->mountpoint)
+ return fuse_opt_add_opt(&opts->mountpoint, arg);
+
+ fuse_log(FUSE_LOG_ERR, "fuse: invalid argument `%s'\n", arg);
+ return -1;
+ default:
+ /* Pass through unknown options */
+ return 1;
+ }
+}
+#endif
+
/* Under FreeBSD, there is no subtype option so this
function actually sets the fsname */
static int add_default_subtype(const char *progname, struct fuse_args *args)
@@ -228,6 +254,33 @@ int fuse_parse_cmdline_312(struct fuse_args *args,
return 0;
}
+#ifdef HAVE_SERVICEMOUNT
+int fuse_parse_cmdline_service(struct fuse_args *args,
+ struct fuse_cmdline_opts *opts)
+{
+ memset(opts, 0, sizeof(struct fuse_cmdline_opts));
+
+ opts->max_idle_threads = UINT_MAX; /* new default in fuse version 3.12 */
+ opts->max_threads = 10;
+
+ if (fuse_opt_parse(args, opts, fuse_helper_opts,
+ fuse_helper_opt_proc_service) == -1)
+ return -1;
+
+ /*
+ * *Linux*: if neither -o subtype nor -o fsname are specified,
+ * set subtype to program's basename.
+ * *FreeBSD*: if fsname is not specified, set to program's
+ * basename.
+ */
+ if (!opts->nodefault_subtype)
+ if (add_default_subtype(args->argv[0], args) == -1)
+ return -1;
+
+ return 0;
+}
+#endif
+
/**
* struct fuse_cmdline_opts got extended in libfuse-3.12
*/
diff --git a/lib/meson.build b/lib/meson.build
index fcd95741c9d374..7ff5c91e0da702 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -10,6 +10,12 @@ else
libfuse_sources += [ 'mount_bsd.c' ]
endif
+if private_cfg.get('HAVE_SERVICEMOUNT', false)
+ libfuse_sources += [ 'fuse_service.c' ]
+else
+ libfuse_sources += [ 'fuse_service_stub.c' ]
+endif
+
deps = [ thread_dep ]
if private_cfg.get('HAVE_ICONV')
libfuse_sources += [ 'modules/iconv.c' ]
@@ -49,18 +55,24 @@ libfuse = library('fuse3',
dependencies: deps,
install: true,
link_depends: 'fuse_versionscript',
- c_args: [ '-DFUSE_USE_VERSION=317',
+ c_args: [ '-DFUSE_USE_VERSION=319',
'-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
link_args: ['-Wl,--version-script,' + meson.current_source_dir()
+ '/fuse_versionscript' ])
+vars = []
+if private_cfg.get('HAVE_SERVICEMOUNT', false)
+ service_socket_dir = private_cfg.get_unquoted('FUSE_SERVICE_SOCKET_DIR', '')
+ vars += ['service_socket_dir=' + service_socket_dir]
+endif
pkg = import('pkgconfig')
pkg.generate(libraries: [ libfuse, '-lpthread' ],
libraries_private: '-ldl',
version: meson.project_version(),
name: 'fuse3',
description: 'Filesystem in Userspace',
- subdirs: 'fuse3')
+ subdirs: 'fuse3',
+ variables: vars)
libfuse_dep = declare_dependency(include_directories: include_dirs,
link_with: libfuse, dependencies: deps)
diff --git a/lib/mount.c b/lib/mount.c
index 6cf98a0769ba8c..2018172ae570f0 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -750,3 +750,15 @@ char *fuse_mnt_build_type(const struct mount_opts *mo)
return type;
}
+
+char *fuse_mnt_kernel_opts(const struct mount_opts *mo)
+{
+ if (mo->kernel_opts)
+ return strdup(mo->kernel_opts);
+ return NULL;
+}
+
+unsigned int fuse_mnt_flags(const struct mount_opts *mo)
+{
+ return mo->flags;
+}
diff --git a/meson.build b/meson.build
index 80c5f1dc0bd356..d6ba8740effd5c 100644
--- a/meson.build
+++ b/meson.build
@@ -69,6 +69,11 @@ args_default = [ '-D_GNU_SOURCE' ]
#
private_cfg = configuration_data()
private_cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
+service_socket_dir = get_option('service-socket-dir')
+if service_socket_dir == ''
+ service_socket_dir = '/run/filesystems'
+endif
+private_cfg.set_quoted('FUSE_SERVICE_SOCKET_DIR', service_socket_dir)
# Test for presence of some functions
test_funcs = [ 'fork', 'fstatat', 'openat', 'readlinkat', 'pipe2',
@@ -118,6 +123,13 @@ special_funcs = {
return -1;
}
}
+ ''',
+ 'systemd_headers': '''
+ #include <systemd/sd-daemon.h>
+
+ int main(int argc, char *argv[]) {
+ return SD_LISTEN_FDS_START;
+ }
'''
}
@@ -180,6 +192,23 @@ if get_option('enable-io-uring') and liburing.found() and libnuma.found()
endif
endif
+# Check for systemd support
+systemd_system_unit_dir = get_option('systemdsystemunitdir')
+if systemd_system_unit_dir == ''
+ systemd = dependency('systemd', required: false)
+ if systemd.found()
+ systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemd_system_unit_dir')
+ endif
+endif
+
+if systemd_system_unit_dir == '' or private_cfg.get('HAVE_SYSTEMD_HEADERS', false) == false
+ warning('systemd service support will not be built')
+else
+ private_cfg.set_quoted('SYSTEMD_SYSTEM_UNIT_DIR', systemd_system_unit_dir)
+ private_cfg.set('HAVE_SYSTEMD', true)
+ private_cfg.set('HAVE_SERVICEMOUNT', true)
+endif
+
#
# Compiler configuration
#
diff --git a/meson_options.txt b/meson_options.txt
index c1f8fe69467184..95655a0d64895c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -27,3 +27,9 @@ option('enable-usdt', type : 'boolean', value : false,
option('enable-io-uring', type: 'boolean', value: true,
description: 'Enable fuse-over-io-uring support')
+
+option('service-socket-dir', type : 'string', value : '',
+ description: 'Where to install fuse server sockets (if empty, /run/filesystems)')
+
+option('systemdsystemunitdir', type : 'string', value : '',
+ description: 'Where to install systemd unit files (if empty, query pkg-config(1))')
diff --git a/util/fuservicemount.c b/util/fuservicemount.c
new file mode 100644
index 00000000000000..9c694a4290f94e
--- /dev/null
+++ b/util/fuservicemount.c
@@ -0,0 +1,18 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ *
+ * This program wraps the mounting of FUSE filesystems that run in systemd
+ */
+#define _GNU_SOURCE
+#include "fuse_config.h"
+#include "mount_service.h"
+
+int main(int argc, char *argv[])
+{
+ return mount_service_main(argc, argv);
+}
diff --git a/util/meson.build b/util/meson.build
index 0e4b1cce95377e..403fc68ef67ae8 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -6,6 +6,15 @@ executable('fusermount3', ['fusermount.c', '../lib/mount_util.c', '../lib/util.c
install_dir: get_option('bindir'),
c_args: '-DFUSE_CONF="@0@"'.format(fuseconf_path))
+if private_cfg.get('HAVE_SERVICEMOUNT', false)
+ executable('fuservicemount3', ['mount_service.c', 'fuservicemount.c', '../lib/mount_util.c'],
+ include_directories: include_dirs,
+ link_with: [ libfuse ],
+ install: true,
+ install_dir: get_option('sbindir'),
+ c_args: '-DFUSE_USE_VERSION=317')
+endif
+
executable('mount.fuse3', ['mount.fuse.c'],
include_directories: include_dirs,
link_with: [ libfuse ],
diff --git a/util/mount_service.c b/util/mount_service.c
new file mode 100644
index 00000000000000..ae078e537dc560
--- /dev/null
+++ b/util/mount_service.c
@@ -0,0 +1,1088 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2025-2026 Oracle.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ *
+ * This program does the mounting of FUSE filesystems that run in systemd
+ */
+#define _GNU_SOURCE
+#include "fuse_config.h"
+#include <stdint.h>
+#include <sys/mman.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mount.h>
+#include <stdbool.h>
+#include <limits.h>
+#include <sys/stat.h>
+#include <arpa/inet.h>
+
+#include "mount_util.h"
+#include "util.h"
+#include "fuse_i.h"
+#include "fuse_service_priv.h"
+#include "mount_service.h"
+
+struct mount_service {
+ /* prefix for printing error messages */
+ const char *msgtag;
+
+ /* alleged fuse subtype based on -t cli argument */
+ const char *subtype;
+
+ /* full fuse filesystem type we give to mount() */
+ char *fstype;
+
+ /* source argument to mount() */
+ char *source;
+
+ /* target argument (aka mountpoint) to mount() */
+ char *mountpoint;
+
+ /* mountpoint that we pass to mount() */
+ const char *real_mountpoint;
+
+ /* mount options */
+ char *mntopts;
+
+ /* socket fd */
+ int sockfd;
+
+ /* /dev/fuse device */
+ int fusedevfd;
+
+ /* memfd for cli arguments */
+ int argvfd;
+
+ /* O_PATH fd for mount point */
+ int mountfd;
+};
+
+/* Filter out the subtype of the filesystem (e.g. fuse.Y -> Y) */
+const char *mount_service_subtype(const char *fstype)
+{
+ char *period = strrchr(fstype, '.');
+
+ if (period)
+ return period + 1;
+
+ return fstype;
+}
+
+static int mount_service_init(struct mount_service *mo, int argc, char *argv[])
+{
+ char *fstype = NULL;
+ int i;
+
+ mo->sockfd = -1;
+ mo->argvfd = -1;
+ mo->fusedevfd = -1;
+ mo->mountfd = -1;
+
+ for (i = 0; i < argc; i++) {
+ if (!strcmp(argv[i], "-t") && i + 1 < argc) {
+ fstype = argv[i + 1];
+ break;
+ }
+ }
+ if (!fstype) {
+ fprintf(stderr, "%s: cannot determine filesystem type.\n",
+ mo->msgtag);
+ return -1;
+ }
+
+ mo->subtype = mount_service_subtype(fstype);
+ return 0;
+}
+
+#ifdef SO_PASSRIGHTS
+static int try_drop_passrights(struct mount_service *mo, int sockfd)
+{
+ int zero = 0;
+ int ret;
+
+ /*
+ * Don't let a malicious mount helper send us any fds. We don't trust
+ * the fuse server not to pollute our fd namespace, so we'll end now.
+ */
+ ret = setsockopt(sockfd, SOL_SOCKET, SO_PASSRIGHTS, &zero,
+ sizeof(zero));
+ if (ret) {
+ fprintf(stderr, "%s: disabling fd passing: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+#else
+# define try_drop_passrights(...) (0)
+#endif
+
+static int mount_service_connect(struct mount_service *mo)
+{
+ struct sockaddr_un name = {
+ .sun_family = AF_UNIX,
+ };
+ int sockfd;
+ ssize_t written;
+ int ret;
+
+ written = snprintf(name.sun_path, sizeof(name.sun_path),
+ FUSE_SERVICE_SOCKET_DIR "/%s", mo->subtype);
+ if (written > sizeof(name.sun_path)) {
+ fprintf(stderr, "%s: filesystem type name `%s' is too long.\n",
+ mo->msgtag, mo->subtype);
+ return -1;
+ }
+
+ sockfd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
+ if (sockfd < 0) {
+ fprintf(stderr, "%s: opening %s service socket: %s\n",
+ mo->msgtag, mo->subtype, strerror(errno));
+ return -1;
+ }
+
+ ret = connect(sockfd, (const struct sockaddr *)&name, sizeof(name));
+ if (ret) {
+ if (errno == ENOENT)
+ fprintf(stderr, "%s: no safe filesystem driver for %s available.\n",
+ mo->msgtag, mo->subtype);
+ else
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, name.sun_path, strerror(errno));
+ goto out;
+ }
+
+ ret = try_drop_passrights(mo, sockfd);
+ if (ret)
+ goto out;
+
+ mo->sockfd = sockfd;
+ return 0;
+out:
+ close(sockfd);
+ return -1;
+}
+
+static int mount_service_send_hello(struct mount_service *mo)
+{
+ struct fuse_service_hello hello = {
+ .p.magic = htonl(FUSE_SERVICE_HELLO_CMD),
+ .min_version = htons(FUSE_SERVICE_MIN_PROTO),
+ .max_version = htons(FUSE_SERVICE_MAX_PROTO),
+ };
+ struct fuse_service_hello_reply reply = { };
+ struct iovec iov = {
+ .iov_base = &hello,
+ .iov_len = sizeof(hello),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ ssize_t size;
+
+ if (getuid() == 0)
+ hello.flags |= htonl(FUSE_SERVICE_FLAG_ALLOW_OTHER);
+
+ size = sendmsg(mo->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ fprintf(stderr, "%s: send hello: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+
+ iov.iov_base = &reply;
+ iov.iov_len = sizeof(reply);
+
+ size = recvmsg(mo->sockfd, &msg, MSG_TRUNC);
+ if (size < 0) {
+ fprintf(stderr, "%s: hello reply: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ if (size != sizeof(reply)) {
+ fprintf(stderr, "%s: wrong hello reply size %zd, expected %zd\n",
+ mo->msgtag, size, sizeof(reply));
+ return -1;
+ }
+
+ if (reply.p.magic != ntohl(FUSE_SERVICE_HELLO_REPLY)) {
+ fprintf(stderr, "%s: %s service server did not reply to hello\n",
+ mo->msgtag, mo->subtype);
+ return -1;
+ }
+
+ if (ntohs(reply.version) < FUSE_SERVICE_MIN_PROTO ||
+ ntohs(reply.version) > FUSE_SERVICE_MAX_PROTO) {
+ fprintf(stderr, "%s: unsupported protocol version %u\n",
+ mo->msgtag, ntohs(reply.version));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int mount_service_capture_arg(struct mount_service *mo,
+ struct fuse_service_memfd_argv *args,
+ const char *string, off_t *array_pos,
+ off_t *string_pos)
+{
+ const size_t string_len = strlen(string) + 1;
+ struct fuse_service_memfd_arg arg = {
+ .pos = htonl(*string_pos),
+ .len = htonl(string_len),
+ };
+ ssize_t written;
+
+ written = pwrite(mo->argvfd, string, string_len, *string_pos);
+ if (written < 0) {
+ fprintf(stderr, "%s: memfd argv write: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ if (written < string_len) {
+ fprintf(stderr, "%s: memfd argv[%u] wrote %zd, expected %zd\n",
+ mo->msgtag, args->argc, written, string_len);
+ return -1;
+ }
+
+ written = pwrite(mo->argvfd, &arg, sizeof(arg), *array_pos);
+ if (written < 0) {
+ fprintf(stderr, "%s: memfd arg write: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ if (written < sizeof(arg)) {
+ fprintf(stderr, "%s: memfd arg[%u] wrote %zd, expected %zd\n",
+ mo->msgtag, args->argc, written, sizeof(arg));
+ return -1;
+ }
+
+ args->argc++;
+ *string_pos += string_len;
+ *array_pos += sizeof(arg);
+
+ return 0;
+}
+
+static int mount_service_capture_args(struct mount_service *mo, int argc,
+ char *argv[])
+{
+ struct fuse_service_memfd_argv args = {
+ .magic = htonl(FUSE_SERVICE_ARGS_MAGIC),
+ };
+ off_t array_pos = sizeof(struct fuse_service_memfd_argv);
+ off_t string_pos = array_pos +
+ (argc * sizeof(struct fuse_service_memfd_arg));
+ ssize_t written;
+ int i;
+ int ret;
+
+ if (argc < 0) {
+ fprintf(stderr, "%s: argc cannot be negative\n",
+ mo->msgtag);
+ return -1;
+ }
+
+ /*
+ * Create the memfd in which we'll stash arguments, and set the write
+ * pointer for the names.
+ */
+ mo->argvfd = memfd_create("fuse service argv", MFD_CLOEXEC);
+ if (mo->argvfd < 0) {
+ fprintf(stderr, "%s: argvfd create: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+
+ /*
+ * Write the alleged subtype as if it were argv[0], then write the rest
+ * of the argv arguments.
+ */
+ ret = mount_service_capture_arg(mo, &args, mo->subtype, &array_pos,
+ &string_pos);
+ if (ret)
+ return ret;
+
+ for (i = 1; i < argc; i++) {
+ /* skip the -t(ype) argument */
+ if (!strcmp(argv[i], "-t") && i + 1 < argc) {
+ i++;
+ continue;
+ }
+
+ ret = mount_service_capture_arg(mo, &args, argv[i],
+ &array_pos, &string_pos);
+ if (ret)
+ return ret;
+ }
+
+ /* Now write the header */
+ args.argc = htonl(args.argc);
+ written = pwrite(mo->argvfd, &args, sizeof(args), 0);
+ if (written < 0) {
+ fprintf(stderr, "%s: memfd argv write: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ if (written < sizeof(args)) {
+ fprintf(stderr, "%s: memfd argv wrote %zd, expected %zd\n",
+ mo->msgtag, written, sizeof(args));
+ return -1;
+ }
+
+ return 0;
+}
+
+static ssize_t __send_fd(int sockfd, struct fuse_service_requested_file *req,
+ size_t req_sz, int fd)
+{
+ union {
+ struct cmsghdr cmsghdr;
+ char control[CMSG_SPACE(sizeof(int))];
+ } cmsgu;
+ struct iovec iov = {
+ .iov_base = req,
+ .iov_len = req_sz,
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = cmsgu.control,
+ .msg_controllen = sizeof(cmsgu.control),
+ };
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+
+ if (!cmsg) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ memset(&cmsgu, 0, sizeof(cmsgu));
+ cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+
+ *((int *)CMSG_DATA(cmsg)) = fd;
+
+ return sendmsg(sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+}
+
+static int mount_service_send_file(struct mount_service *mo,
+ const char *path, int fd)
+{
+ struct fuse_service_requested_file *req;
+ const size_t req_sz =
+ sizeof_fuse_service_requested_file(strlen(path));
+ ssize_t written;
+ int ret = 0;
+
+ req = malloc(req_sz);
+ if (!req) {
+ fprintf(stderr, "%s: alloc send file reply: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ req->p.magic = htonl(FUSE_SERVICE_OPEN_REPLY);
+ req->error = 0;
+ strcpy(req->path, path);
+
+ written = __send_fd(mo->sockfd, req, req_sz, fd);
+ if (written < 0) {
+ fprintf(stderr, "%s: send file reply: %s\n",
+ mo->msgtag, strerror(errno));
+ ret = -1;
+ goto out_req;
+ }
+ if (written < req_sz) {
+ fprintf(stderr, "%s: send file reply wrote %zd, expected %zd\n",
+ mo->msgtag, written, req_sz);
+ ret = -1;
+ goto out_req;
+ }
+
+out_req:
+ free(req);
+ return ret;
+}
+
+static ssize_t __send_packet(int sockfd, void *buf, ssize_t buflen)
+{
+ struct iovec iov = {
+ .iov_base = buf,
+ .iov_len = buflen,
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+
+ return sendmsg(sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+}
+
+static int mount_service_send_file_error(struct mount_service *mo, int error,
+ const char *path)
+{
+ struct fuse_service_requested_file *req;
+ const size_t req_sz =
+ sizeof_fuse_service_requested_file(strlen(path));
+ ssize_t written;
+ int ret = 0;
+
+ req = malloc(req_sz);
+ if (!req) {
+ fprintf(stderr, "%s: alloc send file error: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ req->p.magic = htonl(FUSE_SERVICE_OPEN_REPLY);
+ req->error = htonl(error);
+ strcpy(req->path, path);
+
+ written = __send_packet(mo->sockfd, req, req_sz);
+ if (written < 0) {
+ fprintf(stderr, "%s: send file error: %s\n",
+ mo->msgtag, strerror(errno));
+ ret = -1;
+ goto out_req;
+ }
+ if (written < req_sz) {
+ fprintf(stderr, "%s: send file error wrote %zd, expected %zd\n",
+ mo->msgtag, written, req_sz);
+ ret = -1;
+ goto out_req;
+ }
+
+out_req:
+ free(req);
+ return ret;
+}
+
+static int mount_service_send_required_files(struct mount_service *mo,
+ const char *fusedev)
+{
+ int ret;
+
+ mo->fusedevfd = open(fusedev, O_RDWR | O_CLOEXEC);
+ if (mo->fusedevfd < 0) {
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, fusedev, strerror(errno));
+ return -1;
+ }
+
+ ret = mount_service_send_file(mo, FUSE_SERVICE_ARGV, mo->argvfd);
+ if (ret)
+ goto out_fusedevfd;
+
+ return mount_service_send_file(mo, FUSE_SERVICE_FUSEDEV,
+ mo->fusedevfd);
+
+out_fusedevfd:
+ close(mo->fusedevfd);
+ mo->fusedevfd = -1;
+ return ret;
+}
+
+static int mount_service_receive_command(struct mount_service *mo,
+ struct fuse_service_packet **commandp)
+{
+ struct iovec iov = {
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ struct fuse_service_packet *command;
+ ssize_t size;
+
+ size = recvmsg(mo->sockfd, &msg, MSG_PEEK | MSG_TRUNC);
+ if (size < 0) {
+ fprintf(stderr, "%s: peek service command: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ if (size == 0) {
+ /* fuse server probably exited early */
+ fprintf(stderr, "%s: fuse server exited without saying goodbye!\n",
+ mo->msgtag);
+ return -1;
+ }
+ if (size < sizeof(struct fuse_service_packet)) {
+ fprintf(stderr, "%s: wrong command packet size %zd, expected at least %zd\n",
+ mo->msgtag, size, sizeof(struct fuse_service_packet));
+ return -1;
+ }
+
+ command = calloc(1, size + 1);
+ if (!command) {
+ fprintf(stderr, "%s: alloc service command: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+ iov.iov_base = command;
+ iov.iov_len = size;
+
+ size = recvmsg(mo->sockfd, &msg, MSG_TRUNC);
+ if (size < 0) {
+ fprintf(stderr, "%s: receive service command: %s\n",
+ mo->msgtag, strerror(errno));
+ free(command);
+ return -1;
+ }
+ if (size != iov.iov_len) {
+ fprintf(stderr, "%s: wrong service command size %zd, expected %zd\n",
+ mo->msgtag,
+ size, iov.iov_len);
+ free(command);
+ return -1;
+ }
+
+ *commandp = command;
+ return 0;
+}
+
+static int mount_service_send_reply(struct mount_service *mo, int error)
+{
+ struct fuse_service_simple_reply reply = {
+ .p.magic = htonl(FUSE_SERVICE_SIMPLE_REPLY),
+ .error = htonl(error),
+ };
+ struct iovec iov = {
+ .iov_base = &reply,
+ .iov_len = sizeof(reply),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ };
+ ssize_t size;
+
+ size = sendmsg(mo->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
+ if (size < 0) {
+ fprintf(stderr, "%s: send service reply: %s\n",
+ mo->msgtag, strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int prepare_bdev(struct mount_service *mo,
+ struct fuse_service_open_command *oc, int fd)
+{
+ struct stat statbuf;
+ int block_size;
+ int ret;
+
+ ret = fstat(fd, &statbuf);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, oc->path, strerror(error));
+ return -error;
+ }
+
+ if (!S_ISBLK(statbuf.st_mode)) {
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, oc->path, strerror(ENOTBLK));
+ return -ENOTBLK;
+ }
+
+ if (!oc->block_size)
+ return 0;
+ block_size = ntohl(oc->block_size);
+
+ ret = ioctl(fd, BLKBSZSET, &block_size);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, oc->path, strerror(error));
+ return -error;
+ }
+
+ return 0;
+}
+
+static int mount_service_handle_open_path(struct mount_service *mo,
+ mode_t expected_fmt,
+ struct fuse_service_packet *p)
+{
+ struct fuse_service_open_command *oc =
+ container_of(p, struct fuse_service_open_command, p);
+ uint32_t request_flags = ntohl(oc->request_flags);
+ int ret;
+ int fd;
+
+ if (request_flags & ~FUSE_SERVICE_OPEN_FLAGS)
+ return mount_service_send_file_error(mo, EINVAL, oc->path);
+
+ fd = open(oc->path, ntohl(oc->open_flags), ntohl(oc->create_mode));
+ if (fd < 0) {
+ int error = errno;
+
+ /*
+ * Don't print a busy device error report because the
+ * filesystem might decide to retry.
+ */
+ if (error != EBUSY)
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, oc->path, strerror(error));
+ return mount_service_send_file_error(mo, error, oc->path);
+ }
+
+ if (S_ISBLK(expected_fmt)) {
+ ret = prepare_bdev(mo, oc, fd);
+ if (ret < 0) {
+ close(fd);
+ return mount_service_send_file_error(mo, -ret,
+ oc->path);
+ }
+ }
+
+ ret = mount_service_send_file(mo, oc->path, fd);
+ close(fd);
+ return ret;
+}
+
+static int mount_service_handle_open_cmd(struct mount_service *mo,
+ struct fuse_service_packet *p)
+{
+ return mount_service_handle_open_path(mo, 0, p);
+}
+
+static int mount_service_handle_open_bdev_cmd(struct mount_service *mo,
+ struct fuse_service_packet *p)
+{
+ return mount_service_handle_open_path(mo, S_IFBLK, p);
+}
+
+static int mount_service_handle_fsopen_cmd(struct mount_service *mo,
+ const struct fuse_service_packet *p)
+{
+ struct fuse_service_string_command *oc =
+ container_of(p, struct fuse_service_string_command, p);
+
+ if (mo->fstype) {
+ fprintf(stderr, "%s: fstype respecified!\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ mo->fstype = strdup(oc->value);
+ if (!mo->fstype) {
+ int error = errno;
+
+ fprintf(stderr, "%s: alloc fstype string: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ return mount_service_send_reply(mo, 0);
+}
+
+static int mount_service_handle_source_cmd(struct mount_service *mo,
+ const struct fuse_service_packet *p)
+{
+ struct fuse_service_string_command *oc =
+ container_of(p, struct fuse_service_string_command, p);
+
+ if (mo->source) {
+ fprintf(stderr, "%s: source respecified!\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ mo->source = strdup(oc->value);
+ if (!mo->source) {
+ int error = errno;
+
+ fprintf(stderr, "%s: alloc source string: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ return mount_service_send_reply(mo, 0);
+}
+
+static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
+ const struct fuse_service_packet *p)
+{
+ struct fuse_service_string_command *oc =
+ container_of(p, struct fuse_service_string_command, p);
+
+ if (mo->mntopts) {
+ fprintf(stderr, "%s: mount options respecified!\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ mo->mntopts = strdup(oc->value);
+ if (!mo->mntopts) {
+ int error = errno;
+
+ fprintf(stderr, "%s: alloc mount options string: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ return mount_service_send_reply(mo, 0);
+}
+
+static int mount_service_handle_mountpoint_cmd(struct mount_service *mo,
+ const struct fuse_service_packet *p)
+{
+ struct fuse_service_string_command *oc =
+ container_of(p, struct fuse_service_string_command, p);
+ int ret;
+
+ if (mo->mountpoint) {
+ fprintf(stderr, "%s: mount point respecified!\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+#ifdef O_PATH
+ mo->mountfd = open(oc->value, O_PATH);
+ if (mo->mountfd < 0) {
+ int error = errno;
+
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, oc->value, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+#else
+ mo->mountfd = -1;
+#endif
+
+ mo->mountpoint = strdup(oc->value);
+ if (!mo->mountpoint) {
+ int error = errno;
+
+ fprintf(stderr, "%s: alloc mount point string: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+ mo->real_mountpoint = mo->mountpoint;
+
+ ret = chdir(oc->value);
+ if (ret) {
+ if (errno != ENOTDIR) {
+ int error = errno;
+
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, oc->value, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ /* not a directory */
+ } else {
+ /*
+ * Now that we're sitting on the mountpoint directory, we can
+ * pass "." to mount() and avoid races with directory tree
+ * mutations.
+ */
+ mo->real_mountpoint = ".";
+ }
+
+ return mount_service_send_reply(mo, 0);
+}
+
+static inline int format_libfuse_mntopts(char *buf, size_t bufsz,
+ const struct mount_service *mo,
+ const struct stat *statbuf)
+{
+ if (mo->mntopts)
+ return snprintf(buf, bufsz,
+ "%s,fd=%i,rootmode=%o,user_id=%u,group_id=%u",
+ mo->mntopts, mo->fusedevfd,
+ statbuf->st_mode & S_IFMT,
+ getuid(), getgid());
+
+ return snprintf(buf, bufsz,
+ "fd=%i,rootmode=%o,user_id=%u,group_id=%u",
+ mo->fusedevfd, statbuf->st_mode & S_IFMT,
+ getuid(), getgid());
+}
+
+static int mount_service_regular_mount(struct mount_service *mo,
+ struct fuse_service_mount_command *oc,
+ struct stat *stbuf)
+{
+ char *realmopts;
+ const char *mntpt;
+ char buf[32];
+ int ret;
+
+ /* Compute the amount of buffer space needed for the mount options */
+ ret = format_libfuse_mntopts(NULL, 0, mo, stbuf);
+ if (ret < 0) {
+ int error = errno;
+
+ fprintf(stderr, "%s: mount option preformatting: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ realmopts = malloc(ret + 1);
+ if (!realmopts) {
+ int error = errno;
+
+ fprintf(stderr, "%s: alloc real mount options string: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ ret = format_libfuse_mntopts(realmopts, ret + 1, mo, stbuf);
+ if (ret < 0) {
+ int error = errno;
+
+ free(realmopts);
+ fprintf(stderr, "%s: mount options formatting: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ if (mo->mountfd >= 0) {
+ snprintf(buf, sizeof(buf), "/dev/fd/%d", mo->mountfd);
+ mntpt = buf;
+ } else {
+ mntpt = mo->real_mountpoint;
+ }
+ ret = mount(mo->source, mntpt, mo->fstype, ntohl(oc->ms_flags),
+ realmopts);
+ free(realmopts);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: mount: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ return mount_service_send_reply(mo, 0);
+}
+
+static int mount_service_handle_mount_cmd(struct mount_service *mo,
+ struct fuse_service_packet *p)
+{
+ struct stat stbuf;
+ struct fuse_service_mount_command *oc =
+ container_of(p, struct fuse_service_mount_command, p);
+ int ret;
+
+ if (!mo->fstype) {
+ fprintf(stderr, "%s: missing mount type parameter\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ if (!mo->source) {
+ fprintf(stderr, "%s: missing mount source parameter\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ if (!mo->mountpoint) {
+ fprintf(stderr, "%s: missing mount point parameter\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ /*
+ * Make sure we can access the mountpoint and that it's either a
+ * directory or a regular file. Linux can handle mounting atop special
+ * files, but we don't care to do such crazy things.
+ */
+ if (mo->mountfd >= 0)
+ ret = fstat(mo->mountfd, &stbuf);
+ else
+ ret = stat(mo->mountpoint, &stbuf);
+ if (ret < 0) {
+ int error = errno;
+
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, mo->mountpoint, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ if (!S_ISDIR(stbuf.st_mode) && !S_ISREG(stbuf.st_mode)) {
+ fprintf(stderr, "%s: %s: Must be a regular file or directory\n",
+ mo->msgtag, mo->mountpoint);
+ return mount_service_send_reply(mo, EACCES);
+ }
+
+ /* Make sure the mountpoint type matches what the caller wanted */
+ switch (ntohs(oc->expected_fmt)) {
+ case S_IFDIR:
+ if (!S_ISDIR(stbuf.st_mode)) {
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, mo->mountpoint, strerror(ENOTDIR));
+ return mount_service_send_reply(mo, ENOTDIR);
+ }
+ break;
+ case S_IFREG:
+ if (!S_ISREG(stbuf.st_mode)) {
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, mo->mountpoint, strerror(EISDIR));
+ return mount_service_send_reply(mo, EISDIR);
+ }
+ break;
+ case 0:
+ /* don't care */
+ break;
+ default:
+ fprintf(stderr, "%s: %s: Weird expected format 0%o\n",
+ mo->msgtag, mo->mountpoint, ntohs(oc->expected_fmt));
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ return mount_service_regular_mount(mo, oc, &stbuf);
+}
+
+static int mount_service_handle_bye_cmd(struct mount_service *mo,
+ struct fuse_service_packet *p)
+{
+ struct fuse_service_bye_command *bc =
+ container_of(p, struct fuse_service_bye_command, p);
+ int ret = ntohl(bc->exitcode);
+
+ if (ret)
+ fprintf(stderr, "%s: fuse server failed mount, check dmesg/logs for details.\n",
+ mo->msgtag);
+
+ return ret;
+}
+
+static void mount_service_destroy(struct mount_service *mo)
+{
+ close(mo->mountfd);
+ close(mo->fusedevfd);
+ close(mo->argvfd);
+ shutdown(mo->sockfd, SHUT_RDWR);
+ close(mo->sockfd);
+
+ free(mo->source);
+ free(mo->mountpoint);
+ free(mo->mntopts);
+ free(mo->fstype);
+
+ memset(mo, 0, sizeof(*mo));
+ mo->sockfd = -1;
+ mo->argvfd = -1;
+ mo->fusedevfd = -1;
+ mo->mountfd = -1;
+}
+
+int mount_service_main(int argc, char *argv[])
+{
+ const char *fusedev = fuse_mnt_get_devname();
+ struct mount_service mo = { };
+ bool running = true;
+ int ret;
+
+ if (argc < 3 || !strcmp(argv[1], "--help")) {
+ printf("Usage: %s source mountpoint -t type [-o options]\n",
+ argv[0]);
+ return EXIT_FAILURE;
+ }
+
+ if (argc > 0 && argv[0])
+ mo.msgtag = argv[0];
+ else
+ mo.msgtag = "mount.service";
+
+ ret = mount_service_init(&mo, argc, argv);
+ if (ret)
+ return EXIT_FAILURE;
+
+ ret = mount_service_connect(&mo);
+ if (ret) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+
+ ret = mount_service_send_hello(&mo);
+ if (ret) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+
+ ret = mount_service_capture_args(&mo, argc, argv);
+ if (ret) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+
+ ret = mount_service_send_required_files(&mo, fusedev);
+ if (ret) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+
+ while (running) {
+ struct fuse_service_packet *p = NULL;
+
+ ret = mount_service_receive_command(&mo, &p);
+ if (ret) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+
+ switch (ntohl(p->magic)) {
+ case FUSE_SERVICE_OPEN_CMD:
+ ret = mount_service_handle_open_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_OPEN_BDEV_CMD:
+ ret = mount_service_handle_open_bdev_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_FSOPEN_CMD:
+ ret = mount_service_handle_fsopen_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_SOURCE_CMD:
+ ret = mount_service_handle_source_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_MNTOPTS_CMD:
+ ret = mount_service_handle_mntopts_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_MNTPT_CMD:
+ ret = mount_service_handle_mountpoint_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_MOUNT_CMD:
+ ret = mount_service_handle_mount_cmd(&mo, p);
+ break;
+ case FUSE_SERVICE_BYE_CMD:
+ ret = mount_service_handle_bye_cmd(&mo, p);
+ free(p);
+ goto out;
+ default:
+ fprintf(stderr, "%s: unrecognized packet 0x%x\n",
+ mo.msgtag, ntohl(p->magic));
+ ret = EXIT_FAILURE;
+ break;
+ }
+ free(p);
+
+ if (ret) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+ }
+
+ ret = EXIT_SUCCESS;
+out:
+ mount_service_destroy(&mo);
+ return ret;
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH 02/17] mount_service: add systemd/inetd socket service mounting helper
2026-03-27 1:25 ` [PATCH 02/17] mount_service: add systemd/inetd socket service mounting helper Darrick J. Wong
@ 2026-03-30 20:44 ` Bernd Schubert
2026-03-30 21:37 ` Darrick J. Wong
0 siblings, 1 reply; 28+ messages in thread
From: Bernd Schubert @ 2026-03-30 20:44 UTC (permalink / raw)
To: Darrick J. Wong
Cc: linux-fsdevel@vger.kernel.org, bernd@bsbernd.com,
miklos@szeredi.hu, neal@gompa.dev, joannelkoong@gmail.com
On 3/27/26 02:25, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Create a mount helper program that can start a fuse server that runs as
> a socket-based systemd service, and a new libfuse module to wrap all the
> details of communicating between the mount helper and the containerized
> fuse server.
>
> This enables untrusted ext4 mounts via systemd service containers, which
> avoids the problem of malicious filesystems compromising the integrity
> of the running kernel through memory corruption.
>
> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> ---
> include/fuse_service.h | 215 +++++
> include/fuse_service_priv.h | 127 +++
> lib/mount_common_i.h | 3
> util/mount_service.h | 32 +
> .github/workflows/abicheck.yml | 2
> .github/workflows/abicheck_prev_release.yml | 2
> .github/workflows/pr-ci.yml | 2
> doc/fuservicemount3.8 | 24 +
> doc/meson.build | 3
> include/meson.build | 4
> lib/fuse_service.c | 989 +++++++++++++++++++++++++
> lib/fuse_service_stub.c | 96 ++
> lib/fuse_versionscript | 16
> lib/helper.c | 53 +
> lib/meson.build | 16
> lib/mount.c | 12
> meson.build | 29 +
> meson_options.txt | 6
> util/fuservicemount.c | 18
> util/meson.build | 9
> util/mount_service.c | 1088 +++++++++++++++++++++++++++
> 21 files changed, 2741 insertions(+), 5 deletions(-)
> create mode 100644 include/fuse_service.h
> create mode 100644 include/fuse_service_priv.h
> create mode 100644 util/mount_service.h
> create mode 100644 doc/fuservicemount3.8
> create mode 100644 lib/fuse_service.c
> create mode 100644 lib/fuse_service_stub.c
> create mode 100644 util/fuservicemount.c
> create mode 100644 util/mount_service.c
>
>
> diff --git a/include/fuse_service.h b/include/fuse_service.h
> new file mode 100644
> index 00000000000000..f0a4e63b2f11a7
> --- /dev/null
> +++ b/include/fuse_service.h
> @@ -0,0 +1,215 @@
> +/*
> + * FUSE: Filesystem in Userspace
> + * Copyright (C) 2025-2026 Oracle.
> + * Author: Darrick J. Wong <djwong@kernel.org>
> + *
> + * This program can be distributed under the terms of the GNU LGPLv2.
> + * See the file LGPL2.txt.
> + */
> +#ifndef FUSE_SERVICE_H_
> +#define FUSE_SERVICE_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
> +
> +struct fuse_service;
> +
> +/**
> + * Accept a socket created by mount.service for information exchange.
> + *
> + * @param sfp pointer to pointer to a service context. The pointer will always
> + * be initialized by this function; use fuse_service_accepted to
> + * find out if the fuse server is actually running as a service.
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_accept(struct fuse_service **sfp);
> +
> +/**
> + * Has the fuse server accepted a service context?
> + *
> + * @param sf service context
> + * @return true if it has, false if not
> + */
> +static inline bool fuse_service_accepted(struct fuse_service *sf)
> +{
> + return sf != NULL;
> +}
> +
> +/**
> + * Will the mount service helper accept the allow_other option?
> + *
> + * @param sf service context
> + * @return true if it has, false if not
> + */
> +bool fuse_service_can_allow_other(struct fuse_service *sf);
> +
> +/**
> + * Release all resources associated with the service context.
> + *
> + * @param sfp service context
> + */
> +void fuse_service_release(struct fuse_service *sf);
> +
> +/**
> + * Destroy a service context and release all resources
> + *
> + * @param sfp pointer to pointer to a service context
> + */
> +void fuse_service_destroy(struct fuse_service **sfp);
> +
> +/**
> + * Append the command line arguments from the mount service helper to an
> + * existing fuse_args structure. The fuse_args should have been initialized
> + * with the argc and argv passed to main().
> + *
> + * @param sfp service context
> + * @param args arguments to modify (input+output)
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_append_args(struct fuse_service *sf, struct fuse_args *args);
> +
> +/**
> + * Generate the effective fuse server command line from the args structure.
> + * The args structure should be the outcome from fuse_service_append_args.
> + * The resulting string is suitable for setproctitle and must be freed by the
> + * callre.
> + *
> + * @param argc argument count passed to main()
> + * @param argv argument vector passed to main()
> + * @param args fuse args structure
> + * @return effective command line string, or NULL
> + */
> +char *fuse_service_cmdline(int argc, char *argv[], struct fuse_args *args);
> +
> +struct fuse_cmdline_opts;
> +
> +/**
> + * Utility function to parse common options for simple file systems
> + * using the low-level API. A help text that describes the available
> + * options can be printed with `fuse_cmdline_help`. A single
> + * non-option argument is treated as the mountpoint. Multiple
> + * non-option arguments will result in an error.
> + *
> + * If neither -o subtype= or -o fsname= options are given, a new
> + * subtype option will be added and set to the basename of the program
> + * (the fsname will remain unset, and then defaults to "fuse").
> + *
> + * Known options will be removed from *args*, unknown options will
> + * remain. The mountpoint will not be checked here; that is the job of
> + * mount.service.
> + *
> + * @param args argument vector (input+output)
> + * @param opts output argument for parsed options
> + * @return 0 on success, -1 on failure
> + */
> +int fuse_service_parse_cmdline_opts(struct fuse_args *args,
> + struct fuse_cmdline_opts *opts);
> +
> +/**
> + * Ask the mount.service helper to open a file on behalf of the fuse server.
> + *
> + * @param sf service context
> + * @param path the path to file
> + * @param open_flags O_ flags
> + * @param create_mode mode with which to create the file
> + * @param request_flags set of FUSE_SERVICE_REQUEST_* flags
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_request_file(struct fuse_service *sf, const char *path,
> + int open_flags, mode_t create_mode,
> + unsigned int request_flags);
> +
> +/**
> + * Ask the mount.service helper to open a block device on behalf of the fuse
> + * server.
> + *
> + * @param sf service context
> + * @param path the path to file
> + * @param open_flags O_ flags
> + * @param create_mode mode with which to create the file
> + * @param request_flags set of FUSE_SERVICE_REQUEST_* flags
> + * @param block_size set the block device block size to this value
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_request_blockdev(struct fuse_service *sf, const char *path,
> + int open_flags, mode_t create_mode,
> + unsigned int request_flags,
> + unsigned int block_size);
> +
> +/**
> + * Receive a file previously requested.
> + *
> + * @param sf service context
> + * @param path to file
> + * @fdp pointer to file descriptor, which will be set a non-negative file
> + * descriptor value on success, or negative errno on failure
> + * @return 0 on success, or negative errno on socket communication failure
> + */
> +int fuse_service_receive_file(struct fuse_service *sf,
> + const char *path, int *fdp);
> +
> +/**
> + * Prevent the mount.service server from sending us any more open files.
> + *
> + * @param sf service context
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_finish_file_requests(struct fuse_service *sf);
> +
> +/**
> + * Require that the filesystem mount point have the expected file format
> + * (S_IFDIR/S_IFREG). Can be overridden when calling
> + * fuse_service_session_mount.
> + *
> + * @param sf service context
> + * @param expected_fmt expected mode (S_IFDIR/S_IFREG) for mount point, or 0
> + * to skip checks
> + */
> +void fuse_service_expect_mount_mode(struct fuse_service *sf,
> + mode_t expected_fmt);
> +
> +/**
> + * Bind a FUSE file system to the fuse session inside a fuse service process,
> + * then ask the mount.service helper to mount the filesystem for us. The fuse
> + * client will begin sending requests to the fuse server immediately after
> + * this.
> + *
> + * @param sf service context
> + * @param se fuse session
> + * @param expected_fmt expected mode (S_IFDIR/S_IFREG) for mount point, or 0
> + * to skip checks
> + * @param opts command line options
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
> + mode_t expected_fmt,
> + struct fuse_cmdline_opts *opts);
> +
> +/**
> + * Bid farewell to the mount.service helper. It is still necessary to call
> + * fuse_service_destroy after this.
> + *
> + * @param sf service context
> + * @param exitcode fuse server process exit status
> + * @return 0 on success, or negative errno on failure
> + */
> +int fuse_service_send_goodbye(struct fuse_service *sf, int exitcode);
> +
> +/**
> + * Exit routine for a fuse server running as a systemd service.
> + *
> + * @param ret 0 for success, nonzero for service failure.
> + * @return a value to be passed to exit() or returned from main
> + */
> +int fuse_service_exit(int ret);
> +
> +#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* FUSE_SERVICE_H_ */
> diff --git a/include/fuse_service_priv.h b/include/fuse_service_priv.h
> new file mode 100644
> index 00000000000000..d1fdd6221b5268
> --- /dev/null
> +++ b/include/fuse_service_priv.h
> @@ -0,0 +1,127 @@
> +/*
> + * FUSE: Filesystem in Userspace
> + * Copyright (C) 2025-2026 Oracle.
> + * Author: Darrick J. Wong <djwong@kernel.org>
> + *
> + * This program can be distributed under the terms of the GNU LGPLv2.
> + * See the file LGPL2.txt.
> + */
> +#ifndef FUSE_SERVICE_PRIV_H_
> +#define FUSE_SERVICE_PRIV_H_
> +
> +/* All numeric fields are network order (big-endian) when going across the socket */
> +
> +struct fuse_service_memfd_arg {
> + uint32_t pos;
> + uint32_t len;
> +};
> +
> +struct fuse_service_memfd_argv {
> + uint32_t magic;
> + uint32_t argc;
> +};
> +
> +#define FUSE_SERVICE_ARGS_MAGIC 0x41524753 /* ARGS */
> +
> +/* mount.service sends a hello to the server and it replies */
> +#define FUSE_SERVICE_HELLO_CMD 0x53414654 /* SAFT */
What "SAFT" stand for? (The German meaning of the word is "juice" ;) ).
Thanks,
Bernd
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 02/17] mount_service: add systemd/inetd socket service mounting helper
2026-03-30 20:44 ` Bernd Schubert
@ 2026-03-30 21:37 ` Darrick J. Wong
0 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-30 21:37 UTC (permalink / raw)
To: Bernd Schubert
Cc: linux-fsdevel@vger.kernel.org, bernd@bsbernd.com,
miklos@szeredi.hu, neal@gompa.dev, joannelkoong@gmail.com
On Mon, Mar 30, 2026 at 08:44:21PM +0000, Bernd Schubert wrote:
> On 3/27/26 02:25, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> >
> > Create a mount helper program that can start a fuse server that runs as
> > a socket-based systemd service, and a new libfuse module to wrap all the
> > details of communicating between the mount helper and the containerized
> > fuse server.
> >
> > This enables untrusted ext4 mounts via systemd service containers, which
> > avoids the problem of malicious filesystems compromising the integrity
> > of the running kernel through memory corruption.
> >
> > Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> > ---
> > include/fuse_service.h | 215 +++++
> > include/fuse_service_priv.h | 127 +++
> > lib/mount_common_i.h | 3
> > util/mount_service.h | 32 +
> > .github/workflows/abicheck.yml | 2
> > .github/workflows/abicheck_prev_release.yml | 2
> > .github/workflows/pr-ci.yml | 2
> > doc/fuservicemount3.8 | 24 +
> > doc/meson.build | 3
> > include/meson.build | 4
> > lib/fuse_service.c | 989 +++++++++++++++++++++++++
> > lib/fuse_service_stub.c | 96 ++
> > lib/fuse_versionscript | 16
> > lib/helper.c | 53 +
> > lib/meson.build | 16
> > lib/mount.c | 12
> > meson.build | 29 +
> > meson_options.txt | 6
> > util/fuservicemount.c | 18
> > util/meson.build | 9
> > util/mount_service.c | 1088 +++++++++++++++++++++++++++
> > 21 files changed, 2741 insertions(+), 5 deletions(-)
> > create mode 100644 include/fuse_service.h
> > create mode 100644 include/fuse_service_priv.h
> > create mode 100644 util/mount_service.h
> > create mode 100644 doc/fuservicemount3.8
> > create mode 100644 lib/fuse_service.c
> > create mode 100644 lib/fuse_service_stub.c
> > create mode 100644 util/fuservicemount.c
> > create mode 100644 util/mount_service.c
> >
> >
> > diff --git a/include/fuse_service.h b/include/fuse_service.h
> > new file mode 100644
> > index 00000000000000..f0a4e63b2f11a7
> > --- /dev/null
> > +++ b/include/fuse_service.h
> > @@ -0,0 +1,215 @@
> > +/*
> > + * FUSE: Filesystem in Userspace
> > + * Copyright (C) 2025-2026 Oracle.
> > + * Author: Darrick J. Wong <djwong@kernel.org>
> > + *
> > + * This program can be distributed under the terms of the GNU LGPLv2.
> > + * See the file LGPL2.txt.
> > + */
> > +#ifndef FUSE_SERVICE_H_
> > +#define FUSE_SERVICE_H_
> > +
> > +#ifdef __cplusplus
> > +extern "C" {
> > +#endif
> > +
> > +#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
> > +
> > +struct fuse_service;
> > +
> > +/**
> > + * Accept a socket created by mount.service for information exchange.
> > + *
> > + * @param sfp pointer to pointer to a service context. The pointer will always
> > + * be initialized by this function; use fuse_service_accepted to
> > + * find out if the fuse server is actually running as a service.
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_accept(struct fuse_service **sfp);
> > +
> > +/**
> > + * Has the fuse server accepted a service context?
> > + *
> > + * @param sf service context
> > + * @return true if it has, false if not
> > + */
> > +static inline bool fuse_service_accepted(struct fuse_service *sf)
> > +{
> > + return sf != NULL;
> > +}
> > +
> > +/**
> > + * Will the mount service helper accept the allow_other option?
> > + *
> > + * @param sf service context
> > + * @return true if it has, false if not
> > + */
> > +bool fuse_service_can_allow_other(struct fuse_service *sf);
> > +
> > +/**
> > + * Release all resources associated with the service context.
> > + *
> > + * @param sfp service context
> > + */
> > +void fuse_service_release(struct fuse_service *sf);
> > +
> > +/**
> > + * Destroy a service context and release all resources
> > + *
> > + * @param sfp pointer to pointer to a service context
> > + */
> > +void fuse_service_destroy(struct fuse_service **sfp);
> > +
> > +/**
> > + * Append the command line arguments from the mount service helper to an
> > + * existing fuse_args structure. The fuse_args should have been initialized
> > + * with the argc and argv passed to main().
> > + *
> > + * @param sfp service context
> > + * @param args arguments to modify (input+output)
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_append_args(struct fuse_service *sf, struct fuse_args *args);
> > +
> > +/**
> > + * Generate the effective fuse server command line from the args structure.
> > + * The args structure should be the outcome from fuse_service_append_args.
> > + * The resulting string is suitable for setproctitle and must be freed by the
> > + * callre.
> > + *
> > + * @param argc argument count passed to main()
> > + * @param argv argument vector passed to main()
> > + * @param args fuse args structure
> > + * @return effective command line string, or NULL
> > + */
> > +char *fuse_service_cmdline(int argc, char *argv[], struct fuse_args *args);
> > +
> > +struct fuse_cmdline_opts;
> > +
> > +/**
> > + * Utility function to parse common options for simple file systems
> > + * using the low-level API. A help text that describes the available
> > + * options can be printed with `fuse_cmdline_help`. A single
> > + * non-option argument is treated as the mountpoint. Multiple
> > + * non-option arguments will result in an error.
> > + *
> > + * If neither -o subtype= or -o fsname= options are given, a new
> > + * subtype option will be added and set to the basename of the program
> > + * (the fsname will remain unset, and then defaults to "fuse").
> > + *
> > + * Known options will be removed from *args*, unknown options will
> > + * remain. The mountpoint will not be checked here; that is the job of
> > + * mount.service.
> > + *
> > + * @param args argument vector (input+output)
> > + * @param opts output argument for parsed options
> > + * @return 0 on success, -1 on failure
> > + */
> > +int fuse_service_parse_cmdline_opts(struct fuse_args *args,
> > + struct fuse_cmdline_opts *opts);
> > +
> > +/**
> > + * Ask the mount.service helper to open a file on behalf of the fuse server.
> > + *
> > + * @param sf service context
> > + * @param path the path to file
> > + * @param open_flags O_ flags
> > + * @param create_mode mode with which to create the file
> > + * @param request_flags set of FUSE_SERVICE_REQUEST_* flags
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_request_file(struct fuse_service *sf, const char *path,
> > + int open_flags, mode_t create_mode,
> > + unsigned int request_flags);
> > +
> > +/**
> > + * Ask the mount.service helper to open a block device on behalf of the fuse
> > + * server.
> > + *
> > + * @param sf service context
> > + * @param path the path to file
> > + * @param open_flags O_ flags
> > + * @param create_mode mode with which to create the file
> > + * @param request_flags set of FUSE_SERVICE_REQUEST_* flags
> > + * @param block_size set the block device block size to this value
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_request_blockdev(struct fuse_service *sf, const char *path,
> > + int open_flags, mode_t create_mode,
> > + unsigned int request_flags,
> > + unsigned int block_size);
> > +
> > +/**
> > + * Receive a file previously requested.
> > + *
> > + * @param sf service context
> > + * @param path to file
> > + * @fdp pointer to file descriptor, which will be set a non-negative file
> > + * descriptor value on success, or negative errno on failure
> > + * @return 0 on success, or negative errno on socket communication failure
> > + */
> > +int fuse_service_receive_file(struct fuse_service *sf,
> > + const char *path, int *fdp);
> > +
> > +/**
> > + * Prevent the mount.service server from sending us any more open files.
> > + *
> > + * @param sf service context
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_finish_file_requests(struct fuse_service *sf);
> > +
> > +/**
> > + * Require that the filesystem mount point have the expected file format
> > + * (S_IFDIR/S_IFREG). Can be overridden when calling
> > + * fuse_service_session_mount.
> > + *
> > + * @param sf service context
> > + * @param expected_fmt expected mode (S_IFDIR/S_IFREG) for mount point, or 0
> > + * to skip checks
> > + */
> > +void fuse_service_expect_mount_mode(struct fuse_service *sf,
> > + mode_t expected_fmt);
> > +
> > +/**
> > + * Bind a FUSE file system to the fuse session inside a fuse service process,
> > + * then ask the mount.service helper to mount the filesystem for us. The fuse
> > + * client will begin sending requests to the fuse server immediately after
> > + * this.
> > + *
> > + * @param sf service context
> > + * @param se fuse session
> > + * @param expected_fmt expected mode (S_IFDIR/S_IFREG) for mount point, or 0
> > + * to skip checks
> > + * @param opts command line options
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
> > + mode_t expected_fmt,
> > + struct fuse_cmdline_opts *opts);
> > +
> > +/**
> > + * Bid farewell to the mount.service helper. It is still necessary to call
> > + * fuse_service_destroy after this.
> > + *
> > + * @param sf service context
> > + * @param exitcode fuse server process exit status
> > + * @return 0 on success, or negative errno on failure
> > + */
> > +int fuse_service_send_goodbye(struct fuse_service *sf, int exitcode);
> > +
> > +/**
> > + * Exit routine for a fuse server running as a systemd service.
> > + *
> > + * @param ret 0 for success, nonzero for service failure.
> > + * @return a value to be passed to exit() or returned from main
> > + */
> > +int fuse_service_exit(int ret);
> > +
> > +#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
> > +
> > +#ifdef __cplusplus
> > +}
> > +#endif
> > +
> > +#endif /* FUSE_SERVICE_H_ */
> > diff --git a/include/fuse_service_priv.h b/include/fuse_service_priv.h
> > new file mode 100644
> > index 00000000000000..d1fdd6221b5268
> > --- /dev/null
> > +++ b/include/fuse_service_priv.h
> > @@ -0,0 +1,127 @@
> > +/*
> > + * FUSE: Filesystem in Userspace
> > + * Copyright (C) 2025-2026 Oracle.
> > + * Author: Darrick J. Wong <djwong@kernel.org>
> > + *
> > + * This program can be distributed under the terms of the GNU LGPLv2.
> > + * See the file LGPL2.txt.
> > + */
> > +#ifndef FUSE_SERVICE_PRIV_H_
> > +#define FUSE_SERVICE_PRIV_H_
> > +
> > +/* All numeric fields are network order (big-endian) when going across the socket */
> > +
> > +struct fuse_service_memfd_arg {
> > + uint32_t pos;
> > + uint32_t len;
> > +};
> > +
> > +struct fuse_service_memfd_argv {
> > + uint32_t magic;
> > + uint32_t argc;
> > +};
> > +
> > +#define FUSE_SERVICE_ARGS_MAGIC 0x41524753 /* ARGS */
> > +
> > +/* mount.service sends a hello to the server and it replies */
> > +#define FUSE_SERVICE_HELLO_CMD 0x53414654 /* SAFT */
>
> What "SAFT" stand for? (The German meaning of the word is "juice" ;) ).
"SAFeTy", compressed.
--D
>
> Thanks,
> Bernd
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 03/17] mount_service: create high level fuse helpers
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
2026-03-27 1:25 ` [PATCH 01/17] Refactor mount code / move common functions to mount_util.c Darrick J. Wong
2026-03-27 1:25 ` [PATCH 02/17] mount_service: add systemd/inetd socket service mounting helper Darrick J. Wong
@ 2026-03-27 1:25 ` Darrick J. Wong
2026-03-30 19:37 ` Bernd Schubert
2026-03-27 1:25 ` [PATCH 04/17] mount_service: use the new mount api for the mount service Darrick J. Wong
` (13 subsequent siblings)
16 siblings, 1 reply; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:25 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Create a fuse_main wrapper for fuse services.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
include/fuse.h | 33 ++++++++++++++++++++++++++++
lib/fuse_versionscript | 1 +
lib/helper.c | 57 +++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/include/fuse.h b/include/fuse.h
index 595cac07f2be36..c7dae040857aca 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -1008,6 +1008,39 @@ static inline int fuse_main_fn(int argc, char *argv[],
#define fuse_main(argc, argv, op, user_data) \
fuse_main_fn(argc, argv, op, user_data)
+#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
+struct fuse_service;
+int fuse_service_main_real_versioned(struct fuse_service *service,
+ int argc, char *argv[],
+ const struct fuse_operations *op,
+ size_t op_size,
+ struct libfuse_version *version,
+ void *user_data);
+
+/**
+ * Same as fuse_service_main_fn, but takes its information from the mount
+ * service context.
+ */
+static inline int fuse_service_main_fn(struct fuse_service *service,
+ int argc, char *argv[],
+ const struct fuse_operations *op,
+ void *user_data)
+{
+ struct libfuse_version version = {
+ .major = FUSE_MAJOR_VERSION,
+ .minor = FUSE_MINOR_VERSION,
+ .hotfix = FUSE_HOTFIX_VERSION,
+ .padding = 0
+ };
+
+ return fuse_service_main_real_versioned(service, argc, argv, op,
+ sizeof(*(op)), &version,
+ user_data);
+}
+#define fuse_service_main(s, argc, argv, op, user_data) \
+ fuse_service_main_fn(s, argc, argv, op, user_data)
+#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
+
/* ----------------------------------------------------------- *
* More detailed API *
* ----------------------------------------------------------- */
diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 1fc73f417f90a0..43f8bf11b64548 100644
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -236,6 +236,7 @@ FUSE_3.19 {
fuse_service_exit;
fuse_service_expect_mount_mode;
fuse_service_finish_file_requests;
+ fuse_service_main_real_versioned;
fuse_service_parse_cmdline_opts;
fuse_service_receive_file;
fuse_service_release;
diff --git a/lib/helper.c b/lib/helper.c
index 533526273207d5..3509f1aa0c8f79 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -15,6 +15,7 @@
#include "fuse_misc.h"
#include "fuse_opt.h"
#include "fuse_lowlevel.h"
+#include "fuse_service.h"
#include "mount_util.h"
#include <stdio.h>
@@ -357,7 +358,8 @@ int fuse_daemonize(int foreground)
return 0;
}
-int fuse_main_real_versioned(int argc, char *argv[],
+int fuse_service_main_real_versioned(struct fuse_service *service,
+ int argc, char *argv[],
const struct fuse_operations *op, size_t op_size,
struct libfuse_version *version, void *user_data)
{
@@ -367,8 +369,15 @@ int fuse_main_real_versioned(int argc, char *argv[],
int res;
struct fuse_loop_config *loop_config = NULL;
- if (fuse_parse_cmdline(&args, &opts) != 0)
- return 1;
+ if (service) {
+ if (fuse_service_parse_cmdline_opts(&args, &opts) != 0) {
+ res = 1;
+ goto out0;
+ }
+ } else {
+ if (fuse_parse_cmdline(&args, &opts) != 0)
+ return 1;
+ }
if (opts.show_version) {
printf("FUSE library version %s\n", PACKAGE_VERSION);
@@ -405,9 +414,17 @@ int fuse_main_real_versioned(int argc, char *argv[],
goto out1;
}
- if (fuse_mount(fuse,opts.mountpoint) != 0) {
- res = 4;
- goto out2;
+ if (service) {
+ if (fuse_service_session_mount(service, fuse_get_session(fuse),
+ 0, &opts) != 0) {
+ res = 4;
+ goto out2;
+ }
+ } else {
+ if (fuse_mount(fuse, opts.mountpoint) != 0) {
+ res = 4;
+ goto out2;
+ }
}
if (fuse_daemonize(opts.foreground) != 0) {
@@ -421,9 +438,14 @@ int fuse_main_real_versioned(int argc, char *argv[],
goto out3;
}
- if (opts.singlethread)
+ if (opts.singlethread) {
+ if (service) {
+ fuse_service_send_goodbye(service, 0);
+ fuse_service_release(service);
+ }
+
res = fuse_loop(fuse);
- else {
+ } else {
loop_config = fuse_loop_cfg_create();
if (loop_config == NULL) {
res = 7;
@@ -434,6 +456,12 @@ int fuse_main_real_versioned(int argc, char *argv[],
fuse_loop_cfg_set_idle_threads(loop_config, opts.max_idle_threads);
fuse_loop_cfg_set_max_threads(loop_config, opts.max_threads);
+
+ if (service) {
+ fuse_service_send_goodbye(service, 0);
+ fuse_service_release(service);
+ }
+
res = fuse_loop_mt(fuse, loop_config);
}
if (res)
@@ -448,9 +476,22 @@ int fuse_main_real_versioned(int argc, char *argv[],
fuse_loop_cfg_destroy(loop_config);
free(opts.mountpoint);
fuse_opt_free_args(&args);
+out0:
+ if (service) {
+ fuse_service_send_goodbye(service, res);
+ fuse_service_release(service);
+ }
return res;
}
+int fuse_main_real_versioned(int argc, char *argv[],
+ const struct fuse_operations *op, size_t op_size,
+ struct libfuse_version *version, void *user_data)
+{
+ return fuse_service_main_real_versioned(NULL, argc, argv, op, op_size,
+ version, user_data);
+}
+
/* Not symboled, as not part of the official API */
int fuse_main_real_30(int argc, char *argv[], const struct fuse_operations *op,
size_t op_size, void *user_data);
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH 03/17] mount_service: create high level fuse helpers
2026-03-27 1:25 ` [PATCH 03/17] mount_service: create high level fuse helpers Darrick J. Wong
@ 2026-03-30 19:37 ` Bernd Schubert
2026-03-30 20:30 ` Darrick J. Wong
0 siblings, 1 reply; 28+ messages in thread
From: Bernd Schubert @ 2026-03-30 19:37 UTC (permalink / raw)
To: Darrick J. Wong, bschubert; +Cc: linux-fsdevel, miklos, neal, joannelkoong
Hi Darrick,
On 3/27/26 02:25, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Create a fuse_main wrapper for fuse services.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> include/fuse.h | 33 ++++++++++++++++++++++++++++
> lib/fuse_versionscript | 1 +
> lib/helper.c | 57 +++++++++++++++++++++++++++++++++++++++++-------
> 3 files changed, 83 insertions(+), 8 deletions(-)
>
>
> diff --git a/include/fuse.h b/include/fuse.h
> index 595cac07f2be36..c7dae040857aca 100644
> --- a/include/fuse.h
> +++ b/include/fuse.h
> @@ -1008,6 +1008,39 @@ static inline int fuse_main_fn(int argc, char *argv[],
> #define fuse_main(argc, argv, op, user_data) \
> fuse_main_fn(argc, argv, op, user_data)
>
> +#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
> +struct fuse_service;
> +int fuse_service_main_real_versioned(struct fuse_service *service,
> + int argc, char *argv[],
> + const struct fuse_operations *op,
> + size_t op_size,
> + struct libfuse_version *version,
> + void *user_data);
> +
> +/**
> + * Same as fuse_service_main_fn, but takes its information from the mount
> + * service context.
> + */
> +static inline int fuse_service_main_fn(struct fuse_service *service,
> + int argc, char *argv[],
> + const struct fuse_operations *op,
> + void *user_data)
> +{
> + struct libfuse_version version = {
> + .major = FUSE_MAJOR_VERSION,
> + .minor = FUSE_MINOR_VERSION,
> + .hotfix = FUSE_HOTFIX_VERSION,
> + .padding = 0
> + };
> +
> + return fuse_service_main_real_versioned(service, argc, argv, op,
> + sizeof(*(op)), &version,
> + user_data);
> +}
> +#define fuse_service_main(s, argc, argv, op, user_data) \
> + fuse_service_main_fn(s, argc, argv, op, user_data)
> +#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
sorry, this is not exactly what I meant. Could you take a look here? I
just pushed the unfinished patch I made in December. It got complicated
in the high level API and I didn't have time to finish it yet.
https://github.com/libfuse/libfuse/pull/1382/changes/24836ded18e9736eb4691600600ff1d7cf581e29
Basically I would like to add the API version to the functions, in order
to set defaults flags. The topic came up about FUSE_CAP_AUTO_INVAL_DATA,
because it can cause data corruption, but there is also a risk to cause
regressions. So would be good to set that based on the API version
(assuming people read the rather new doc/ChangeLog-API.rst).
Anyway your function should basically be
int fuse_service_main_real_versioned(struct fuse_service *service,
int argc, char *argv[],
const struct fuse_operations *op,
size_t op_size,
unsigned int user_apiabi_version,
struct libfuse_version *version,
void *user_data);
I.e. adding in 'user_apiabi_version'. Although while looking into this
again, maybe we should mis-use 'padding' and rename it 'api version. It
would definitely simplify things.
While you look into all these things, what is your opinion? ;)
Thanks,
Bernd
> +
> /* ----------------------------------------------------------- *
> * More detailed API *
> * ----------------------------------------------------------- */
> diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
> index 1fc73f417f90a0..43f8bf11b64548 100644
> --- a/lib/fuse_versionscript
> +++ b/lib/fuse_versionscript
> @@ -236,6 +236,7 @@ FUSE_3.19 {
> fuse_service_exit;
> fuse_service_expect_mount_mode;
> fuse_service_finish_file_requests;
> + fuse_service_main_real_versioned;
> fuse_service_parse_cmdline_opts;
> fuse_service_receive_file;
> fuse_service_release;
> diff --git a/lib/helper.c b/lib/helper.c
> index 533526273207d5..3509f1aa0c8f79 100644
> --- a/lib/helper.c
> +++ b/lib/helper.c
> @@ -15,6 +15,7 @@
> #include "fuse_misc.h"
> #include "fuse_opt.h"
> #include "fuse_lowlevel.h"
> +#include "fuse_service.h"
> #include "mount_util.h"
>
> #include <stdio.h>
> @@ -357,7 +358,8 @@ int fuse_daemonize(int foreground)
> return 0;
> }
>
> -int fuse_main_real_versioned(int argc, char *argv[],
> +int fuse_service_main_real_versioned(struct fuse_service *service,
> + int argc, char *argv[],
> const struct fuse_operations *op, size_t op_size,
> struct libfuse_version *version, void *user_data)
> {
> @@ -367,8 +369,15 @@ int fuse_main_real_versioned(int argc, char *argv[],
> int res;
> struct fuse_loop_config *loop_config = NULL;
>
> - if (fuse_parse_cmdline(&args, &opts) != 0)
> - return 1;
> + if (service) {
> + if (fuse_service_parse_cmdline_opts(&args, &opts) != 0) {
> + res = 1;
> + goto out0;
> + }
> + } else {
> + if (fuse_parse_cmdline(&args, &opts) != 0)
> + return 1;
> + }
>
> if (opts.show_version) {
> printf("FUSE library version %s\n", PACKAGE_VERSION);
> @@ -405,9 +414,17 @@ int fuse_main_real_versioned(int argc, char *argv[],
> goto out1;
> }
>
> - if (fuse_mount(fuse,opts.mountpoint) != 0) {
> - res = 4;
> - goto out2;
> + if (service) {
> + if (fuse_service_session_mount(service, fuse_get_session(fuse),
> + 0, &opts) != 0) {
> + res = 4;
> + goto out2;
> + }
> + } else {
> + if (fuse_mount(fuse, opts.mountpoint) != 0) {
> + res = 4;
> + goto out2;
> + }
> }
>
> if (fuse_daemonize(opts.foreground) != 0) {
> @@ -421,9 +438,14 @@ int fuse_main_real_versioned(int argc, char *argv[],
> goto out3;
> }
>
> - if (opts.singlethread)
> + if (opts.singlethread) {
> + if (service) {
> + fuse_service_send_goodbye(service, 0);
> + fuse_service_release(service);
> + }
> +
> res = fuse_loop(fuse);
> - else {
> + } else {
> loop_config = fuse_loop_cfg_create();
> if (loop_config == NULL) {
> res = 7;
> @@ -434,6 +456,12 @@ int fuse_main_real_versioned(int argc, char *argv[],
>
> fuse_loop_cfg_set_idle_threads(loop_config, opts.max_idle_threads);
> fuse_loop_cfg_set_max_threads(loop_config, opts.max_threads);
> +
> + if (service) {
> + fuse_service_send_goodbye(service, 0);
> + fuse_service_release(service);
> + }
> +
> res = fuse_loop_mt(fuse, loop_config);
> }
> if (res)
> @@ -448,9 +476,22 @@ int fuse_main_real_versioned(int argc, char *argv[],
> fuse_loop_cfg_destroy(loop_config);
> free(opts.mountpoint);
> fuse_opt_free_args(&args);
> +out0:
> + if (service) {
> + fuse_service_send_goodbye(service, res);
> + fuse_service_release(service);
> + }
> return res;
> }
>
> +int fuse_main_real_versioned(int argc, char *argv[],
> + const struct fuse_operations *op, size_t op_size,
> + struct libfuse_version *version, void *user_data)
> +{
> + return fuse_service_main_real_versioned(NULL, argc, argv, op, op_size,
> + version, user_data);
> +}
> +
> /* Not symboled, as not part of the official API */
> int fuse_main_real_30(int argc, char *argv[], const struct fuse_operations *op,
> size_t op_size, void *user_data);
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 03/17] mount_service: create high level fuse helpers
2026-03-30 19:37 ` Bernd Schubert
@ 2026-03-30 20:30 ` Darrick J. Wong
2026-03-30 20:51 ` Bernd Schubert
0 siblings, 1 reply; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-30 20:30 UTC (permalink / raw)
To: Bernd Schubert; +Cc: bschubert, linux-fsdevel, miklos, neal, joannelkoong
On Mon, Mar 30, 2026 at 09:37:18PM +0200, Bernd Schubert wrote:
> Hi Darrick,
>
> On 3/27/26 02:25, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> >
> > Create a fuse_main wrapper for fuse services.
> >
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > ---
> > include/fuse.h | 33 ++++++++++++++++++++++++++++
> > lib/fuse_versionscript | 1 +
> > lib/helper.c | 57 +++++++++++++++++++++++++++++++++++++++++-------
> > 3 files changed, 83 insertions(+), 8 deletions(-)
> >
> >
> > diff --git a/include/fuse.h b/include/fuse.h
> > index 595cac07f2be36..c7dae040857aca 100644
> > --- a/include/fuse.h
> > +++ b/include/fuse.h
> > @@ -1008,6 +1008,39 @@ static inline int fuse_main_fn(int argc, char *argv[],
> > #define fuse_main(argc, argv, op, user_data) \
> > fuse_main_fn(argc, argv, op, user_data)
> >
> > +#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
> > +struct fuse_service;
> > +int fuse_service_main_real_versioned(struct fuse_service *service,
> > + int argc, char *argv[],
> > + const struct fuse_operations *op,
> > + size_t op_size,
> > + struct libfuse_version *version,
> > + void *user_data);
> > +
> > +/**
> > + * Same as fuse_service_main_fn, but takes its information from the mount
> > + * service context.
> > + */
> > +static inline int fuse_service_main_fn(struct fuse_service *service,
> > + int argc, char *argv[],
> > + const struct fuse_operations *op,
> > + void *user_data)
> > +{
> > + struct libfuse_version version = {
> > + .major = FUSE_MAJOR_VERSION,
> > + .minor = FUSE_MINOR_VERSION,
> > + .hotfix = FUSE_HOTFIX_VERSION,
> > + .padding = 0
> > + };
> > +
> > + return fuse_service_main_real_versioned(service, argc, argv, op,
> > + sizeof(*(op)), &version,
> > + user_data);
> > +}
> > +#define fuse_service_main(s, argc, argv, op, user_data) \
> > + fuse_service_main_fn(s, argc, argv, op, user_data)
> > +#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
>
> sorry, this is not exactly what I meant. Could you take a look here? I
OH, you want the program to pass in both the version of libfuse that the
program was built against (struct libfuse_version) and the version of
libfuse that the program asked for (FUSE_USE_VERSION). Not just header
guards.
> just pushed the unfinished patch I made in December. It got complicated
> in the high level API and I didn't have time to finish it yet.
Yes, that does make sense for setting defaults based on the version of
the libfuse API that the fuse server expects.
> https://github.com/libfuse/libfuse/pull/1382/changes/24836ded18e9736eb4691600600ff1d7cf581e29
>
> Basically I would like to add the API version to the functions, in order
> to set defaults flags. The topic came up about FUSE_CAP_AUTO_INVAL_DATA,
> because it can cause data corruption, but there is also a risk to cause
> regressions. So would be good to set that based on the API version
> (assuming people read the rather new doc/ChangeLog-API.rst).
>
> Anyway your function should basically be
>
> int fuse_service_main_real_versioned(struct fuse_service *service,
> int argc, char *argv[],
> const struct fuse_operations *op,
> size_t op_size,
> unsigned int user_apiabi_version,
> struct libfuse_version *version,
> void *user_data);
>
>
> I.e. adding in 'user_apiabi_version'. Although while looking into this
> again, maybe we should mis-use 'padding' and rename it 'api version. It
> would definitely simplify things.
>
>
> While you look into all these things, what is your opinion? ;)
I like the idea of encoding the FUSE_USE_VERSION as the padding value.
I wonder if there's a danger of a client setting the fields manually:
struct libfuse_version version;
version.major = FUSE_MAJOR_VERSION;
version.minor = FUSE_MINOR_VERSION;
version.hotfix = FUSE_HOTFIX_VERSION;
fuse_main_real_versioned(..., &version...);
such that version.padding is now set to stack garbage? The wrapper
functions in fuse.h use struct initialization so the .padding value will
be zero, but fuse_session_new_versioned doesn't appear to require zero,
which makes such a change a bit risky.
Debian codesearch seems to think there aren't any direct callers of
fuse_session_new_versioned or fuse_main_real_versioned outside of fuse,
so this might not be a big risk.
If the risk is acceptable, it would reduce the amount of code changes to
add the FUSE_USE_VERSION number and force programs to #define it before
#include'ing fuse.h.
The existing functions that take a struct libfuse_version could just
ignore values like 0 or values that arent't in the range 30-39 or
310-319. That might be enough to avoid complaints.
--D
>
> Thanks,
> Bernd
>
> > +
> > /* ----------------------------------------------------------- *
> > * More detailed API *
> > * ----------------------------------------------------------- */
> > diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
> > index 1fc73f417f90a0..43f8bf11b64548 100644
> > --- a/lib/fuse_versionscript
> > +++ b/lib/fuse_versionscript
> > @@ -236,6 +236,7 @@ FUSE_3.19 {
> > fuse_service_exit;
> > fuse_service_expect_mount_mode;
> > fuse_service_finish_file_requests;
> > + fuse_service_main_real_versioned;
> > fuse_service_parse_cmdline_opts;
> > fuse_service_receive_file;
> > fuse_service_release;
> > diff --git a/lib/helper.c b/lib/helper.c
> > index 533526273207d5..3509f1aa0c8f79 100644
> > --- a/lib/helper.c
> > +++ b/lib/helper.c
> > @@ -15,6 +15,7 @@
> > #include "fuse_misc.h"
> > #include "fuse_opt.h"
> > #include "fuse_lowlevel.h"
> > +#include "fuse_service.h"
> > #include "mount_util.h"
> >
> > #include <stdio.h>
> > @@ -357,7 +358,8 @@ int fuse_daemonize(int foreground)
> > return 0;
> > }
> >
> > -int fuse_main_real_versioned(int argc, char *argv[],
> > +int fuse_service_main_real_versioned(struct fuse_service *service,
> > + int argc, char *argv[],
> > const struct fuse_operations *op, size_t op_size,
> > struct libfuse_version *version, void *user_data)
> > {
> > @@ -367,8 +369,15 @@ int fuse_main_real_versioned(int argc, char *argv[],
> > int res;
> > struct fuse_loop_config *loop_config = NULL;
> >
> > - if (fuse_parse_cmdline(&args, &opts) != 0)
> > - return 1;
> > + if (service) {
> > + if (fuse_service_parse_cmdline_opts(&args, &opts) != 0) {
> > + res = 1;
> > + goto out0;
> > + }
> > + } else {
> > + if (fuse_parse_cmdline(&args, &opts) != 0)
> > + return 1;
> > + }
> >
> > if (opts.show_version) {
> > printf("FUSE library version %s\n", PACKAGE_VERSION);
> > @@ -405,9 +414,17 @@ int fuse_main_real_versioned(int argc, char *argv[],
> > goto out1;
> > }
> >
> > - if (fuse_mount(fuse,opts.mountpoint) != 0) {
> > - res = 4;
> > - goto out2;
> > + if (service) {
> > + if (fuse_service_session_mount(service, fuse_get_session(fuse),
> > + 0, &opts) != 0) {
> > + res = 4;
> > + goto out2;
> > + }
> > + } else {
> > + if (fuse_mount(fuse, opts.mountpoint) != 0) {
> > + res = 4;
> > + goto out2;
> > + }
> > }
> >
> > if (fuse_daemonize(opts.foreground) != 0) {
> > @@ -421,9 +438,14 @@ int fuse_main_real_versioned(int argc, char *argv[],
> > goto out3;
> > }
> >
> > - if (opts.singlethread)
> > + if (opts.singlethread) {
> > + if (service) {
> > + fuse_service_send_goodbye(service, 0);
> > + fuse_service_release(service);
> > + }
> > +
> > res = fuse_loop(fuse);
> > - else {
> > + } else {
> > loop_config = fuse_loop_cfg_create();
> > if (loop_config == NULL) {
> > res = 7;
> > @@ -434,6 +456,12 @@ int fuse_main_real_versioned(int argc, char *argv[],
> >
> > fuse_loop_cfg_set_idle_threads(loop_config, opts.max_idle_threads);
> > fuse_loop_cfg_set_max_threads(loop_config, opts.max_threads);
> > +
> > + if (service) {
> > + fuse_service_send_goodbye(service, 0);
> > + fuse_service_release(service);
> > + }
> > +
> > res = fuse_loop_mt(fuse, loop_config);
> > }
> > if (res)
> > @@ -448,9 +476,22 @@ int fuse_main_real_versioned(int argc, char *argv[],
> > fuse_loop_cfg_destroy(loop_config);
> > free(opts.mountpoint);
> > fuse_opt_free_args(&args);
> > +out0:
> > + if (service) {
> > + fuse_service_send_goodbye(service, res);
> > + fuse_service_release(service);
> > + }
> > return res;
> > }
> >
> > +int fuse_main_real_versioned(int argc, char *argv[],
> > + const struct fuse_operations *op, size_t op_size,
> > + struct libfuse_version *version, void *user_data)
> > +{
> > + return fuse_service_main_real_versioned(NULL, argc, argv, op, op_size,
> > + version, user_data);
> > +}
> > +
> > /* Not symboled, as not part of the official API */
> > int fuse_main_real_30(int argc, char *argv[], const struct fuse_operations *op,
> > size_t op_size, void *user_data);
> >
> >
>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 03/17] mount_service: create high level fuse helpers
2026-03-30 20:30 ` Darrick J. Wong
@ 2026-03-30 20:51 ` Bernd Schubert
2026-03-30 21:09 ` Darrick J. Wong
0 siblings, 1 reply; 28+ messages in thread
From: Bernd Schubert @ 2026-03-30 20:51 UTC (permalink / raw)
To: Darrick J. Wong, Bernd Schubert
Cc: linux-fsdevel@vger.kernel.org, miklos@szeredi.hu, neal@gompa.dev,
joannelkoong@gmail.com
On 3/30/26 22:30, Darrick J. Wong wrote:
> On Mon, Mar 30, 2026 at 09:37:18PM +0200, Bernd Schubert wrote:
>> Hi Darrick,
>>
>> On 3/27/26 02:25, Darrick J. Wong wrote:
>>> From: Darrick J. Wong <djwong@kernel.org>
>>>
>>> Create a fuse_main wrapper for fuse services.
>>>
>>> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
>>> ---
>>> include/fuse.h | 33 ++++++++++++++++++++++++++++
>>> lib/fuse_versionscript | 1 +
>>> lib/helper.c | 57 +++++++++++++++++++++++++++++++++++++++++-------
>>> 3 files changed, 83 insertions(+), 8 deletions(-)
>>>
>>>
>>> diff --git a/include/fuse.h b/include/fuse.h
>>> index 595cac07f2be36..c7dae040857aca 100644
>>> --- a/include/fuse.h
>>> +++ b/include/fuse.h
>>> @@ -1008,6 +1008,39 @@ static inline int fuse_main_fn(int argc, char *argv[],
>>> #define fuse_main(argc, argv, op, user_data) \
>>> fuse_main_fn(argc, argv, op, user_data)
>>>
>>> +#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
>>> +struct fuse_service;
>>> +int fuse_service_main_real_versioned(struct fuse_service *service,
>>> + int argc, char *argv[],
>>> + const struct fuse_operations *op,
>>> + size_t op_size,
>>> + struct libfuse_version *version,
>>> + void *user_data);
>>> +
>>> +/**
>>> + * Same as fuse_service_main_fn, but takes its information from the mount
>>> + * service context.
>>> + */
>>> +static inline int fuse_service_main_fn(struct fuse_service *service,
>>> + int argc, char *argv[],
>>> + const struct fuse_operations *op,
>>> + void *user_data)
>>> +{
>>> + struct libfuse_version version = {
>>> + .major = FUSE_MAJOR_VERSION,
>>> + .minor = FUSE_MINOR_VERSION,
>>> + .hotfix = FUSE_HOTFIX_VERSION,
>>> + .padding = 0
>>> + };
>>> +
>>> + return fuse_service_main_real_versioned(service, argc, argv, op,
>>> + sizeof(*(op)), &version,
>>> + user_data);
>>> +}
>>> +#define fuse_service_main(s, argc, argv, op, user_data) \
>>> + fuse_service_main_fn(s, argc, argv, op, user_data)
>>> +#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
>>
>> sorry, this is not exactly what I meant. Could you take a look here? I
>
> OH, you want the program to pass in both the version of libfuse that the
> program was built against (struct libfuse_version) and the version of
> libfuse that the program asked for (FUSE_USE_VERSION). Not just header
> guards.
I don't think we need the header guards, I think these are more for the
case the API changes. With just additions there cannot break anything?
>
>> just pushed the unfinished patch I made in December. It got complicated
>> in the high level API and I didn't have time to finish it yet.
>
> Yes, that does make sense for setting defaults based on the version of
> the libfuse API that the fuse server expects.
>
>> https://github.com/libfuse/libfuse/pull/1382/changes/24836ded18e9736eb4691600600ff1d7cf581e29
>>
>> Basically I would like to add the API version to the functions, in order
>> to set defaults flags. The topic came up about FUSE_CAP_AUTO_INVAL_DATA,
>> because it can cause data corruption, but there is also a risk to cause
>> regressions. So would be good to set that based on the API version
>> (assuming people read the rather new doc/ChangeLog-API.rst).
>>
>> Anyway your function should basically be
>>
>> int fuse_service_main_real_versioned(struct fuse_service *service,
>> int argc, char *argv[],
>> const struct fuse_operations *op,
>> size_t op_size,
>> unsigned int user_apiabi_version,
>> struct libfuse_version *version,
>> void *user_data);
>>
>>
>> I.e. adding in 'user_apiabi_version'. Although while looking into this
>> again, maybe we should mis-use 'padding' and rename it 'api version. It
>> would definitely simplify things.
>>
>>
>> While you look into all these things, what is your opinion? ;)
>
> I like the idea of encoding the FUSE_USE_VERSION as the padding value.
> I wonder if there's a danger of a client setting the fields manually:
>
> struct libfuse_version version;
>
> version.major = FUSE_MAJOR_VERSION;
> version.minor = FUSE_MINOR_VERSION;
> version.hotfix = FUSE_HOTFIX_VERSION;
>
> fuse_main_real_versioned(..., &version...);
>
> such that version.padding is now set to stack garbage? The wrapper
> functions in fuse.h use struct initialization so the .padding value will
> be zero, but fuse_session_new_versioned doesn't appear to require zero,
> which makes such a change a bit risky.
>
> Debian codesearch seems to think there aren't any direct callers of
> fuse_session_new_versioned or fuse_main_real_versioned outside of fuse,
> so this might not be a big risk.
>
> If the risk is acceptable, it would reduce the amount of code changes to
> add the FUSE_USE_VERSION number and force programs to #define it before
> #include'ing fuse.h.
>
> The existing functions that take a struct libfuse_version could just
> ignore values like 0 or values that arent't in the range 30-39 or
> 310-319. That might be enough to avoid complaints.
Hmm yeah, there a bit risk people people who access these functions with
dlopen. My personal opinion is that one should not directly access
libfuse functions, but write a wrapper lib, correctly define the API
version in that lib and then dlopen the wrapper lib.
I need to think about it again, thanks for pointing that out!
Cheers,
Bernd
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 03/17] mount_service: create high level fuse helpers
2026-03-30 20:51 ` Bernd Schubert
@ 2026-03-30 21:09 ` Darrick J. Wong
0 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-30 21:09 UTC (permalink / raw)
To: Bernd Schubert
Cc: Bernd Schubert, linux-fsdevel@vger.kernel.org, miklos@szeredi.hu,
neal@gompa.dev, joannelkoong@gmail.com
On Mon, Mar 30, 2026 at 08:51:01PM +0000, Bernd Schubert wrote:
> On 3/30/26 22:30, Darrick J. Wong wrote:
> > On Mon, Mar 30, 2026 at 09:37:18PM +0200, Bernd Schubert wrote:
> >> Hi Darrick,
> >>
> >> On 3/27/26 02:25, Darrick J. Wong wrote:
> >>> From: Darrick J. Wong <djwong@kernel.org>
> >>>
> >>> Create a fuse_main wrapper for fuse services.
> >>>
> >>> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> >>> ---
> >>> include/fuse.h | 33 ++++++++++++++++++++++++++++
> >>> lib/fuse_versionscript | 1 +
> >>> lib/helper.c | 57 +++++++++++++++++++++++++++++++++++++++++-------
> >>> 3 files changed, 83 insertions(+), 8 deletions(-)
> >>>
> >>>
> >>> diff --git a/include/fuse.h b/include/fuse.h
> >>> index 595cac07f2be36..c7dae040857aca 100644
> >>> --- a/include/fuse.h
> >>> +++ b/include/fuse.h
> >>> @@ -1008,6 +1008,39 @@ static inline int fuse_main_fn(int argc, char *argv[],
> >>> #define fuse_main(argc, argv, op, user_data) \
> >>> fuse_main_fn(argc, argv, op, user_data)
> >>>
> >>> +#if FUSE_MAKE_VERSION(3, 19) <= FUSE_USE_VERSION
> >>> +struct fuse_service;
> >>> +int fuse_service_main_real_versioned(struct fuse_service *service,
> >>> + int argc, char *argv[],
> >>> + const struct fuse_operations *op,
> >>> + size_t op_size,
> >>> + struct libfuse_version *version,
> >>> + void *user_data);
> >>> +
> >>> +/**
> >>> + * Same as fuse_service_main_fn, but takes its information from the mount
> >>> + * service context.
> >>> + */
> >>> +static inline int fuse_service_main_fn(struct fuse_service *service,
> >>> + int argc, char *argv[],
> >>> + const struct fuse_operations *op,
> >>> + void *user_data)
> >>> +{
> >>> + struct libfuse_version version = {
> >>> + .major = FUSE_MAJOR_VERSION,
> >>> + .minor = FUSE_MINOR_VERSION,
> >>> + .hotfix = FUSE_HOTFIX_VERSION,
> >>> + .padding = 0
> >>> + };
> >>> +
> >>> + return fuse_service_main_real_versioned(service, argc, argv, op,
> >>> + sizeof(*(op)), &version,
> >>> + user_data);
> >>> +}
> >>> +#define fuse_service_main(s, argc, argv, op, user_data) \
> >>> + fuse_service_main_fn(s, argc, argv, op, user_data)
> >>> +#endif /* FUSE_USE_VERSION >= FUSE_MAKE_VERSION(3, 19) */
> >>
> >> sorry, this is not exactly what I meant. Could you take a look here? I
> >
> > OH, you want the program to pass in both the version of libfuse that the
> > program was built against (struct libfuse_version) and the version of
> > libfuse that the program asked for (FUSE_USE_VERSION). Not just header
> > guards.
>
> I don't think we need the header guards, I think these are more for the
> case the API changes. With just additions there cannot break anything?
>
> >
> >> just pushed the unfinished patch I made in December. It got complicated
> >> in the high level API and I didn't have time to finish it yet.
> >
> > Yes, that does make sense for setting defaults based on the version of
> > the libfuse API that the fuse server expects.
> >
> >> https://github.com/libfuse/libfuse/pull/1382/changes/24836ded18e9736eb4691600600ff1d7cf581e29
> >>
> >> Basically I would like to add the API version to the functions, in order
> >> to set defaults flags. The topic came up about FUSE_CAP_AUTO_INVAL_DATA,
> >> because it can cause data corruption, but there is also a risk to cause
> >> regressions. So would be good to set that based on the API version
> >> (assuming people read the rather new doc/ChangeLog-API.rst).
> >>
> >> Anyway your function should basically be
> >>
> >> int fuse_service_main_real_versioned(struct fuse_service *service,
> >> int argc, char *argv[],
> >> const struct fuse_operations *op,
> >> size_t op_size,
> >> unsigned int user_apiabi_version,
> >> struct libfuse_version *version,
> >> void *user_data);
> >>
> >>
> >> I.e. adding in 'user_apiabi_version'. Although while looking into this
> >> again, maybe we should mis-use 'padding' and rename it 'api version. It
> >> would definitely simplify things.
> >>
> >>
> >> While you look into all these things, what is your opinion? ;)
> >
> > I like the idea of encoding the FUSE_USE_VERSION as the padding value.
> > I wonder if there's a danger of a client setting the fields manually:
> >
> > struct libfuse_version version;
> >
> > version.major = FUSE_MAJOR_VERSION;
> > version.minor = FUSE_MINOR_VERSION;
> > version.hotfix = FUSE_HOTFIX_VERSION;
> >
> > fuse_main_real_versioned(..., &version...);
> >
> > such that version.padding is now set to stack garbage? The wrapper
> > functions in fuse.h use struct initialization so the .padding value will
> > be zero, but fuse_session_new_versioned doesn't appear to require zero,
> > which makes such a change a bit risky.
> >
> > Debian codesearch seems to think there aren't any direct callers of
> > fuse_session_new_versioned or fuse_main_real_versioned outside of fuse,
> > so this might not be a big risk.
> >
> > If the risk is acceptable, it would reduce the amount of code changes to
> > add the FUSE_USE_VERSION number and force programs to #define it before
> > #include'ing fuse.h.
> >
> > The existing functions that take a struct libfuse_version could just
> > ignore values like 0 or values that arent't in the range 30-39 or
> > 310-319. That might be enough to avoid complaints.
>
> Hmm yeah, there a bit risk people people who access these functions with
> dlopen. My personal opinion is that one should not directly access
> libfuse functions, but write a wrapper lib, correctly define the API
> version in that lib and then dlopen the wrapper lib.
> I need to think about it again, thanks for pointing that out!
libfuse could restrict itself to failing only 1-29 and 40-309, and
warning on otherwise crazy versions:
#define FUSE_MAKE_VERSION_OLD(maj, min) ((maj) * 10 + (min))
static inline bool validate_version(const struct libfuse_version *version,
size_t op_size)
{
if (version == NULL) {
fuse_log(FUSE_LOG_ERR, "fuse: warning: version not passed to fuse_session_new()\n");
return false;
}
/* padding got turned into fuse api level, so zero is still accepted */
if (version->padding == 0)
return true;
/* 3.0 -> 3.9 had one format for FUSE_MAKE_VERSION */
if (version->padding >= FUSE_MAKE_VERSION_OLD(3, 0) &&
version->padding <= FUSE_MAKE_VERSION_OLD(3, 9))
return true;
/* 3.10+ has a different format for FUSE_MAKE_VERSION */
if (version->padding >= FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, 0)) {
/*
* Warn about too-new versions if we aren't going to print the
* op_size warning below.
*/
if (version->padding > FUSE_VERSION &&
sizeof(struct fuse_lowlevel_ops) >= op_size)
fuse_log(FUSE_LOG_ERR,
"fuse: warning: library too old, some operations may not work\n");
return true;
}
fuse_log(FUSE_LOG_ERR, "fuse: warning: version %u not recognized\n",
version->padding);
return false;
}
A good question is, what format will FUSE_MAKE_VERSION have with 4.x?. :)
--D
>
> Cheers,
> Bernd
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 04/17] mount_service: use the new mount api for the mount service
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (2 preceding siblings ...)
2026-03-27 1:25 ` [PATCH 03/17] mount_service: create high level fuse helpers Darrick J. Wong
@ 2026-03-27 1:25 ` Darrick J. Wong
2026-03-30 21:06 ` Bernd Schubert
2026-03-27 1:26 ` [PATCH 05/17] mount_service: update mtab after a successful mount Darrick J. Wong
` (12 subsequent siblings)
16 siblings, 1 reply; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:25 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Use the new fsopen/fsmount system calls to mount the filesystem so that
we get somewhat better diagnostics if something gets screwed up.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
meson.build | 15 +++
util/mount_service.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 314 insertions(+)
diff --git a/meson.build b/meson.build
index d6ba8740effd5c..b0988548bf806a 100644
--- a/meson.build
+++ b/meson.build
@@ -130,6 +130,21 @@ special_funcs = {
int main(int argc, char *argv[]) {
return SD_LISTEN_FDS_START;
}
+ ''',
+ 'new_mount_api': '''
+ #define _GNU_SOURCE
+ #include <sys/mount.h>
+ #include <linux/mount.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+
+ int main(void) {
+ int fsfd = fsopen("fuse", FSOPEN_CLOEXEC);
+ int res = fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0);
+ int mntfd = fsmount(fsfd, FSMOUNT_CLOEXEC, 0);
+ res = move_mount(mntfd, "", AT_FDCWD, "/mnt", MOVE_MOUNT_F_EMPTY_PATH);
+ return 0;
+ }
'''
}
diff --git a/util/mount_service.c b/util/mount_service.c
index ae078e537dc560..4a2c1111b66b91 100644
--- a/util/mount_service.c
+++ b/util/mount_service.c
@@ -65,6 +65,9 @@ struct mount_service {
/* O_PATH fd for mount point */
int mountfd;
+
+ /* fd for fsopen */
+ int fsopenfd;
};
/* Filter out the subtype of the filesystem (e.g. fuse.Y -> Y) */
@@ -87,6 +90,7 @@ static int mount_service_init(struct mount_service *mo, int argc, char *argv[])
mo->argvfd = -1;
mo->fusedevfd = -1;
mo->mountfd = -1;
+ mo->fsopenfd = -1;
for (i = 0; i < argc; i++) {
if (!strcmp(argv[i], "-t") && i + 1 < argc) {
@@ -690,9 +694,50 @@ static int mount_service_handle_fsopen_cmd(struct mount_service *mo,
return mount_service_send_reply(mo, error);
}
+#ifdef HAVE_NEW_MOUNT_API
+ /* If this fails we fall back on mount() */
+ mo->fsopenfd = fsopen(oc->value, FSOPEN_CLOEXEC);
+#endif
+
return mount_service_send_reply(mo, 0);
}
+#ifdef HAVE_NEW_MOUNT_API
+/* callers must preserve errno */
+static void emit_fsconfig_messages(const struct mount_service *mo)
+{
+ uint8_t buf[BUFSIZ];
+ ssize_t sz;
+
+ while ((sz = read(mo->fsopenfd, buf, sizeof(buf) - 1)) != -1) {
+ if (sz <= 0)
+ continue;
+ if (buf[sz - 1] == '\n')
+ buf[--sz] = '\0';
+ else
+ buf[sz] = '\0';
+
+ if (!*buf)
+ continue;
+
+ switch (buf[0]) {
+ case 'e':
+ fprintf(stderr, "Error: %s\n", buf + 2);
+ break;
+ case 'w':
+ fprintf(stderr, "Warning: %s\n", buf + 2);
+ break;
+ case 'i':
+ fprintf(stderr, "Info: %s\n", buf + 2);
+ break;
+ default:
+ fprintf(stderr, " %s\n", buf);
+ break;
+ }
+ }
+}
+#endif
+
static int mount_service_handle_source_cmd(struct mount_service *mo,
const struct fuse_service_packet *p)
{
@@ -714,6 +759,21 @@ static int mount_service_handle_source_cmd(struct mount_service *mo,
return mount_service_send_reply(mo, error);
}
+#ifdef HAVE_NEW_MOUNT_API
+ if (mo->fsopenfd >= 0) {
+ int ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "source",
+ oc->value, 0);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: fsconfig source: %s\n",
+ mo->msgtag, strerror(error));
+ emit_fsconfig_messages(mo);
+ return mount_service_send_reply(mo, error);
+ }
+ }
+#endif
+
return mount_service_send_reply(mo, 0);
}
@@ -722,6 +782,8 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
{
struct fuse_service_string_command *oc =
container_of(p, struct fuse_service_string_command, p);
+ char *tokstr = oc->value;
+ char *tok, *savetok;
if (mo->mntopts) {
fprintf(stderr, "%s: mount options respecified!\n",
@@ -738,6 +800,45 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
return mount_service_send_reply(mo, error);
}
+ /* strtok_r mutates tokstr aka oc->value */
+ while ((tok = strtok_r(tokstr, ",", &savetok)) != NULL) {
+ char *equals = strchr(tok, '=');
+ char oldchar = 0;
+
+ if (equals) {
+ oldchar = *equals;
+ *equals = 0;
+ }
+
+#ifdef HAVE_NEW_MOUNT_API
+ if (mo->fsopenfd >= 0) {
+ int ret;
+
+ if (equals)
+ ret = fsconfig(mo->fsopenfd,
+ FSCONFIG_SET_STRING, tok,
+ equals + 1, 0);
+ else
+ ret = fsconfig(mo->fsopenfd,
+ FSCONFIG_SET_FLAG, tok,
+ NULL, 0);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: set mount option: %s\n",
+ mo->msgtag, strerror(error));
+ emit_fsconfig_messages(mo);
+ return mount_service_send_reply(mo, error);
+ }
+ }
+#endif
+
+ if (equals)
+ *equals = oldchar;
+
+ tokstr = NULL;
+ }
+
return mount_service_send_reply(mo, 0);
}
@@ -875,6 +976,196 @@ static int mount_service_regular_mount(struct mount_service *mo,
return mount_service_send_reply(mo, 0);
}
+#ifdef HAVE_NEW_MOUNT_API
+struct ms_to_mount_map {
+ unsigned long ms_flag;
+ unsigned int mount_attr_flag;
+};
+
+static const struct ms_to_mount_map attrs[] = {
+ { MS_RDONLY, MOUNT_ATTR_RDONLY },
+ { MS_NOSUID, MOUNT_ATTR_NOSUID },
+ { MS_NODEV, MOUNT_ATTR_NODEV },
+ { MS_NOEXEC, MOUNT_ATTR_NOEXEC },
+ { MS_RELATIME, MOUNT_ATTR_RELATIME },
+ { MS_NOATIME, MOUNT_ATTR_NOATIME },
+ { MS_STRICTATIME, MOUNT_ATTR_STRICTATIME },
+ { MS_NODIRATIME, MOUNT_ATTR_NODIRATIME },
+#ifdef MOUNT_ATTR_NOSYMFOLLOW
+ { MS_NOSYMFOLLOW, MOUNT_ATTR_NOSYMFOLLOW },
+#endif
+ { 0, 0 },
+};
+
+static void get_mount_attr_flags(const struct fuse_service_mount_command *oc,
+ unsigned int *attr_flags,
+ unsigned long *leftover_ms_flags)
+{
+ const struct ms_to_mount_map *i;
+ unsigned int ms_flags = ntohl(oc->ms_flags);
+ unsigned int mount_attr_flags = 0;
+
+ for (i = attrs; i->ms_flag != 0; i++) {
+ if (ms_flags & i->ms_flag)
+ mount_attr_flags |= i->mount_attr_flag;
+ ms_flags &= ~i->ms_flag;
+ }
+
+ *leftover_ms_flags = ms_flags;
+ *attr_flags = mount_attr_flags;
+}
+
+struct ms_to_str_map {
+ unsigned long ms_flag;
+ const char *string;
+};
+
+static const struct ms_to_str_map strflags[] = {
+ { MS_SYNCHRONOUS, "sync" },
+ { MS_DIRSYNC, "dirsync" },
+ { MS_LAZYTIME, "lazytime" },
+ { 0, 0 },
+};
+
+static int set_ms_flags(struct mount_service *mo, unsigned long ms_flags)
+{
+ const struct ms_to_str_map *i;
+ int ret;
+
+ for (i = strflags; i->ms_flag != 0; i++) {
+ if (!(ms_flags & i->ms_flag))
+ continue;
+
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_FLAG, i->string,
+ NULL, 0);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: set %s option: %s\n",
+ mo->msgtag, i->string, strerror(error));
+ emit_fsconfig_messages(mo);
+
+ errno = error;
+ return -1;
+ }
+ ms_flags &= ~i->ms_flag;
+ }
+
+ /*
+ * We can't translate all the supplied MS_ flags into MOUNT_ATTR_ flags
+ * or string flags! Return a magic code so the caller will fall back
+ * to regular mount(2).
+ */
+ return ms_flags ? -2 : 0;
+}
+
+static int mount_service_fsopen_mount(struct mount_service *mo,
+ struct fuse_service_mount_command *oc,
+ struct stat *stbuf)
+{
+ char tmp[64];
+ char *dot;
+ unsigned long ms_flags;
+ unsigned int attr_flags;
+ int mfd;
+ int error;
+ int ret;
+
+ get_mount_attr_flags(oc, &attr_flags, &ms_flags);
+
+ ret = set_ms_flags(mo, ms_flags);
+ if (ret == -2)
+ return ret;
+ if (ret) {
+ error = errno;
+ goto fail_mount;
+ }
+
+ snprintf(tmp, sizeof(tmp), "%i", mo->fusedevfd);
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "fd", tmp, 0);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: set fd option: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+
+ snprintf(tmp, sizeof(tmp), "%o", stbuf->st_mode & S_IFMT);
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "rootmode", tmp, 0);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: set rootmode option: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+
+ snprintf(tmp, sizeof(tmp), "%u", getuid());
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "user_id", tmp, 0);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: set user_id option: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+
+ snprintf(tmp, sizeof(tmp), "%u", getgid());
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "group_id", tmp, 0);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: set group_id option: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+
+ dot = strchr(mo->fstype, '.');
+ if (dot) {
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "subtype",
+ dot + 1, 0);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: set subtype option: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+ }
+
+ ret = fsconfig(mo->fsopenfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: creating filesystem: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+
+ mfd = fsmount(mo->fsopenfd, FSMOUNT_CLOEXEC, attr_flags);
+ if (mfd < 0) {
+ error = errno;
+ fprintf(stderr, "%s: fsmount: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_fsconfig;
+ }
+
+ ret = move_mount(mfd, "", mo->mountfd, "",
+ MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH);
+ close(mfd);
+ if (ret) {
+ error = errno;
+ fprintf(stderr, "%s: move_mount: %s\n",
+ mo->msgtag, strerror(error));
+ goto fail_mount;
+ }
+
+ return mount_service_send_reply(mo, 0);
+
+fail_fsconfig:
+ emit_fsconfig_messages(mo);
+fail_mount:
+ return mount_service_send_reply(mo, error);
+}
+#else
+# define mount_service_fsopen_mount(...) (-2)
+#endif
+
static int mount_service_handle_mount_cmd(struct mount_service *mo,
struct fuse_service_packet *p)
{
@@ -949,6 +1240,12 @@ static int mount_service_handle_mount_cmd(struct mount_service *mo,
return mount_service_send_reply(mo, EINVAL);
}
+ if (mo->fsopenfd >= 0) {
+ ret = mount_service_fsopen_mount(mo, oc, &stbuf);
+ if (ret != -2)
+ return ret;
+ }
+
return mount_service_regular_mount(mo, oc, &stbuf);
}
@@ -971,6 +1268,7 @@ static void mount_service_destroy(struct mount_service *mo)
close(mo->mountfd);
close(mo->fusedevfd);
close(mo->argvfd);
+ close(mo->fsopenfd);
shutdown(mo->sockfd, SHUT_RDWR);
close(mo->sockfd);
@@ -984,6 +1282,7 @@ static void mount_service_destroy(struct mount_service *mo)
mo->argvfd = -1;
mo->fusedevfd = -1;
mo->mountfd = -1;
+ mo->fsopenfd = -1;
}
int mount_service_main(int argc, char *argv[])
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH 04/17] mount_service: use the new mount api for the mount service
2026-03-27 1:25 ` [PATCH 04/17] mount_service: use the new mount api for the mount service Darrick J. Wong
@ 2026-03-30 21:06 ` Bernd Schubert
2026-03-30 21:18 ` Darrick J. Wong
0 siblings, 1 reply; 28+ messages in thread
From: Bernd Schubert @ 2026-03-30 21:06 UTC (permalink / raw)
To: Darrick J. Wong
Cc: linux-fsdevel@vger.kernel.org, bernd@bsbernd.com,
miklos@szeredi.hu, neal@gompa.dev, joannelkoong@gmail.com
On 3/27/26 02:25, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Use the new fsopen/fsmount system calls to mount the filesystem so that
> we get somewhat better diagnostics if something gets screwed up.
>
> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> ---
> meson.build | 15 +++
> util/mount_service.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 314 insertions(+)
>
>
> diff --git a/meson.build b/meson.build
> index d6ba8740effd5c..b0988548bf806a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -130,6 +130,21 @@ special_funcs = {
> int main(int argc, char *argv[]) {
> return SD_LISTEN_FDS_START;
> }
> + ''',
> + 'new_mount_api': '''
> + #define _GNU_SOURCE
> + #include <sys/mount.h>
> + #include <linux/mount.h>
> + #include <unistd.h>
> + #include <fcntl.h>
> +
> + int main(void) {
> + int fsfd = fsopen("fuse", FSOPEN_CLOEXEC);
> + int res = fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0);
> + int mntfd = fsmount(fsfd, FSMOUNT_CLOEXEC, 0);
> + res = move_mount(mntfd, "", AT_FDCWD, "/mnt", MOVE_MOUNT_F_EMPTY_PATH);
> + return 0;
> + }
> '''
> }
>
> diff --git a/util/mount_service.c b/util/mount_service.c
> index ae078e537dc560..4a2c1111b66b91 100644
> --- a/util/mount_service.c
> +++ b/util/mount_service.c
> @@ -65,6 +65,9 @@ struct mount_service {
>
> /* O_PATH fd for mount point */
> int mountfd;
> +
> + /* fd for fsopen */
> + int fsopenfd;
> };
>
> /* Filter out the subtype of the filesystem (e.g. fuse.Y -> Y) */
> @@ -87,6 +90,7 @@ static int mount_service_init(struct mount_service *mo, int argc, char *argv[])
> mo->argvfd = -1;
> mo->fusedevfd = -1;
> mo->mountfd = -1;
> + mo->fsopenfd = -1;
>
> for (i = 0; i < argc; i++) {
> if (!strcmp(argv[i], "-t") && i + 1 < argc) {
> @@ -690,9 +694,50 @@ static int mount_service_handle_fsopen_cmd(struct mount_service *mo,
> return mount_service_send_reply(mo, error);
> }
>
> +#ifdef HAVE_NEW_MOUNT_API
> + /* If this fails we fall back on mount() */
> + mo->fsopenfd = fsopen(oc->value, FSOPEN_CLOEXEC);
> +#endif
> +
> return mount_service_send_reply(mo, 0);
> }
>
> +#ifdef HAVE_NEW_MOUNT_API
> +/* callers must preserve errno */
> +static void emit_fsconfig_messages(const struct mount_service *mo)
> +{
> + uint8_t buf[BUFSIZ];
> + ssize_t sz;
> +
> + while ((sz = read(mo->fsopenfd, buf, sizeof(buf) - 1)) != -1) {
> + if (sz <= 0)
> + continue;
> + if (buf[sz - 1] == '\n')
> + buf[--sz] = '\0';
> + else
> + buf[sz] = '\0';
> +
> + if (!*buf)
> + continue;
> +
> + switch (buf[0]) {
> + case 'e':
> + fprintf(stderr, "Error: %s\n", buf + 2);
> + break;
> + case 'w':
> + fprintf(stderr, "Warning: %s\n", buf + 2);
> + break;
> + case 'i':
> + fprintf(stderr, "Info: %s\n", buf + 2);
> + break;
> + default:
> + fprintf(stderr, " %s\n", buf);
> + break;
> + }
> + }
> +}
> +#endif
How about unifying that with my series and then use log_fsconfig_kmsg()?
We can also do it independently, but should not forget to use a common
function later on. That applies to all these functions for the new mount
API. Part of the headache I have with my series is that fusermount.c
duplicates quite some code.
For me it looks a bit like we can unify most of util/mount_service.c and
lib/mount_fsmount.c.
> +
> static int mount_service_handle_source_cmd(struct mount_service *mo,
> const struct fuse_service_packet *p)
> {
> @@ -714,6 +759,21 @@ static int mount_service_handle_source_cmd(struct mount_service *mo,
> return mount_service_send_reply(mo, error);
> }
>
> +#ifdef HAVE_NEW_MOUNT_API
> + if (mo->fsopenfd >= 0) {
> + int ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "source",
> + oc->value, 0);
> + if (ret) {
> + int error = errno;
> +
> + fprintf(stderr, "%s: fsconfig source: %s\n",
> + mo->msgtag, strerror(error));
> + emit_fsconfig_messages(mo);
> + return mount_service_send_reply(mo, error);
> + }
> + }
> +#endif
> +
> return mount_service_send_reply(mo, 0);
> }
>
> @@ -722,6 +782,8 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
> {
> struct fuse_service_string_command *oc =
> container_of(p, struct fuse_service_string_command, p);
> + char *tokstr = oc->value;
> + char *tok, *savetok;
>
> if (mo->mntopts) {
> fprintf(stderr, "%s: mount options respecified!\n",
> @@ -738,6 +800,45 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
> return mount_service_send_reply(mo, error);
> }
>
> + /* strtok_r mutates tokstr aka oc->value */
> + while ((tok = strtok_r(tokstr, ",", &savetok)) != NULL) {
> + char *equals = strchr(tok, '=');
> + char oldchar = 0;
> +
> + if (equals) {
> + oldchar = *equals;
> + *equals = 0;
> + }
> +
> +#ifdef HAVE_NEW_MOUNT_API
> + if (mo->fsopenfd >= 0) {
> + int ret;
> +
> + if (equals)
> + ret = fsconfig(mo->fsopenfd,
> + FSCONFIG_SET_STRING, tok,
> + equals + 1, 0);
> + else
> + ret = fsconfig(mo->fsopenfd,
> + FSCONFIG_SET_FLAG, tok,
> + NULL, 0);
> + if (ret) {
> + int error = errno;
> +
> + fprintf(stderr, "%s: set mount option: %s\n",
> + mo->msgtag, strerror(error));
> + emit_fsconfig_messages(mo);
> + return mount_service_send_reply(mo, error);
> + }
> + }
> +#endif
> +
> + if (equals)
> + *equals = oldchar;
> +
> + tokstr = NULL;
> + }
> +
> return mount_service_send_reply(mo, 0);
> }
>
> @@ -875,6 +976,196 @@ static int mount_service_regular_mount(struct mount_service *mo,
> return mount_service_send_reply(mo, 0);
> }
>
> +#ifdef HAVE_NEW_MOUNT_API
> +struct ms_to_mount_map {
> + unsigned long ms_flag;
> + unsigned int mount_attr_flag;
> +};
> +
> +static const struct ms_to_mount_map attrs[] = {
> + { MS_RDONLY, MOUNT_ATTR_RDONLY },
> + { MS_NOSUID, MOUNT_ATTR_NOSUID },
> + { MS_NODEV, MOUNT_ATTR_NODEV },
> + { MS_NOEXEC, MOUNT_ATTR_NOEXEC },
> + { MS_RELATIME, MOUNT_ATTR_RELATIME },
> + { MS_NOATIME, MOUNT_ATTR_NOATIME },
> + { MS_STRICTATIME, MOUNT_ATTR_STRICTATIME },
> + { MS_NODIRATIME, MOUNT_ATTR_NODIRATIME },
> +#ifdef MOUNT_ATTR_NOSYMFOLLOW
> + { MS_NOSYMFOLLOW, MOUNT_ATTR_NOSYMFOLLOW },
> +#endif
> + { 0, 0 },
> +};
> +
> +static void get_mount_attr_flags(const struct fuse_service_mount_command *oc,
> + unsigned int *attr_flags,
> + unsigned long *leftover_ms_flags)
> +{
> + const struct ms_to_mount_map *i;
> + unsigned int ms_flags = ntohl(oc->ms_flags);
> + unsigned int mount_attr_flags = 0;
> +
> + for (i = attrs; i->ms_flag != 0; i++) {
> + if (ms_flags & i->ms_flag)
> + mount_attr_flags |= i->mount_attr_flag;
> + ms_flags &= ~i->ms_flag;
> + }
> +
> + *leftover_ms_flags = ms_flags;
> + *attr_flags = mount_attr_flags;
> +}
> +
> +struct ms_to_str_map {
> + unsigned long ms_flag;
> + const char *string;
> +};
> +
> +static const struct ms_to_str_map strflags[] = {
> + { MS_SYNCHRONOUS, "sync" },
> + { MS_DIRSYNC, "dirsync" },
> + { MS_LAZYTIME, "lazytime" },
> + { 0, 0 },
> +};
> +
> +static int set_ms_flags(struct mount_service *mo, unsigned long ms_flags)
> +{
> + const struct ms_to_str_map *i;
> + int ret;
> +
> + for (i = strflags; i->ms_flag != 0; i++) {
> + if (!(ms_flags & i->ms_flag))
> + continue;
> +
> + ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_FLAG, i->string,
> + NULL, 0);
> + if (ret) {
> + int error = errno;
> +
> + fprintf(stderr, "%s: set %s option: %s\n",
> + mo->msgtag, i->string, strerror(error));
> + emit_fsconfig_messages(mo);
> +
> + errno = error;
> + return -1;
> + }
> + ms_flags &= ~i->ms_flag;
> + }
> +
> + /*
> + * We can't translate all the supplied MS_ flags into MOUNT_ATTR_ flags
> + * or string flags! Return a magic code so the caller will fall back
> + * to regular mount(2).
> + */
> + return ms_flags ? -2 : 0;
> +}
Let's please not forget later on to use the new define.
Thanks,
Bernd
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 04/17] mount_service: use the new mount api for the mount service
2026-03-30 21:06 ` Bernd Schubert
@ 2026-03-30 21:18 ` Darrick J. Wong
2026-03-30 21:40 ` Bernd Schubert
0 siblings, 1 reply; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-30 21:18 UTC (permalink / raw)
To: Bernd Schubert
Cc: linux-fsdevel@vger.kernel.org, bernd@bsbernd.com,
miklos@szeredi.hu, neal@gompa.dev, joannelkoong@gmail.com
On Mon, Mar 30, 2026 at 09:06:05PM +0000, Bernd Schubert wrote:
> On 3/27/26 02:25, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> >
> > Use the new fsopen/fsmount system calls to mount the filesystem so that
> > we get somewhat better diagnostics if something gets screwed up.
> >
> > Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> > ---
> > meson.build | 15 +++
> > util/mount_service.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 314 insertions(+)
> >
> >
> > diff --git a/meson.build b/meson.build
> > index d6ba8740effd5c..b0988548bf806a 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -130,6 +130,21 @@ special_funcs = {
> > int main(int argc, char *argv[]) {
> > return SD_LISTEN_FDS_START;
> > }
> > + ''',
> > + 'new_mount_api': '''
> > + #define _GNU_SOURCE
> > + #include <sys/mount.h>
> > + #include <linux/mount.h>
> > + #include <unistd.h>
> > + #include <fcntl.h>
> > +
> > + int main(void) {
> > + int fsfd = fsopen("fuse", FSOPEN_CLOEXEC);
> > + int res = fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0);
> > + int mntfd = fsmount(fsfd, FSMOUNT_CLOEXEC, 0);
> > + res = move_mount(mntfd, "", AT_FDCWD, "/mnt", MOVE_MOUNT_F_EMPTY_PATH);
> > + return 0;
> > + }
> > '''
> > }
> >
> > diff --git a/util/mount_service.c b/util/mount_service.c
> > index ae078e537dc560..4a2c1111b66b91 100644
> > --- a/util/mount_service.c
> > +++ b/util/mount_service.c
> > @@ -65,6 +65,9 @@ struct mount_service {
> >
> > /* O_PATH fd for mount point */
> > int mountfd;
> > +
> > + /* fd for fsopen */
> > + int fsopenfd;
> > };
> >
> > /* Filter out the subtype of the filesystem (e.g. fuse.Y -> Y) */
> > @@ -87,6 +90,7 @@ static int mount_service_init(struct mount_service *mo, int argc, char *argv[])
> > mo->argvfd = -1;
> > mo->fusedevfd = -1;
> > mo->mountfd = -1;
> > + mo->fsopenfd = -1;
> >
> > for (i = 0; i < argc; i++) {
> > if (!strcmp(argv[i], "-t") && i + 1 < argc) {
> > @@ -690,9 +694,50 @@ static int mount_service_handle_fsopen_cmd(struct mount_service *mo,
> > return mount_service_send_reply(mo, error);
> > }
> >
> > +#ifdef HAVE_NEW_MOUNT_API
> > + /* If this fails we fall back on mount() */
> > + mo->fsopenfd = fsopen(oc->value, FSOPEN_CLOEXEC);
> > +#endif
> > +
> > return mount_service_send_reply(mo, 0);
> > }
> >
> > +#ifdef HAVE_NEW_MOUNT_API
> > +/* callers must preserve errno */
> > +static void emit_fsconfig_messages(const struct mount_service *mo)
> > +{
> > + uint8_t buf[BUFSIZ];
> > + ssize_t sz;
> > +
> > + while ((sz = read(mo->fsopenfd, buf, sizeof(buf) - 1)) != -1) {
> > + if (sz <= 0)
> > + continue;
> > + if (buf[sz - 1] == '\n')
> > + buf[--sz] = '\0';
> > + else
> > + buf[sz] = '\0';
> > +
> > + if (!*buf)
> > + continue;
> > +
> > + switch (buf[0]) {
> > + case 'e':
> > + fprintf(stderr, "Error: %s\n", buf + 2);
> > + break;
> > + case 'w':
> > + fprintf(stderr, "Warning: %s\n", buf + 2);
> > + break;
> > + case 'i':
> > + fprintf(stderr, "Info: %s\n", buf + 2);
> > + break;
> > + default:
> > + fprintf(stderr, " %s\n", buf);
> > + break;
> > + }
> > + }
> > +}
> > +#endif
>
> How about unifying that with my series and then use log_fsconfig_kmsg()?
> We can also do it independently, but should not forget to use a common
> function later on. That applies to all these functions for the new mount
> API. Part of the headache I have with my series is that fusermount.c
> duplicates quite some code.
> For me it looks a bit like we can unify most of util/mount_service.c and
> lib/mount_fsmount.c.
<nod> The mount option string parsing (i.e. all that MS_ -> MOUNT_ATTR
translation) and error reporting parts look trivially shareable.
fuse_kern_fsmount isn't so easy to share since the fuse server sends
over all the relevant pieces in separate commands.
> > +
> > static int mount_service_handle_source_cmd(struct mount_service *mo,
> > const struct fuse_service_packet *p)
> > {
> > @@ -714,6 +759,21 @@ static int mount_service_handle_source_cmd(struct mount_service *mo,
> > return mount_service_send_reply(mo, error);
> > }
> >
> > +#ifdef HAVE_NEW_MOUNT_API
> > + if (mo->fsopenfd >= 0) {
> > + int ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "source",
> > + oc->value, 0);
> > + if (ret) {
> > + int error = errno;
> > +
> > + fprintf(stderr, "%s: fsconfig source: %s\n",
> > + mo->msgtag, strerror(error));
> > + emit_fsconfig_messages(mo);
> > + return mount_service_send_reply(mo, error);
> > + }
> > + }
> > +#endif
> > +
> > return mount_service_send_reply(mo, 0);
> > }
> >
> > @@ -722,6 +782,8 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
> > {
> > struct fuse_service_string_command *oc =
> > container_of(p, struct fuse_service_string_command, p);
> > + char *tokstr = oc->value;
> > + char *tok, *savetok;
> >
> > if (mo->mntopts) {
> > fprintf(stderr, "%s: mount options respecified!\n",
> > @@ -738,6 +800,45 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
> > return mount_service_send_reply(mo, error);
> > }
> >
> > + /* strtok_r mutates tokstr aka oc->value */
> > + while ((tok = strtok_r(tokstr, ",", &savetok)) != NULL) {
> > + char *equals = strchr(tok, '=');
> > + char oldchar = 0;
> > +
> > + if (equals) {
> > + oldchar = *equals;
> > + *equals = 0;
> > + }
> > +
> > +#ifdef HAVE_NEW_MOUNT_API
> > + if (mo->fsopenfd >= 0) {
> > + int ret;
> > +
> > + if (equals)
> > + ret = fsconfig(mo->fsopenfd,
> > + FSCONFIG_SET_STRING, tok,
> > + equals + 1, 0);
> > + else
> > + ret = fsconfig(mo->fsopenfd,
> > + FSCONFIG_SET_FLAG, tok,
> > + NULL, 0);
> > + if (ret) {
> > + int error = errno;
> > +
> > + fprintf(stderr, "%s: set mount option: %s\n",
> > + mo->msgtag, strerror(error));
> > + emit_fsconfig_messages(mo);
> > + return mount_service_send_reply(mo, error);
> > + }
> > + }
> > +#endif
> > +
> > + if (equals)
> > + *equals = oldchar;
> > +
> > + tokstr = NULL;
> > + }
> > +
> > return mount_service_send_reply(mo, 0);
> > }
> >
> > @@ -875,6 +976,196 @@ static int mount_service_regular_mount(struct mount_service *mo,
> > return mount_service_send_reply(mo, 0);
> > }
> >
> > +#ifdef HAVE_NEW_MOUNT_API
> > +struct ms_to_mount_map {
> > + unsigned long ms_flag;
> > + unsigned int mount_attr_flag;
> > +};
> > +
> > +static const struct ms_to_mount_map attrs[] = {
> > + { MS_RDONLY, MOUNT_ATTR_RDONLY },
> > + { MS_NOSUID, MOUNT_ATTR_NOSUID },
> > + { MS_NODEV, MOUNT_ATTR_NODEV },
> > + { MS_NOEXEC, MOUNT_ATTR_NOEXEC },
> > + { MS_RELATIME, MOUNT_ATTR_RELATIME },
> > + { MS_NOATIME, MOUNT_ATTR_NOATIME },
> > + { MS_STRICTATIME, MOUNT_ATTR_STRICTATIME },
> > + { MS_NODIRATIME, MOUNT_ATTR_NODIRATIME },
> > +#ifdef MOUNT_ATTR_NOSYMFOLLOW
> > + { MS_NOSYMFOLLOW, MOUNT_ATTR_NOSYMFOLLOW },
> > +#endif
> > + { 0, 0 },
> > +};
> > +
> > +static void get_mount_attr_flags(const struct fuse_service_mount_command *oc,
> > + unsigned int *attr_flags,
> > + unsigned long *leftover_ms_flags)
> > +{
> > + const struct ms_to_mount_map *i;
> > + unsigned int ms_flags = ntohl(oc->ms_flags);
> > + unsigned int mount_attr_flags = 0;
> > +
> > + for (i = attrs; i->ms_flag != 0; i++) {
> > + if (ms_flags & i->ms_flag)
> > + mount_attr_flags |= i->mount_attr_flag;
> > + ms_flags &= ~i->ms_flag;
> > + }
> > +
> > + *leftover_ms_flags = ms_flags;
> > + *attr_flags = mount_attr_flags;
> > +}
> > +
> > +struct ms_to_str_map {
> > + unsigned long ms_flag;
> > + const char *string;
> > +};
> > +
> > +static const struct ms_to_str_map strflags[] = {
> > + { MS_SYNCHRONOUS, "sync" },
> > + { MS_DIRSYNC, "dirsync" },
> > + { MS_LAZYTIME, "lazytime" },
> > + { 0, 0 },
> > +};
> > +
> > +static int set_ms_flags(struct mount_service *mo, unsigned long ms_flags)
> > +{
> > + const struct ms_to_str_map *i;
> > + int ret;
> > +
> > + for (i = strflags; i->ms_flag != 0; i++) {
> > + if (!(ms_flags & i->ms_flag))
> > + continue;
> > +
> > + ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_FLAG, i->string,
> > + NULL, 0);
> > + if (ret) {
> > + int error = errno;
> > +
> > + fprintf(stderr, "%s: set %s option: %s\n",
> > + mo->msgtag, i->string, strerror(error));
> > + emit_fsconfig_messages(mo);
> > +
> > + errno = error;
> > + return -1;
> > + }
> > + ms_flags &= ~i->ms_flag;
> > + }
> > +
> > + /*
> > + * We can't translate all the supplied MS_ flags into MOUNT_ATTR_ flags
> > + * or string flags! Return a magic code so the caller will fall back
> > + * to regular mount(2).
> > + */
> > + return ms_flags ? -2 : 0;
> > +}
>
> Let's please not forget later on to use the new define.
Er... which new define? HAVE_NEW_MOUNT_API? I think we're still inside
the #ifdef for that at this point.
<confused>
--D
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 04/17] mount_service: use the new mount api for the mount service
2026-03-30 21:18 ` Darrick J. Wong
@ 2026-03-30 21:40 ` Bernd Schubert
2026-03-30 21:47 ` Darrick J. Wong
0 siblings, 1 reply; 28+ messages in thread
From: Bernd Schubert @ 2026-03-30 21:40 UTC (permalink / raw)
To: Darrick J. Wong, Bernd Schubert
Cc: linux-fsdevel@vger.kernel.org, miklos@szeredi.hu, neal@gompa.dev,
joannelkoong@gmail.com
On 3/30/26 23:18, Darrick J. Wong wrote:
> On Mon, Mar 30, 2026 at 09:06:05PM +0000, Bernd Schubert wrote:
>> On 3/27/26 02:25, Darrick J. Wong wrote:
>>> From: Darrick J. Wong <djwong@kernel.org>
>>>
>>> Use the new fsopen/fsmount system calls to mount the filesystem so that
>>> we get somewhat better diagnostics if something gets screwed up.
>>>
>>> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
>>> ---
>>> meson.build | 15 +++
>>> util/mount_service.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++
>>> 2 files changed, 314 insertions(+)
>>>
>>>
>>> diff --git a/meson.build b/meson.build
>>> index d6ba8740effd5c..b0988548bf806a 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -130,6 +130,21 @@ special_funcs = {
>>> int main(int argc, char *argv[]) {
>>> return SD_LISTEN_FDS_START;
>>> }
>>> + ''',
>>> + 'new_mount_api': '''
>>> + #define _GNU_SOURCE
>>> + #include <sys/mount.h>
>>> + #include <linux/mount.h>
>>> + #include <unistd.h>
>>> + #include <fcntl.h>
>>> +
>>> + int main(void) {
>>> + int fsfd = fsopen("fuse", FSOPEN_CLOEXEC);
>>> + int res = fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0);
>>> + int mntfd = fsmount(fsfd, FSMOUNT_CLOEXEC, 0);
>>> + res = move_mount(mntfd, "", AT_FDCWD, "/mnt", MOVE_MOUNT_F_EMPTY_PATH);
>>> + return 0;
>>> + }
>>> '''
>>> }
>>>
>>> diff --git a/util/mount_service.c b/util/mount_service.c
>>> index ae078e537dc560..4a2c1111b66b91 100644
>>> --- a/util/mount_service.c
>>> +++ b/util/mount_service.c
>>> @@ -65,6 +65,9 @@ struct mount_service {
>>>
>>> /* O_PATH fd for mount point */
>>> int mountfd;
>>> +
>>> + /* fd for fsopen */
>>> + int fsopenfd;
>>> };
>>>
>>> /* Filter out the subtype of the filesystem (e.g. fuse.Y -> Y) */
>>> @@ -87,6 +90,7 @@ static int mount_service_init(struct mount_service *mo, int argc, char *argv[])
>>> mo->argvfd = -1;
>>> mo->fusedevfd = -1;
>>> mo->mountfd = -1;
>>> + mo->fsopenfd = -1;
>>>
>>> for (i = 0; i < argc; i++) {
>>> if (!strcmp(argv[i], "-t") && i + 1 < argc) {
>>> @@ -690,9 +694,50 @@ static int mount_service_handle_fsopen_cmd(struct mount_service *mo,
>>> return mount_service_send_reply(mo, error);
>>> }
>>>
>>> +#ifdef HAVE_NEW_MOUNT_API
>>> + /* If this fails we fall back on mount() */
>>> + mo->fsopenfd = fsopen(oc->value, FSOPEN_CLOEXEC);
>>> +#endif
>>> +
>>> return mount_service_send_reply(mo, 0);
>>> }
>>>
>>> +#ifdef HAVE_NEW_MOUNT_API
>>> +/* callers must preserve errno */
>>> +static void emit_fsconfig_messages(const struct mount_service *mo)
>>> +{
>>> + uint8_t buf[BUFSIZ];
>>> + ssize_t sz;
>>> +
>>> + while ((sz = read(mo->fsopenfd, buf, sizeof(buf) - 1)) != -1) {
>>> + if (sz <= 0)
>>> + continue;
>>> + if (buf[sz - 1] == '\n')
>>> + buf[--sz] = '\0';
>>> + else
>>> + buf[sz] = '\0';
>>> +
>>> + if (!*buf)
>>> + continue;
>>> +
>>> + switch (buf[0]) {
>>> + case 'e':
>>> + fprintf(stderr, "Error: %s\n", buf + 2);
>>> + break;
>>> + case 'w':
>>> + fprintf(stderr, "Warning: %s\n", buf + 2);
>>> + break;
>>> + case 'i':
>>> + fprintf(stderr, "Info: %s\n", buf + 2);
>>> + break;
>>> + default:
>>> + fprintf(stderr, " %s\n", buf);
>>> + break;
>>> + }
>>> + }
>>> +}
>>> +#endif
>>
>> How about unifying that with my series and then use log_fsconfig_kmsg()?
>> We can also do it independently, but should not forget to use a common
>> function later on. That applies to all these functions for the new mount
>> API. Part of the headache I have with my series is that fusermount.c
>> duplicates quite some code.
>> For me it looks a bit like we can unify most of util/mount_service.c and
>> lib/mount_fsmount.c.
>
> <nod> The mount option string parsing (i.e. all that MS_ -> MOUNT_ATTR
> translation) and error reporting parts look trivially shareable.
> fuse_kern_fsmount isn't so easy to share since the fuse server sends
> over all the relevant pieces in separate commands.
>
>>> +
>>> static int mount_service_handle_source_cmd(struct mount_service *mo,
>>> const struct fuse_service_packet *p)
>>> {
>>> @@ -714,6 +759,21 @@ static int mount_service_handle_source_cmd(struct mount_service *mo,
>>> return mount_service_send_reply(mo, error);
>>> }
>>>
>>> +#ifdef HAVE_NEW_MOUNT_API
>>> + if (mo->fsopenfd >= 0) {
>>> + int ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "source",
>>> + oc->value, 0);
>>> + if (ret) {
>>> + int error = errno;
>>> +
>>> + fprintf(stderr, "%s: fsconfig source: %s\n",
>>> + mo->msgtag, strerror(error));
>>> + emit_fsconfig_messages(mo);
>>> + return mount_service_send_reply(mo, error);
>>> + }
>>> + }
>>> +#endif
>>> +
>>> return mount_service_send_reply(mo, 0);
>>> }
>>>
>>> @@ -722,6 +782,8 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
>>> {
>>> struct fuse_service_string_command *oc =
>>> container_of(p, struct fuse_service_string_command, p);
>>> + char *tokstr = oc->value;
>>> + char *tok, *savetok;
>>>
>>> if (mo->mntopts) {
>>> fprintf(stderr, "%s: mount options respecified!\n",
>>> @@ -738,6 +800,45 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
>>> return mount_service_send_reply(mo, error);
>>> }
>>>
>>> + /* strtok_r mutates tokstr aka oc->value */
>>> + while ((tok = strtok_r(tokstr, ",", &savetok)) != NULL) {
>>> + char *equals = strchr(tok, '=');
>>> + char oldchar = 0;
>>> +
>>> + if (equals) {
>>> + oldchar = *equals;
>>> + *equals = 0;
>>> + }
>>> +
>>> +#ifdef HAVE_NEW_MOUNT_API
>>> + if (mo->fsopenfd >= 0) {
>>> + int ret;
>>> +
>>> + if (equals)
>>> + ret = fsconfig(mo->fsopenfd,
>>> + FSCONFIG_SET_STRING, tok,
>>> + equals + 1, 0);
>>> + else
>>> + ret = fsconfig(mo->fsopenfd,
>>> + FSCONFIG_SET_FLAG, tok,
>>> + NULL, 0);
>>> + if (ret) {
>>> + int error = errno;
>>> +
>>> + fprintf(stderr, "%s: set mount option: %s\n",
>>> + mo->msgtag, strerror(error));
>>> + emit_fsconfig_messages(mo);
>>> + return mount_service_send_reply(mo, error);
>>> + }
>>> + }
>>> +#endif
>>> +
>>> + if (equals)
>>> + *equals = oldchar;
>>> +
>>> + tokstr = NULL;
>>> + }
>>> +
>>> return mount_service_send_reply(mo, 0);
>>> }
>>>
>>> @@ -875,6 +976,196 @@ static int mount_service_regular_mount(struct mount_service *mo,
>>> return mount_service_send_reply(mo, 0);
>>> }
>>>
>>> +#ifdef HAVE_NEW_MOUNT_API
>>> +struct ms_to_mount_map {
>>> + unsigned long ms_flag;
>>> + unsigned int mount_attr_flag;
>>> +};
>>> +
>>> +static const struct ms_to_mount_map attrs[] = {
>>> + { MS_RDONLY, MOUNT_ATTR_RDONLY },
>>> + { MS_NOSUID, MOUNT_ATTR_NOSUID },
>>> + { MS_NODEV, MOUNT_ATTR_NODEV },
>>> + { MS_NOEXEC, MOUNT_ATTR_NOEXEC },
>>> + { MS_RELATIME, MOUNT_ATTR_RELATIME },
>>> + { MS_NOATIME, MOUNT_ATTR_NOATIME },
>>> + { MS_STRICTATIME, MOUNT_ATTR_STRICTATIME },
>>> + { MS_NODIRATIME, MOUNT_ATTR_NODIRATIME },
>>> +#ifdef MOUNT_ATTR_NOSYMFOLLOW
>>> + { MS_NOSYMFOLLOW, MOUNT_ATTR_NOSYMFOLLOW },
>>> +#endif
>>> + { 0, 0 },
>>> +};
>>> +
>>> +static void get_mount_attr_flags(const struct fuse_service_mount_command *oc,
>>> + unsigned int *attr_flags,
>>> + unsigned long *leftover_ms_flags)
>>> +{
>>> + const struct ms_to_mount_map *i;
>>> + unsigned int ms_flags = ntohl(oc->ms_flags);
>>> + unsigned int mount_attr_flags = 0;
>>> +
>>> + for (i = attrs; i->ms_flag != 0; i++) {
>>> + if (ms_flags & i->ms_flag)
>>> + mount_attr_flags |= i->mount_attr_flag;
>>> + ms_flags &= ~i->ms_flag;
>>> + }
>>> +
>>> + *leftover_ms_flags = ms_flags;
>>> + *attr_flags = mount_attr_flags;
>>> +}
>>> +
>>> +struct ms_to_str_map {
>>> + unsigned long ms_flag;
>>> + const char *string;
>>> +};
>>> +
>>> +static const struct ms_to_str_map strflags[] = {
>>> + { MS_SYNCHRONOUS, "sync" },
>>> + { MS_DIRSYNC, "dirsync" },
>>> + { MS_LAZYTIME, "lazytime" },
>>> + { 0, 0 },
>>> +};
>>> +
>>> +static int set_ms_flags(struct mount_service *mo, unsigned long ms_flags)
>>> +{
>>> + const struct ms_to_str_map *i;
>>> + int ret;
>>> +
>>> + for (i = strflags; i->ms_flag != 0; i++) {
>>> + if (!(ms_flags & i->ms_flag))
>>> + continue;
>>> +
>>> + ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_FLAG, i->string,
>>> + NULL, 0);
>>> + if (ret) {
>>> + int error = errno;
>>> +
>>> + fprintf(stderr, "%s: set %s option: %s\n",
>>> + mo->msgtag, i->string, strerror(error));
>>> + emit_fsconfig_messages(mo);
>>> +
>>> + errno = error;
>>> + return -1;
>>> + }
>>> + ms_flags &= ~i->ms_flag;
>>> + }
>>> +
>>> + /*
>>> + * We can't translate all the supplied MS_ flags into MOUNT_ATTR_ flags
>>> + * or string flags! Return a magic code so the caller will fall back
>>> + * to regular mount(2).
>>> + */
>>> + return ms_flags ? -2 : 0;
>>> +}
>>
>> Let's please not forget later on to use the new define.
>
> Er... which new define? HAVE_NEW_MOUNT_API? I think we're still inside
> the #ifdef for that at this point.
>
> <confused>
Sorry, I meant FUSE_MOUNT_FALLBACK_NEEDED.
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 04/17] mount_service: use the new mount api for the mount service
2026-03-30 21:40 ` Bernd Schubert
@ 2026-03-30 21:47 ` Darrick J. Wong
0 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-30 21:47 UTC (permalink / raw)
To: Bernd Schubert
Cc: Bernd Schubert, linux-fsdevel@vger.kernel.org, miklos@szeredi.hu,
neal@gompa.dev, joannelkoong@gmail.com
On Mon, Mar 30, 2026 at 11:40:22PM +0200, Bernd Schubert wrote:
>
>
> On 3/30/26 23:18, Darrick J. Wong wrote:
> > On Mon, Mar 30, 2026 at 09:06:05PM +0000, Bernd Schubert wrote:
> >> On 3/27/26 02:25, Darrick J. Wong wrote:
> >>> From: Darrick J. Wong <djwong@kernel.org>
> >>>
> >>> Use the new fsopen/fsmount system calls to mount the filesystem so that
> >>> we get somewhat better diagnostics if something gets screwed up.
> >>>
> >>> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> >>> ---
> >>> meson.build | 15 +++
> >>> util/mount_service.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++
> >>> 2 files changed, 314 insertions(+)
> >>>
> >>>
> >>> diff --git a/meson.build b/meson.build
> >>> index d6ba8740effd5c..b0988548bf806a 100644
> >>> --- a/meson.build
> >>> +++ b/meson.build
> >>> @@ -130,6 +130,21 @@ special_funcs = {
> >>> int main(int argc, char *argv[]) {
> >>> return SD_LISTEN_FDS_START;
> >>> }
> >>> + ''',
> >>> + 'new_mount_api': '''
> >>> + #define _GNU_SOURCE
> >>> + #include <sys/mount.h>
> >>> + #include <linux/mount.h>
> >>> + #include <unistd.h>
> >>> + #include <fcntl.h>
> >>> +
> >>> + int main(void) {
> >>> + int fsfd = fsopen("fuse", FSOPEN_CLOEXEC);
> >>> + int res = fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0);
> >>> + int mntfd = fsmount(fsfd, FSMOUNT_CLOEXEC, 0);
> >>> + res = move_mount(mntfd, "", AT_FDCWD, "/mnt", MOVE_MOUNT_F_EMPTY_PATH);
> >>> + return 0;
> >>> + }
> >>> '''
> >>> }
> >>>
> >>> diff --git a/util/mount_service.c b/util/mount_service.c
> >>> index ae078e537dc560..4a2c1111b66b91 100644
> >>> --- a/util/mount_service.c
> >>> +++ b/util/mount_service.c
> >>> @@ -65,6 +65,9 @@ struct mount_service {
> >>>
> >>> /* O_PATH fd for mount point */
> >>> int mountfd;
> >>> +
> >>> + /* fd for fsopen */
> >>> + int fsopenfd;
> >>> };
> >>>
> >>> /* Filter out the subtype of the filesystem (e.g. fuse.Y -> Y) */
> >>> @@ -87,6 +90,7 @@ static int mount_service_init(struct mount_service *mo, int argc, char *argv[])
> >>> mo->argvfd = -1;
> >>> mo->fusedevfd = -1;
> >>> mo->mountfd = -1;
> >>> + mo->fsopenfd = -1;
> >>>
> >>> for (i = 0; i < argc; i++) {
> >>> if (!strcmp(argv[i], "-t") && i + 1 < argc) {
> >>> @@ -690,9 +694,50 @@ static int mount_service_handle_fsopen_cmd(struct mount_service *mo,
> >>> return mount_service_send_reply(mo, error);
> >>> }
> >>>
> >>> +#ifdef HAVE_NEW_MOUNT_API
> >>> + /* If this fails we fall back on mount() */
> >>> + mo->fsopenfd = fsopen(oc->value, FSOPEN_CLOEXEC);
> >>> +#endif
> >>> +
> >>> return mount_service_send_reply(mo, 0);
> >>> }
> >>>
> >>> +#ifdef HAVE_NEW_MOUNT_API
> >>> +/* callers must preserve errno */
> >>> +static void emit_fsconfig_messages(const struct mount_service *mo)
> >>> +{
> >>> + uint8_t buf[BUFSIZ];
> >>> + ssize_t sz;
> >>> +
> >>> + while ((sz = read(mo->fsopenfd, buf, sizeof(buf) - 1)) != -1) {
> >>> + if (sz <= 0)
> >>> + continue;
> >>> + if (buf[sz - 1] == '\n')
> >>> + buf[--sz] = '\0';
> >>> + else
> >>> + buf[sz] = '\0';
> >>> +
> >>> + if (!*buf)
> >>> + continue;
> >>> +
> >>> + switch (buf[0]) {
> >>> + case 'e':
> >>> + fprintf(stderr, "Error: %s\n", buf + 2);
> >>> + break;
> >>> + case 'w':
> >>> + fprintf(stderr, "Warning: %s\n", buf + 2);
> >>> + break;
> >>> + case 'i':
> >>> + fprintf(stderr, "Info: %s\n", buf + 2);
> >>> + break;
> >>> + default:
> >>> + fprintf(stderr, " %s\n", buf);
> >>> + break;
> >>> + }
> >>> + }
> >>> +}
> >>> +#endif
> >>
> >> How about unifying that with my series and then use log_fsconfig_kmsg()?
> >> We can also do it independently, but should not forget to use a common
> >> function later on. That applies to all these functions for the new mount
> >> API. Part of the headache I have with my series is that fusermount.c
> >> duplicates quite some code.
> >> For me it looks a bit like we can unify most of util/mount_service.c and
> >> lib/mount_fsmount.c.
> >
> > <nod> The mount option string parsing (i.e. all that MS_ -> MOUNT_ATTR
> > translation) and error reporting parts look trivially shareable.
> > fuse_kern_fsmount isn't so easy to share since the fuse server sends
> > over all the relevant pieces in separate commands.
> >
> >>> +
> >>> static int mount_service_handle_source_cmd(struct mount_service *mo,
> >>> const struct fuse_service_packet *p)
> >>> {
> >>> @@ -714,6 +759,21 @@ static int mount_service_handle_source_cmd(struct mount_service *mo,
> >>> return mount_service_send_reply(mo, error);
> >>> }
> >>>
> >>> +#ifdef HAVE_NEW_MOUNT_API
> >>> + if (mo->fsopenfd >= 0) {
> >>> + int ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_STRING, "source",
> >>> + oc->value, 0);
> >>> + if (ret) {
> >>> + int error = errno;
> >>> +
> >>> + fprintf(stderr, "%s: fsconfig source: %s\n",
> >>> + mo->msgtag, strerror(error));
> >>> + emit_fsconfig_messages(mo);
> >>> + return mount_service_send_reply(mo, error);
> >>> + }
> >>> + }
> >>> +#endif
> >>> +
> >>> return mount_service_send_reply(mo, 0);
> >>> }
> >>>
> >>> @@ -722,6 +782,8 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
> >>> {
> >>> struct fuse_service_string_command *oc =
> >>> container_of(p, struct fuse_service_string_command, p);
> >>> + char *tokstr = oc->value;
> >>> + char *tok, *savetok;
> >>>
> >>> if (mo->mntopts) {
> >>> fprintf(stderr, "%s: mount options respecified!\n",
> >>> @@ -738,6 +800,45 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
> >>> return mount_service_send_reply(mo, error);
> >>> }
> >>>
> >>> + /* strtok_r mutates tokstr aka oc->value */
> >>> + while ((tok = strtok_r(tokstr, ",", &savetok)) != NULL) {
> >>> + char *equals = strchr(tok, '=');
> >>> + char oldchar = 0;
> >>> +
> >>> + if (equals) {
> >>> + oldchar = *equals;
> >>> + *equals = 0;
> >>> + }
> >>> +
> >>> +#ifdef HAVE_NEW_MOUNT_API
> >>> + if (mo->fsopenfd >= 0) {
> >>> + int ret;
> >>> +
> >>> + if (equals)
> >>> + ret = fsconfig(mo->fsopenfd,
> >>> + FSCONFIG_SET_STRING, tok,
> >>> + equals + 1, 0);
> >>> + else
> >>> + ret = fsconfig(mo->fsopenfd,
> >>> + FSCONFIG_SET_FLAG, tok,
> >>> + NULL, 0);
> >>> + if (ret) {
> >>> + int error = errno;
> >>> +
> >>> + fprintf(stderr, "%s: set mount option: %s\n",
> >>> + mo->msgtag, strerror(error));
> >>> + emit_fsconfig_messages(mo);
> >>> + return mount_service_send_reply(mo, error);
> >>> + }
> >>> + }
> >>> +#endif
> >>> +
> >>> + if (equals)
> >>> + *equals = oldchar;
> >>> +
> >>> + tokstr = NULL;
> >>> + }
> >>> +
> >>> return mount_service_send_reply(mo, 0);
> >>> }
> >>>
> >>> @@ -875,6 +976,196 @@ static int mount_service_regular_mount(struct mount_service *mo,
> >>> return mount_service_send_reply(mo, 0);
> >>> }
> >>>
> >>> +#ifdef HAVE_NEW_MOUNT_API
> >>> +struct ms_to_mount_map {
> >>> + unsigned long ms_flag;
> >>> + unsigned int mount_attr_flag;
> >>> +};
> >>> +
> >>> +static const struct ms_to_mount_map attrs[] = {
> >>> + { MS_RDONLY, MOUNT_ATTR_RDONLY },
> >>> + { MS_NOSUID, MOUNT_ATTR_NOSUID },
> >>> + { MS_NODEV, MOUNT_ATTR_NODEV },
> >>> + { MS_NOEXEC, MOUNT_ATTR_NOEXEC },
> >>> + { MS_RELATIME, MOUNT_ATTR_RELATIME },
> >>> + { MS_NOATIME, MOUNT_ATTR_NOATIME },
> >>> + { MS_STRICTATIME, MOUNT_ATTR_STRICTATIME },
> >>> + { MS_NODIRATIME, MOUNT_ATTR_NODIRATIME },
> >>> +#ifdef MOUNT_ATTR_NOSYMFOLLOW
> >>> + { MS_NOSYMFOLLOW, MOUNT_ATTR_NOSYMFOLLOW },
> >>> +#endif
> >>> + { 0, 0 },
> >>> +};
> >>> +
> >>> +static void get_mount_attr_flags(const struct fuse_service_mount_command *oc,
> >>> + unsigned int *attr_flags,
> >>> + unsigned long *leftover_ms_flags)
> >>> +{
> >>> + const struct ms_to_mount_map *i;
> >>> + unsigned int ms_flags = ntohl(oc->ms_flags);
> >>> + unsigned int mount_attr_flags = 0;
> >>> +
> >>> + for (i = attrs; i->ms_flag != 0; i++) {
> >>> + if (ms_flags & i->ms_flag)
> >>> + mount_attr_flags |= i->mount_attr_flag;
> >>> + ms_flags &= ~i->ms_flag;
> >>> + }
> >>> +
> >>> + *leftover_ms_flags = ms_flags;
> >>> + *attr_flags = mount_attr_flags;
> >>> +}
> >>> +
> >>> +struct ms_to_str_map {
> >>> + unsigned long ms_flag;
> >>> + const char *string;
> >>> +};
> >>> +
> >>> +static const struct ms_to_str_map strflags[] = {
> >>> + { MS_SYNCHRONOUS, "sync" },
> >>> + { MS_DIRSYNC, "dirsync" },
> >>> + { MS_LAZYTIME, "lazytime" },
> >>> + { 0, 0 },
> >>> +};
> >>> +
> >>> +static int set_ms_flags(struct mount_service *mo, unsigned long ms_flags)
> >>> +{
> >>> + const struct ms_to_str_map *i;
> >>> + int ret;
> >>> +
> >>> + for (i = strflags; i->ms_flag != 0; i++) {
> >>> + if (!(ms_flags & i->ms_flag))
> >>> + continue;
> >>> +
> >>> + ret = fsconfig(mo->fsopenfd, FSCONFIG_SET_FLAG, i->string,
> >>> + NULL, 0);
> >>> + if (ret) {
> >>> + int error = errno;
> >>> +
> >>> + fprintf(stderr, "%s: set %s option: %s\n",
> >>> + mo->msgtag, i->string, strerror(error));
> >>> + emit_fsconfig_messages(mo);
> >>> +
> >>> + errno = error;
> >>> + return -1;
> >>> + }
> >>> + ms_flags &= ~i->ms_flag;
> >>> + }
> >>> +
> >>> + /*
> >>> + * We can't translate all the supplied MS_ flags into MOUNT_ATTR_ flags
> >>> + * or string flags! Return a magic code so the caller will fall back
> >>> + * to regular mount(2).
> >>> + */
> >>> + return ms_flags ? -2 : 0;
> >>> +}
> >>
> >> Let's please not forget later on to use the new define.
> >
> > Er... which new define? HAVE_NEW_MOUNT_API? I think we're still inside
> > the #ifdef for that at this point.
> >
> > <confused>
>
>
> Sorry, I meant FUSE_MOUNT_FALLBACK_NEEDED.
Fixed.
--D
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 05/17] mount_service: update mtab after a successful mount
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (3 preceding siblings ...)
2026-03-27 1:25 ` [PATCH 04/17] mount_service: use the new mount api for the mount service Darrick J. Wong
@ 2026-03-27 1:26 ` Darrick J. Wong
2026-03-27 1:26 ` [PATCH 06/17] util: hoist the fuse.conf parsing code Darrick J. Wong
` (11 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:26 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Update "mtab" so that non-kernel mount options (e.g. "x-fubar=XXX") are
recorded somewhere so that userspace utilities can pick that up. Note
that this likely is not the venerable /etc/mtab, which has been a
symlink to procfs for years. On a modern system, these non-kernel
options end up /run/mount/utab.
But that's not a detail that libfuse has to worry about directly; it's
really just calling mount -f(ake) to make the changes it wants. Old
hats may remember the use of mount -f to update /etc/mtab after mounting
the root filesystem.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
include/fuse_service_priv.h | 1 +
lib/mount_common_i.h | 1 +
lib/fuse_service.c | 15 ++++++++++++++
lib/mount.c | 7 ++++++
util/mount_service.c | 47 +++++++++++++++++++++++++++++++++++++++++++
5 files changed, 71 insertions(+)
diff --git a/include/fuse_service_priv.h b/include/fuse_service_priv.h
index d1fdd6221b5268..17002249d6a02e 100644
--- a/include/fuse_service_priv.h
+++ b/include/fuse_service_priv.h
@@ -36,6 +36,7 @@ struct fuse_service_memfd_argv {
#define FUSE_SERVICE_MNTPT_CMD 0x4d4e5450 /* MNTP */
#define FUSE_SERVICE_MOUNT_CMD 0x444f4954 /* DOIT */
#define FUSE_SERVICE_BYE_CMD 0x42594545 /* BYEE */
+#define FUSE_SERVICE_MTABOPTS_CMD 0x4d544142 /* MTAB */
/* mount.service sends replies to the fuse server */
#define FUSE_SERVICE_OPEN_REPLY 0x46494c45 /* FILE */
diff --git a/lib/mount_common_i.h b/lib/mount_common_i.h
index 631dff3e6f8aaf..541cdebae4f47a 100644
--- a/lib/mount_common_i.h
+++ b/lib/mount_common_i.h
@@ -15,6 +15,7 @@ struct mount_opts;
char *fuse_mnt_build_source(const struct mount_opts *mo);
char *fuse_mnt_build_type(const struct mount_opts *mo);
char *fuse_mnt_kernel_opts(const struct mount_opts *mo);
+char *fuse_mnt_mtab_opts(const struct mount_opts *mo);
unsigned int fuse_mnt_flags(const struct mount_opts *mo);
diff --git a/lib/fuse_service.c b/lib/fuse_service.c
index 795453693da09b..8076a8b2737574 100644
--- a/lib/fuse_service.c
+++ b/lib/fuse_service.c
@@ -804,6 +804,7 @@ int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
char *fstype = fuse_mnt_build_type(se->mo);
char *source = fuse_mnt_build_source(se->mo);
char *mntopts = fuse_mnt_kernel_opts(se->mo);
+ char *mtabopts = fuse_mnt_mtab_opts(se->mo);
char path[32];
int ret;
int error;
@@ -871,6 +872,19 @@ int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
}
}
+ if (mtabopts) {
+ ret = send_string(sf, FUSE_SERVICE_MTABOPTS_CMD, mtabopts,
+ &error);
+ if (ret)
+ goto out_strings;
+ if (error) {
+ fuse_log(FUSE_LOG_ERR, "fuse: service fs mtab options: %s\n",
+ strerror(error));
+ ret = -error;
+ goto out_strings;
+ }
+ }
+
ret = send_mount(sf, fuse_mnt_flags(se->mo), expected_fmt, &error);
if (ret)
goto out_strings;
@@ -889,6 +903,7 @@ int fuse_service_session_mount(struct fuse_service *sf, struct fuse_session *se,
opts->foreground = 1;
out_strings:
+ free(mtabopts);
free(mntopts);
free(source);
free(fstype);
diff --git a/lib/mount.c b/lib/mount.c
index 2018172ae570f0..ce8f58450827ce 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -758,6 +758,13 @@ char *fuse_mnt_kernel_opts(const struct mount_opts *mo)
return NULL;
}
+char *fuse_mnt_mtab_opts(const struct mount_opts *mo)
+{
+ if (mo->mtab_opts)
+ return strdup(mo->mtab_opts);
+ return NULL;
+}
+
unsigned int fuse_mnt_flags(const struct mount_opts *mo)
{
return mo->flags;
diff --git a/util/mount_service.c b/util/mount_service.c
index 4a2c1111b66b91..2e541f67277ee5 100644
--- a/util/mount_service.c
+++ b/util/mount_service.c
@@ -54,6 +54,9 @@ struct mount_service {
/* mount options */
char *mntopts;
+ /* mtab options */
+ char *mtabopts;
+
/* socket fd */
int sockfd;
@@ -842,6 +845,30 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
return mount_service_send_reply(mo, 0);
}
+static int mount_service_handle_mtabopts_cmd(struct mount_service *mo,
+ const struct fuse_service_packet *p)
+{
+ struct fuse_service_string_command *oc =
+ container_of(p, struct fuse_service_string_command, p);
+
+ if (mo->mtabopts) {
+ fprintf(stderr, "%s: mtab options respecified!\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EINVAL);
+ }
+
+ mo->mtabopts = strdup(oc->value);
+ if (!mo->mtabopts) {
+ int error = errno;
+
+ fprintf(stderr, "%s: alloc mtab options string: %s\n",
+ mo->msgtag, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ return mount_service_send_reply(mo, 0);
+}
+
static int mount_service_handle_mountpoint_cmd(struct mount_service *mo,
const struct fuse_service_packet *p)
{
@@ -973,6 +1000,14 @@ static int mount_service_regular_mount(struct mount_service *mo,
return mount_service_send_reply(mo, error);
}
+ /*
+ * The mount succeeded, so we send a positive reply even if the mtab
+ * update fails.
+ */
+ if (mo->mtabopts)
+ fuse_mnt_add_mount(mo->msgtag, mo->source, mo->mountpoint,
+ mo->fstype, mo->mtabopts);
+
return mount_service_send_reply(mo, 0);
}
@@ -1155,6 +1190,14 @@ static int mount_service_fsopen_mount(struct mount_service *mo,
goto fail_mount;
}
+ /*
+ * The mount succeeded, so we send a positive reply even if the mtab
+ * update fails.
+ */
+ if (mo->mtabopts)
+ fuse_mnt_add_mount(mo->msgtag, mo->source, mo->mountpoint,
+ mo->fstype, mo->mtabopts);
+
return mount_service_send_reply(mo, 0);
fail_fsconfig:
@@ -1274,6 +1317,7 @@ static void mount_service_destroy(struct mount_service *mo)
free(mo->source);
free(mo->mountpoint);
+ free(mo->mtabopts);
free(mo->mntopts);
free(mo->fstype);
@@ -1359,6 +1403,9 @@ int mount_service_main(int argc, char *argv[])
case FUSE_SERVICE_MNTPT_CMD:
ret = mount_service_handle_mountpoint_cmd(&mo, p);
break;
+ case FUSE_SERVICE_MTABOPTS_CMD:
+ ret = mount_service_handle_mtabopts_cmd(&mo, p);
+ break;
case FUSE_SERVICE_MOUNT_CMD:
ret = mount_service_handle_mount_cmd(&mo, p);
break;
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 06/17] util: hoist the fuse.conf parsing code
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (4 preceding siblings ...)
2026-03-27 1:26 ` [PATCH 05/17] mount_service: update mtab after a successful mount Darrick J. Wong
@ 2026-03-27 1:26 ` Darrick J. Wong
2026-03-27 1:26 ` [PATCH 07/17] util: fix checkpatch complaints in fuser_conf.[ch] Darrick J. Wong
` (10 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:26 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Move all the code that parses fuse.conf into a separate file in util/ so
that fuservicemount can read the same file. We'll add the limit
enforcement in separate patches.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/fuser_conf.h | 36 ++++++++
util/fuser_conf.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++
util/fusermount.c | 221 +--------------------------------------------------
util/meson.build | 6 +
4 files changed, 273 insertions(+), 221 deletions(-)
create mode 100644 util/fuser_conf.h
create mode 100644 util/fuser_conf.c
diff --git a/util/fuser_conf.h b/util/fuser_conf.h
new file mode 100644
index 00000000000000..1228595ca2c933
--- /dev/null
+++ b/util/fuser_conf.h
@@ -0,0 +1,36 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
+ *
+ * This program can be distributed under the terms of the GNU LGPLv2.
+ * See the file LGPL2.txt.
+ */
+#ifndef FUSER_CONF_H_
+#define FUSER_CONF_H_
+
+extern int user_allow_other;
+extern int mount_max;
+
+void unescape(char *buf);
+
+#ifdef GETMNTENT_NEEDS_UNESCAPING
+static inline struct mntent *GETMNTENT(FILE *stream)
+{
+ struct mntent *entp = getmntent(stream);
+ if(entp != NULL) {
+ unescape(entp->mnt_fsname);
+ unescape(entp->mnt_dir);
+ unescape(entp->mnt_type);
+ unescape(entp->mnt_opts);
+ }
+ return entp;
+}
+#else
+#define GETMNTENT getmntent
+#endif // GETMNTENT_NEEDS_UNESCAPING
+
+int count_fuse_fs(const char *progname);
+
+void read_conf(const char *progname);
+
+#endif /* FUSER_CONF_H_ */
diff --git a/util/fuser_conf.c b/util/fuser_conf.c
new file mode 100644
index 00000000000000..9969192433ee3e
--- /dev/null
+++ b/util/fuser_conf.c
@@ -0,0 +1,231 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ */
+/* This program parses fuse.conf */
+#define _GNU_SOURCE
+#include "fuse_config.h"
+#include "mount_util.h"
+#include "util.h"
+#include "fuser_conf.h"
+
+#include <string.h>
+#include <stddef.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <mntent.h>
+#include <unistd.h>
+
+#if defined HAVE_LISTMOUNT
+#include <linux/mount.h>
+#include <syscall.h>
+#include <stdint.h>
+#endif
+
+int user_allow_other = 0;
+int mount_max = 1000;
+
+// Older versions of musl libc don't unescape entries in /etc/mtab
+
+// unescapes octal sequences like \040 in-place
+// That's ok, because unescaping can not extend the length of the string.
+void unescape(char *buf)
+{
+ char *src = buf;
+ char *dest = buf;
+ while (1) {
+ char *next_src = strchrnul(src, '\\');
+ int offset = next_src - src;
+ memmove(dest, src, offset);
+ src = next_src;
+ dest += offset;
+
+ if(*src == '\0') {
+ *dest = *src;
+ return;
+ }
+ src++;
+
+ if('0' <= src[0] && src[0] < '2' &&
+ '0' <= src[1] && src[1] < '8' &&
+ '0' <= src[2] && src[2] < '8') {
+ *dest++ = (src[0] - '0') << 6
+ | (src[1] - '0') << 3
+ | (src[2] - '0') << 0;
+ src += 3;
+ } else if (src[0] == '\\') {
+ *dest++ = '\\';
+ src += 1;
+ } else {
+ *dest++ = '\\';
+ }
+ }
+}
+
+#ifndef IGNORE_MTAB
+static int count_fuse_fs_mtab(const char *progname)
+{
+ struct mntent *entp;
+ int count = 0;
+ const char *mtab = _PATH_MOUNTED;
+ FILE *fp = setmntent(mtab, "r");
+ if (fp == NULL) {
+ fprintf(stderr, "%s: failed to open %s: %s\n", progname, mtab,
+ strerror(errno));
+ return -1;
+ }
+ while ((entp = GETMNTENT(fp)) != NULL) {
+ if (strcmp(entp->mnt_type, "fuse") == 0 ||
+ strncmp(entp->mnt_type, "fuse.", 5) == 0)
+ count ++;
+ }
+ endmntent(fp);
+ return count;
+}
+
+#ifdef HAVE_LISTMOUNT
+static int count_fuse_fs_ls_mnt(const char *progname)
+{
+ #define SMBUF_SIZE 1024
+ #define MNT_ID_LEN 128
+
+ int fuse_count = 0;
+ int n_mounts = 0;
+ int ret = 0;
+ uint64_t mnt_ids[MNT_ID_LEN];
+ unsigned char smbuf[SMBUF_SIZE];
+ struct mnt_id_req req = {
+ .size = sizeof(struct mnt_id_req),
+ };
+ struct statmount *sm;
+
+ for (;;) {
+ req.mnt_id = LSMT_ROOT;
+
+ n_mounts = syscall(SYS_listmount, &req, &mnt_ids, MNT_ID_LEN, 0);
+ if (n_mounts == -1) {
+ if (errno != ENOSYS) {
+ fprintf(stderr, "%s: failed to list mounts: %s\n", progname,
+ strerror(errno));
+ }
+ return -1;
+ }
+
+ for (int i = 0; i < n_mounts; i++) {
+ req.mnt_id = mnt_ids[i];
+ req.param = STATMOUNT_FS_TYPE;
+ ret = syscall(SYS_statmount, &req, &smbuf, SMBUF_SIZE, 0);
+ if (ret) {
+ if (errno == ENOENT)
+ continue;
+
+ fprintf(stderr, "%s: failed to stat mount %lld: %s\n", progname,
+ req.mnt_id, strerror(errno));
+ return -1;
+ }
+
+ sm = (struct statmount *)smbuf;
+ if (sm->mask & STATMOUNT_FS_TYPE &&
+ strcmp(&sm->str[sm->fs_type], "fuse") == 0)
+ fuse_count++;
+ }
+
+ if (n_mounts < MNT_ID_LEN)
+ break;
+ req.param = mnt_ids[MNT_ID_LEN - 1];
+ }
+ return fuse_count;
+}
+
+int count_fuse_fs(const char *progname)
+{
+ int count = count_fuse_fs_ls_mnt(progname);
+
+ return count >= 0 ? count : count_fuse_fs_mtab(progname);
+}
+#else
+int count_fuse_fs(const char *progname)
+{
+ return count_fuse_fs_mtab(progname);
+}
+#endif /* HAVE_LISTMOUNT */
+#else
+static int count_fuse_fs(const char *progname)
+{
+ return 0;
+}
+#endif /* IGNORE_MTAB */
+
+static void strip_line(char *line)
+{
+ char *s = strchr(line, '#');
+ if (s != NULL)
+ s[0] = '\0';
+ for (s = line + strlen(line) - 1;
+ s >= line && isspace((unsigned char) *s); s--);
+ s[1] = '\0';
+ for (s = line; isspace((unsigned char) *s); s++);
+ if (s != line)
+ memmove(line, s, strlen(s)+1);
+}
+
+static void parse_line(const char *progname, char *line, int linenum)
+{
+ int tmp;
+ if (strcmp(line, "user_allow_other") == 0)
+ user_allow_other = 1;
+ else if (sscanf(line, "mount_max = %i", &tmp) == 1)
+ mount_max = tmp;
+ else if(line[0])
+ fprintf(stderr,
+ "%s: unknown parameter in %s at line %i: '%s'\n",
+ progname, FUSE_CONF, linenum, line);
+}
+
+void read_conf(const char *progname)
+{
+ FILE *fp = fopen(FUSE_CONF, "r");
+ if (fp != NULL) {
+ int linenum = 1;
+ char line[256];
+ int isnewline = 1;
+ while (fgets(line, sizeof(line), fp) != NULL) {
+ if (isnewline) {
+ if (line[strlen(line)-1] == '\n') {
+ strip_line(line);
+ parse_line(progname, line, linenum);
+ } else {
+ isnewline = 0;
+ }
+ } else if(line[strlen(line)-1] == '\n') {
+ fprintf(stderr, "%s: reading %s: line %i too long\n", progname, FUSE_CONF, linenum);
+
+ isnewline = 1;
+ }
+ if (isnewline)
+ linenum ++;
+ }
+ if (!isnewline) {
+ fprintf(stderr, "%s: reading %s: missing newline at end of file\n", progname, FUSE_CONF);
+
+ }
+ if (ferror(fp)) {
+ fprintf(stderr, "%s: reading %s: read failed\n", progname, FUSE_CONF);
+ exit(1);
+ }
+ fclose(fp);
+ } else if (errno != ENOENT) {
+ bool fatal = (errno != EACCES && errno != ELOOP &&
+ errno != ENAMETOOLONG && errno != ENOTDIR &&
+ errno != EOVERFLOW);
+ fprintf(stderr, "%s: failed to open %s: %s\n",
+ progname, FUSE_CONF, strerror(errno));
+ if (fatal)
+ exit(1);
+ }
+}
diff --git a/util/fusermount.c b/util/fusermount.c
index 6e66bf07300d6d..3386ba4791cefd 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -11,6 +11,7 @@
#include "fuse_config.h"
#include "mount_util.h"
#include "util.h"
+#include "fuser_conf.h"
#include <stdio.h>
#include <stdlib.h>
@@ -50,63 +51,8 @@
static const char *progname;
-static int user_allow_other = 0;
-static int mount_max = 1000;
-
static int auto_unmount = 0;
-#ifdef GETMNTENT_NEEDS_UNESCAPING
-// Older versions of musl libc don't unescape entries in /etc/mtab
-
-// unescapes octal sequences like \040 in-place
-// That's ok, because unescaping can not extend the length of the string.
-static void unescape(char *buf) {
- char *src = buf;
- char *dest = buf;
- while (1) {
- char *next_src = strchrnul(src, '\\');
- int offset = next_src - src;
- memmove(dest, src, offset);
- src = next_src;
- dest += offset;
-
- if(*src == '\0') {
- *dest = *src;
- return;
- }
- src++;
-
- if('0' <= src[0] && src[0] < '2' &&
- '0' <= src[1] && src[1] < '8' &&
- '0' <= src[2] && src[2] < '8') {
- *dest++ = (src[0] - '0') << 6
- | (src[1] - '0') << 3
- | (src[2] - '0') << 0;
- src += 3;
- } else if (src[0] == '\\') {
- *dest++ = '\\';
- src += 1;
- } else {
- *dest++ = '\\';
- }
- }
-}
-
-static struct mntent *GETMNTENT(FILE *stream)
-{
- struct mntent *entp = getmntent(stream);
- if(entp != NULL) {
- unescape(entp->mnt_fsname);
- unescape(entp->mnt_dir);
- unescape(entp->mnt_type);
- unescape(entp->mnt_opts);
- }
- return entp;
-}
-#else
-#define GETMNTENT getmntent
-#endif // GETMNTENT_NEEDS_UNESCAPING
-
/*
* Take a ',' separated option string and extract "x-" options
*/
@@ -569,99 +515,7 @@ static int unmount_fuse(const char *mnt, int quiet, int lazy)
return res;
}
-static int count_fuse_fs_mtab(void)
-{
- struct mntent *entp;
- int count = 0;
- const char *mtab = _PATH_MOUNTED;
- FILE *fp = setmntent(mtab, "r");
- if (fp == NULL) {
- fprintf(stderr, "%s: failed to open %s: %s\n", progname, mtab,
- strerror(errno));
- return -1;
- }
- while ((entp = GETMNTENT(fp)) != NULL) {
- if (strcmp(entp->mnt_type, "fuse") == 0 ||
- strncmp(entp->mnt_type, "fuse.", 5) == 0)
- count ++;
- }
- endmntent(fp);
- return count;
-}
-
-#ifdef HAVE_LISTMOUNT
-static int count_fuse_fs_ls_mnt(void)
-{
- #define SMBUF_SIZE 1024
- #define MNT_ID_LEN 128
-
- int fuse_count = 0;
- int n_mounts = 0;
- int ret = 0;
- uint64_t mnt_ids[MNT_ID_LEN];
- unsigned char smbuf[SMBUF_SIZE];
- struct mnt_id_req req = {
- .size = sizeof(struct mnt_id_req),
- };
- struct statmount *sm;
-
- for (;;) {
- req.mnt_id = LSMT_ROOT;
-
- n_mounts = syscall(SYS_listmount, &req, &mnt_ids, MNT_ID_LEN, 0);
- if (n_mounts == -1) {
- if (errno != ENOSYS) {
- fprintf(stderr, "%s: failed to list mounts: %s\n", progname,
- strerror(errno));
- }
- return -1;
- }
-
- for (int i = 0; i < n_mounts; i++) {
- req.mnt_id = mnt_ids[i];
- req.param = STATMOUNT_FS_TYPE;
- ret = syscall(SYS_statmount, &req, &smbuf, SMBUF_SIZE, 0);
- if (ret) {
- if (errno == ENOENT)
- continue;
-
- fprintf(stderr, "%s: failed to stat mount %lld: %s\n", progname,
- req.mnt_id, strerror(errno));
- return -1;
- }
-
- sm = (struct statmount *)smbuf;
- if (sm->mask & STATMOUNT_FS_TYPE &&
- strcmp(&sm->str[sm->fs_type], "fuse") == 0)
- fuse_count++;
- }
-
- if (n_mounts < MNT_ID_LEN)
- break;
- req.param = mnt_ids[MNT_ID_LEN - 1];
- }
- return fuse_count;
-}
-
-static int count_fuse_fs(void)
-{
- int count = count_fuse_fs_ls_mnt();
-
- return count >= 0 ? count : count_fuse_fs_mtab();
-}
-#else
-static int count_fuse_fs(void)
-{
- return count_fuse_fs_mtab();
-}
-#endif
-
#else /* IGNORE_MTAB */
-static int count_fuse_fs(void)
-{
- return 0;
-}
-
static int add_mount(const char *source, const char *mnt, const char *type,
const char *opts)
{
@@ -679,75 +533,6 @@ static int unmount_fuse(const char *mnt, int quiet, int lazy)
}
#endif /* IGNORE_MTAB */
-static void strip_line(char *line)
-{
- char *s = strchr(line, '#');
- if (s != NULL)
- s[0] = '\0';
- for (s = line + strlen(line) - 1;
- s >= line && isspace((unsigned char) *s); s--);
- s[1] = '\0';
- for (s = line; isspace((unsigned char) *s); s++);
- if (s != line)
- memmove(line, s, strlen(s)+1);
-}
-
-static void parse_line(char *line, int linenum)
-{
- int tmp;
- if (strcmp(line, "user_allow_other") == 0)
- user_allow_other = 1;
- else if (sscanf(line, "mount_max = %i", &tmp) == 1)
- mount_max = tmp;
- else if(line[0])
- fprintf(stderr,
- "%s: unknown parameter in %s at line %i: '%s'\n",
- progname, FUSE_CONF, linenum, line);
-}
-
-static void read_conf(void)
-{
- FILE *fp = fopen(FUSE_CONF, "r");
- if (fp != NULL) {
- int linenum = 1;
- char line[256];
- int isnewline = 1;
- while (fgets(line, sizeof(line), fp) != NULL) {
- if (isnewline) {
- if (line[strlen(line)-1] == '\n') {
- strip_line(line);
- parse_line(line, linenum);
- } else {
- isnewline = 0;
- }
- } else if(line[strlen(line)-1] == '\n') {
- fprintf(stderr, "%s: reading %s: line %i too long\n", progname, FUSE_CONF, linenum);
-
- isnewline = 1;
- }
- if (isnewline)
- linenum ++;
- }
- if (!isnewline) {
- fprintf(stderr, "%s: reading %s: missing newline at end of file\n", progname, FUSE_CONF);
-
- }
- if (ferror(fp)) {
- fprintf(stderr, "%s: reading %s: read failed\n", progname, FUSE_CONF);
- exit(1);
- }
- fclose(fp);
- } else if (errno != ENOENT) {
- bool fatal = (errno != EACCES && errno != ELOOP &&
- errno != ENAMETOOLONG && errno != ENOTDIR &&
- errno != EOVERFLOW);
- fprintf(stderr, "%s: failed to open %s: %s\n",
- progname, FUSE_CONF, strerror(errno));
- if (fatal)
- exit(1);
- }
-}
-
static int begins_with(const char *s, const char *beg)
{
if (strncmp(s, beg, strlen(beg)) == 0)
@@ -1271,10 +1056,10 @@ static int mount_fuse(const char *mnt, const char *opts, const char **type)
return -1;
drop_privs();
- read_conf();
+ read_conf(progname);
if (getuid() != 0 && mount_max != -1) {
- int mount_count = count_fuse_fs();
+ int mount_count = count_fuse_fs(progname);
if (mount_count >= mount_max) {
fprintf(stderr, "%s: too many FUSE filesystems mounted; mount_max=N can be set in %s\n", progname, FUSE_CONF);
goto fail_close_fd;
diff --git a/util/meson.build b/util/meson.build
index 403fc68ef67ae8..47c5f8ac213675 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -1,18 +1,18 @@
fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf')
-executable('fusermount3', ['fusermount.c', '../lib/mount_util.c', '../lib/util.c'],
+executable('fusermount3', ['fusermount.c', '../lib/mount_util.c', '../lib/util.c', 'fuser_conf.c'],
include_directories: include_dirs,
install: true,
install_dir: get_option('bindir'),
c_args: '-DFUSE_CONF="@0@"'.format(fuseconf_path))
if private_cfg.get('HAVE_SERVICEMOUNT', false)
- executable('fuservicemount3', ['mount_service.c', 'fuservicemount.c', '../lib/mount_util.c'],
+ executable('fuservicemount3', ['mount_service.c', 'fuservicemount.c', '../lib/mount_util.c', 'fuser_conf.c'],
include_directories: include_dirs,
link_with: [ libfuse ],
install: true,
install_dir: get_option('sbindir'),
- c_args: '-DFUSE_USE_VERSION=317')
+ c_args: ['-DFUSE_USE_VERSION=317', '-DFUSE_CONF="@0@"'.format(fuseconf_path)])
endif
executable('mount.fuse3', ['mount.fuse.c'],
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 07/17] util: fix checkpatch complaints in fuser_conf.[ch]
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (5 preceding siblings ...)
2026-03-27 1:26 ` [PATCH 06/17] util: hoist the fuse.conf parsing code Darrick J. Wong
@ 2026-03-27 1:26 ` Darrick J. Wong
2026-03-27 1:26 ` [PATCH 08/17] mount_service: read fuse.conf to enable allow_other for unprivileged mounts Darrick J. Wong
` (9 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:26 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Fix the checkpatch complaints because we touched some code.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/fuser_conf.h | 3 ++-
util/fuser_conf.c | 41 ++++++++++++++++++++++++++---------------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/util/fuser_conf.h b/util/fuser_conf.h
index 1228595ca2c933..8a1bd586e13093 100644
--- a/util/fuser_conf.h
+++ b/util/fuser_conf.h
@@ -17,7 +17,8 @@ void unescape(char *buf);
static inline struct mntent *GETMNTENT(FILE *stream)
{
struct mntent *entp = getmntent(stream);
- if(entp != NULL) {
+
+ if (entp != NULL) {
unescape(entp->mnt_fsname);
unescape(entp->mnt_dir);
unescape(entp->mnt_type);
diff --git a/util/fuser_conf.c b/util/fuser_conf.c
index 9969192433ee3e..6b41bb60c63392 100644
--- a/util/fuser_conf.c
+++ b/util/fuser_conf.c
@@ -27,7 +27,7 @@
#include <stdint.h>
#endif
-int user_allow_other = 0;
+int user_allow_other;
int mount_max = 1000;
// Older versions of musl libc don't unescape entries in /etc/mtab
@@ -38,25 +38,27 @@ void unescape(char *buf)
{
char *src = buf;
char *dest = buf;
+
while (1) {
char *next_src = strchrnul(src, '\\');
int offset = next_src - src;
+
memmove(dest, src, offset);
src = next_src;
dest += offset;
- if(*src == '\0') {
+ if (*src == '\0') {
*dest = *src;
return;
}
src++;
- if('0' <= src[0] && src[0] < '2' &&
- '0' <= src[1] && src[1] < '8' &&
- '0' <= src[2] && src[2] < '8') {
+ if ('0' <= src[0] && src[0] < '2' &&
+ '0' <= src[1] && src[1] < '8' &&
+ '0' <= src[2] && src[2] < '8') {
*dest++ = (src[0] - '0') << 6
- | (src[1] - '0') << 3
- | (src[2] - '0') << 0;
+ | (src[1] - '0') << 3
+ | (src[2] - '0') << 0;
src += 3;
} else if (src[0] == '\\') {
*dest++ = '\\';
@@ -74,6 +76,7 @@ static int count_fuse_fs_mtab(const char *progname)
int count = 0;
const char *mtab = _PATH_MOUNTED;
FILE *fp = setmntent(mtab, "r");
+
if (fp == NULL) {
fprintf(stderr, "%s: failed to open %s: %s\n", progname, mtab,
strerror(errno));
@@ -82,7 +85,7 @@ static int count_fuse_fs_mtab(const char *progname)
while ((entp = GETMNTENT(fp)) != NULL) {
if (strcmp(entp->mnt_type, "fuse") == 0 ||
strncmp(entp->mnt_type, "fuse.", 5) == 0)
- count ++;
+ count++;
}
endmntent(fp);
return count;
@@ -164,12 +167,15 @@ static int count_fuse_fs(const char *progname)
static void strip_line(char *line)
{
char *s = strchr(line, '#');
+
if (s != NULL)
s[0] = '\0';
for (s = line + strlen(line) - 1;
- s >= line && isspace((unsigned char) *s); s--);
+ s >= line && isspace((unsigned char) *s); s--) {
+ }
s[1] = '\0';
- for (s = line; isspace((unsigned char) *s); s++);
+ for (s = line; isspace((unsigned char) *s); s++)
+ ; /* empty */
if (s != line)
memmove(line, s, strlen(s)+1);
}
@@ -177,11 +183,12 @@ static void strip_line(char *line)
static void parse_line(const char *progname, char *line, int linenum)
{
int tmp;
+
if (strcmp(line, "user_allow_other") == 0)
user_allow_other = 1;
else if (sscanf(line, "mount_max = %i", &tmp) == 1)
mount_max = tmp;
- else if(line[0])
+ else if (line[0])
fprintf(stderr,
"%s: unknown parameter in %s at line %i: '%s'\n",
progname, FUSE_CONF, linenum, line);
@@ -190,10 +197,12 @@ static void parse_line(const char *progname, char *line, int linenum)
void read_conf(const char *progname)
{
FILE *fp = fopen(FUSE_CONF, "r");
+
if (fp != NULL) {
int linenum = 1;
char line[256];
int isnewline = 1;
+
while (fgets(line, sizeof(line), fp) != NULL) {
if (isnewline) {
if (line[strlen(line)-1] == '\n') {
@@ -202,16 +211,18 @@ void read_conf(const char *progname)
} else {
isnewline = 0;
}
- } else if(line[strlen(line)-1] == '\n') {
- fprintf(stderr, "%s: reading %s: line %i too long\n", progname, FUSE_CONF, linenum);
+ } else if (line[strlen(line)-1] == '\n') {
+ fprintf(stderr, "%s: reading %s: line %i too long\n",
+ progname, FUSE_CONF, linenum);
isnewline = 1;
}
if (isnewline)
- linenum ++;
+ linenum++;
}
if (!isnewline) {
- fprintf(stderr, "%s: reading %s: missing newline at end of file\n", progname, FUSE_CONF);
+ fprintf(stderr, "%s: reading %s: missing newline at end of file\n",
+ progname, FUSE_CONF);
}
if (ferror(fp)) {
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 08/17] mount_service: read fuse.conf to enable allow_other for unprivileged mounts
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (6 preceding siblings ...)
2026-03-27 1:26 ` [PATCH 07/17] util: fix checkpatch complaints in fuser_conf.[ch] Darrick J. Wong
@ 2026-03-27 1:26 ` Darrick J. Wong
2026-03-27 1:27 ` [PATCH 09/17] util: hoist the other non-root user limits Darrick J. Wong
` (8 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:26 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Now that we've hoisted the fuse.conf parsing and enforcement code into a
shared file, we can make fuservicemount use the same config file for the
same kinds of parsing. This will enable distros to install
fuservicemount as a setuid program so that unprivileged userspace can
also access containerized fuse servers.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/mount_service.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/util/mount_service.c b/util/mount_service.c
index 2e541f67277ee5..9f6feab902f89d 100644
--- a/util/mount_service.c
+++ b/util/mount_service.c
@@ -31,6 +31,7 @@
#include "fuse_i.h"
#include "fuse_service_priv.h"
#include "mount_service.h"
+#include "fuser_conf.h"
struct mount_service {
/* prefix for printing error messages */
@@ -199,7 +200,7 @@ static int mount_service_send_hello(struct mount_service *mo)
};
ssize_t size;
- if (getuid() == 0)
+ if (getuid() == 0 || user_allow_other)
hello.flags |= htonl(FUSE_SERVICE_FLAG_ALLOW_OTHER);
size = sendmsg(mo->sockfd, &msg, MSG_EOR | MSG_NOSIGNAL);
@@ -813,6 +814,20 @@ static int mount_service_handle_mntopts_cmd(struct mount_service *mo,
*equals = 0;
}
+ if (getuid() != 0 && !user_allow_other &&
+ (!strcmp(tok, "allow_other") ||
+ !strcmp(tok, "allow_root"))) {
+ fprintf(stderr,
+"%s: option %s only allowed if 'user_allow_other' is set in %s\n",
+ mo->msgtag, tok, FUSE_CONF);
+ return mount_service_send_reply(mo, EPERM);
+ }
+ if (!strcmp(tok, "blkdev") && getuid() != 0) {
+ fprintf(stderr, "%s: option blkdev is privileged\n",
+ mo->msgtag);
+ return mount_service_send_reply(mo, EPERM);
+ }
+
#ifdef HAVE_NEW_MOUNT_API
if (mo->fsopenfd >= 0) {
int ret;
@@ -1347,6 +1362,8 @@ int mount_service_main(int argc, char *argv[])
else
mo.msgtag = "mount.service";
+ read_conf(mo.msgtag);
+
ret = mount_service_init(&mo, argc, argv);
if (ret)
return EXIT_FAILURE;
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 09/17] util: hoist the other non-root user limits
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (7 preceding siblings ...)
2026-03-27 1:26 ` [PATCH 08/17] mount_service: read fuse.conf to enable allow_other for unprivileged mounts Darrick J. Wong
@ 2026-03-27 1:27 ` Darrick J. Wong
2026-03-27 1:27 ` [PATCH 10/17] util: fix more checkpatch complaints in fuser_conf.[ch] Darrick J. Wong
` (7 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:27 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Hoist the rest of the security checks that occur when fusermount is
trying to start up a filesystem but is not running as root. We'll want
that for fusermount in a moment.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/fuser_conf.h | 13 ++++++
util/fuser_conf.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++
util/fusermount.c | 101 ++------------------------------------------
3 files changed, 140 insertions(+), 97 deletions(-)
diff --git a/util/fuser_conf.h b/util/fuser_conf.h
index 8a1bd586e13093..0bf6f98ee49c32 100644
--- a/util/fuser_conf.h
+++ b/util/fuser_conf.h
@@ -8,6 +8,9 @@
#ifndef FUSER_CONF_H_
#define FUSER_CONF_H_
+#include <sys/vfs.h>
+#include <sys/stat.h>
+
extern int user_allow_other;
extern int mount_max;
@@ -34,4 +37,14 @@ int count_fuse_fs(const char *progname);
void read_conf(const char *progname);
+void drop_privs(void);
+void restore_privs(void);
+
+int check_nonroot_mount_count(const char *progname);
+
+int check_nonroot_dir_access(const char *progname, const char *origmnt,
+ const char *mnt, const struct stat *stbuf);
+
+int check_nonroot_fstype(const char *progname, const struct statfs *fs_buf);
+
#endif /* FUSER_CONF_H_ */
diff --git a/util/fuser_conf.c b/util/fuser_conf.c
index 6b41bb60c63392..7d239a48671b5b 100644
--- a/util/fuser_conf.c
+++ b/util/fuser_conf.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <mntent.h>
#include <unistd.h>
+#include <sys/fsuid.h>
#if defined HAVE_LISTMOUNT
#include <linux/mount.h>
@@ -29,6 +30,8 @@
int user_allow_other;
int mount_max = 1000;
+static uid_t oldfsuid;
+static gid_t oldfsgid;
// Older versions of musl libc don't unescape entries in /etc/mtab
@@ -240,3 +243,123 @@ void read_conf(const char *progname)
exit(1);
}
}
+
+void drop_privs(void)
+{
+ if (getuid() != 0) {
+ oldfsuid = setfsuid(getuid());
+ oldfsgid = setfsgid(getgid());
+ }
+}
+
+void restore_privs(void)
+{
+ if (getuid() != 0) {
+ setfsuid(oldfsuid);
+ setfsgid(oldfsgid);
+ }
+}
+
+int check_nonroot_mount_count(const char *progname)
+{
+ if (mount_max == -1)
+ return 0;
+
+ int mount_count = count_fuse_fs(progname);
+
+ if (mount_count >= mount_max) {
+ fprintf(stderr,
+"%s: too many FUSE filesystems mounted; mount_max=N can be set in %s\n",
+ progname, FUSE_CONF);
+ return -1;
+ }
+
+ return 0;
+}
+
+int check_nonroot_dir_access(const char *progname, const char *origmnt,
+ const char *mnt, const struct stat *stbuf)
+{
+ int res;
+
+ if ((stbuf->st_mode & S_ISVTX) && stbuf->st_uid != getuid()) {
+ fprintf(stderr, "%s: mountpoint %s not owned by user\n",
+ progname, origmnt);
+ return -1;
+ }
+
+ res = access(mnt, W_OK);
+ if (res == -1) {
+ fprintf(stderr, "%s: user has no write access to mountpoint %s\n",
+ progname, origmnt);
+ return -1;
+ }
+
+ return 0;
+}
+
+int check_nonroot_fstype(const char *progname, const struct statfs *fs_buf)
+{
+ size_t i;
+
+ /* Do not permit mounting over anything in procfs - it has a couple
+ * places to which we have "write access" without being supposed to be
+ * able to just put anything we want there.
+ * Luckily, without allow_other, we can't get other users to actually
+ * use any fake information we try to put there anyway.
+ * Use a whitelist to be safe. */
+
+ /* Define permitted filesystems for the mount target. This was
+ * originally the same list as used by the ecryptfs mount helper
+ * (https://bazaar.launchpad.net/~ecryptfs/ecryptfs/trunk/view/head:/src/utils/mount.ecryptfs_private.c#L225)
+ * but got expanded as we found more filesystems that needed to be
+ * overlaid. */
+ typeof(fs_buf->f_type) f_type_whitelist[] = {
+ 0x61756673 /* AUFS_SUPER_MAGIC */,
+ 0x00000187 /* AUTOFS_SUPER_MAGIC */,
+ 0xCA451A4E /* BCACHEFS_STATFS_MAGIC */,
+ 0x9123683E /* BTRFS_SUPER_MAGIC */,
+ 0x00C36400 /* CEPH_SUPER_MAGIC */,
+ 0xFF534D42 /* CIFS_MAGIC_NUMBER */,
+ 0x0000F15F /* ECRYPTFS_SUPER_MAGIC */,
+ 0X2011BAB0 /* EXFAT_SUPER_MAGIC */,
+ 0x0000EF53 /* EXT[234]_SUPER_MAGIC */,
+ 0xF2F52010 /* F2FS_SUPER_MAGIC */,
+ 0x65735546 /* FUSE_SUPER_MAGIC */,
+ 0x01161970 /* GFS2_MAGIC */,
+ 0x47504653 /* GPFS_SUPER_MAGIC */,
+ 0x0000482b /* HFSPLUS_SUPER_MAGIC */,
+ 0x000072B6 /* JFFS2_SUPER_MAGIC */,
+ 0x3153464A /* JFS_SUPER_MAGIC */,
+ 0x0BD00BD0 /* LL_SUPER_MAGIC */,
+ 0X00004D44 /* MSDOS_SUPER_MAGIC */,
+ 0x0000564C /* NCP_SUPER_MAGIC */,
+ 0x00006969 /* NFS_SUPER_MAGIC */,
+ 0x00003434 /* NILFS_SUPER_MAGIC */,
+ 0x5346544E /* NTFS_SB_MAGIC */,
+ 0x7366746E /* NTFS3_SUPER_MAGIC */,
+ 0x5346414f /* OPENAFS_SUPER_MAGIC */,
+ 0x794C7630 /* OVERLAYFS_SUPER_MAGIC */,
+ 0xAAD7AAEA /* PANFS_SUPER_MAGIC */,
+ 0x52654973 /* REISERFS_SUPER_MAGIC */,
+ 0xFE534D42 /* SMB2_SUPER_MAGIC */,
+ 0x73717368 /* SQUASHFS_MAGIC */,
+ 0x01021994 /* TMPFS_MAGIC */,
+ 0x24051905 /* UBIFS_SUPER_MAGIC */,
+ 0x18031977 /* WEKAFS_SUPER_MAGIC */,
+#if __SIZEOF_LONG__ > 4
+ 0x736675005346544e /* UFSD */,
+#endif
+ 0x58465342 /* XFS_SB_MAGIC */,
+ 0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
+ 0x858458f6 /* RAMFS_MAGIC */,
+ };
+ for (i = 0; i < sizeof(f_type_whitelist)/sizeof(f_type_whitelist[0]); i++) {
+ if (f_type_whitelist[i] == fs_buf->f_type)
+ return 0;
+ }
+
+ fprintf(stderr, "%s: mounting over filesystem type %#010lx is forbidden\n",
+ progname, (unsigned long)fs_buf->f_type);
+ return -1;
+}
diff --git a/util/fusermount.c b/util/fusermount.c
index 3386ba4791cefd..54bd297e0ca6a9 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -134,25 +134,6 @@ static const char *get_user_name(void)
}
}
-static uid_t oldfsuid;
-static gid_t oldfsgid;
-
-static void drop_privs(void)
-{
- if (getuid() != 0) {
- oldfsuid = setfsuid(getuid());
- oldfsgid = setfsgid(getgid());
- }
-}
-
-static void restore_privs(void)
-{
- if (getuid() != 0) {
- setfsuid(oldfsuid);
- setfsgid(oldfsgid);
- }
-}
-
#ifndef IGNORE_MTAB
/*
* Make sure that /etc/mtab is checked and updated atomically
@@ -879,7 +860,6 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
const char *mnt = *mntp;
const char *origmnt = mnt;
struct statfs fs_buf;
- size_t i;
res = lstat(mnt, stbuf);
if (res == -1) {
@@ -909,18 +889,8 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
return -1;
}
- if ((stbuf->st_mode & S_ISVTX) && stbuf->st_uid != getuid()) {
- fprintf(stderr, "%s: mountpoint %s not owned by user\n",
- progname, origmnt);
+ if (!check_nonroot_dir_access(progname, origmnt, mnt, stbuf))
return -1;
- }
-
- res = access(mnt, W_OK);
- if (res == -1) {
- fprintf(stderr, "%s: user has no write access to mountpoint %s\n",
- progname, origmnt);
- return -1;
- }
} else if (S_ISREG(stbuf->st_mode)) {
static char procfile[256];
*mountpoint_fd = open(mnt, O_WRONLY);
@@ -952,71 +922,13 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
return -1;
}
- /* Do not permit mounting over anything in procfs - it has a couple
- * places to which we have "write access" without being supposed to be
- * able to just put anything we want there.
- * Luckily, without allow_other, we can't get other users to actually
- * use any fake information we try to put there anyway.
- * Use a whitelist to be safe. */
if (statfs(*mntp, &fs_buf)) {
fprintf(stderr, "%s: failed to access mountpoint %s: %s\n",
progname, mnt, strerror(errno));
return -1;
}
- /* Define permitted filesystems for the mount target. This was
- * originally the same list as used by the ecryptfs mount helper
- * (https://bazaar.launchpad.net/~ecryptfs/ecryptfs/trunk/view/head:/src/utils/mount.ecryptfs_private.c#L225)
- * but got expanded as we found more filesystems that needed to be
- * overlaid. */
- typeof(fs_buf.f_type) f_type_whitelist[] = {
- 0x61756673 /* AUFS_SUPER_MAGIC */,
- 0x00000187 /* AUTOFS_SUPER_MAGIC */,
- 0xCA451A4E /* BCACHEFS_STATFS_MAGIC */,
- 0x9123683E /* BTRFS_SUPER_MAGIC */,
- 0x00C36400 /* CEPH_SUPER_MAGIC */,
- 0xFF534D42 /* CIFS_MAGIC_NUMBER */,
- 0x0000F15F /* ECRYPTFS_SUPER_MAGIC */,
- 0X2011BAB0 /* EXFAT_SUPER_MAGIC */,
- 0x0000EF53 /* EXT[234]_SUPER_MAGIC */,
- 0xF2F52010 /* F2FS_SUPER_MAGIC */,
- 0x65735546 /* FUSE_SUPER_MAGIC */,
- 0x01161970 /* GFS2_MAGIC */,
- 0x47504653 /* GPFS_SUPER_MAGIC */,
- 0x0000482b /* HFSPLUS_SUPER_MAGIC */,
- 0x000072B6 /* JFFS2_SUPER_MAGIC */,
- 0x3153464A /* JFS_SUPER_MAGIC */,
- 0x0BD00BD0 /* LL_SUPER_MAGIC */,
- 0X00004D44 /* MSDOS_SUPER_MAGIC */,
- 0x0000564C /* NCP_SUPER_MAGIC */,
- 0x00006969 /* NFS_SUPER_MAGIC */,
- 0x00003434 /* NILFS_SUPER_MAGIC */,
- 0x5346544E /* NTFS_SB_MAGIC */,
- 0x7366746E /* NTFS3_SUPER_MAGIC */,
- 0x5346414f /* OPENAFS_SUPER_MAGIC */,
- 0x794C7630 /* OVERLAYFS_SUPER_MAGIC */,
- 0xAAD7AAEA /* PANFS_SUPER_MAGIC */,
- 0x52654973 /* REISERFS_SUPER_MAGIC */,
- 0xFE534D42 /* SMB2_SUPER_MAGIC */,
- 0x73717368 /* SQUASHFS_MAGIC */,
- 0x01021994 /* TMPFS_MAGIC */,
- 0x24051905 /* UBIFS_SUPER_MAGIC */,
- 0x18031977 /* WEKAFS_SUPER_MAGIC */,
-#if __SIZEOF_LONG__ > 4
- 0x736675005346544e /* UFSD */,
-#endif
- 0x58465342 /* XFS_SB_MAGIC */,
- 0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
- 0x858458f6 /* RAMFS_MAGIC */,
- };
- for (i = 0; i < sizeof(f_type_whitelist)/sizeof(f_type_whitelist[0]); i++) {
- if (f_type_whitelist[i] == fs_buf.f_type)
- return 0;
- }
-
- fprintf(stderr, "%s: mounting over filesystem type %#010lx is forbidden\n",
- progname, (unsigned long)fs_buf.f_type);
- return -1;
+ return check_nonroot_fstype(progname, &fs_buf);
}
static int open_fuse_device(const char *dev)
@@ -1058,13 +970,8 @@ static int mount_fuse(const char *mnt, const char *opts, const char **type)
drop_privs();
read_conf(progname);
- if (getuid() != 0 && mount_max != -1) {
- int mount_count = count_fuse_fs(progname);
- if (mount_count >= mount_max) {
- fprintf(stderr, "%s: too many FUSE filesystems mounted; mount_max=N can be set in %s\n", progname, FUSE_CONF);
- goto fail_close_fd;
- }
- }
+ if (getuid() != 0 && check_nonroot_mount_count(progname) != 0)
+ goto fail_close_fd;
// Extract any options starting with "x-"
res= extract_x_options(opts, &do_mount_opts, &x_opts);
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 10/17] util: fix more checkpatch complaints in fuser_conf.[ch]
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (8 preceding siblings ...)
2026-03-27 1:27 ` [PATCH 09/17] util: hoist the other non-root user limits Darrick J. Wong
@ 2026-03-27 1:27 ` Darrick J. Wong
2026-03-27 1:27 ` [PATCH 11/17] mount_service: use over the other non-root user checks Darrick J. Wong
` (6 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:27 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Fix the checkpatch complaints because we touched more code.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/fuser_conf.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/util/fuser_conf.c b/util/fuser_conf.c
index 7d239a48671b5b..e4ad31f26951f8 100644
--- a/util/fuser_conf.c
+++ b/util/fuser_conf.c
@@ -298,6 +298,8 @@ int check_nonroot_dir_access(const char *progname, const char *origmnt,
return 0;
}
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
int check_nonroot_fstype(const char *progname, const struct statfs *fs_buf)
{
size_t i;
@@ -307,13 +309,15 @@ int check_nonroot_fstype(const char *progname, const struct statfs *fs_buf)
* able to just put anything we want there.
* Luckily, without allow_other, we can't get other users to actually
* use any fake information we try to put there anyway.
- * Use a whitelist to be safe. */
+ * Use a whitelist to be safe.
+ */
/* Define permitted filesystems for the mount target. This was
* originally the same list as used by the ecryptfs mount helper
* (https://bazaar.launchpad.net/~ecryptfs/ecryptfs/trunk/view/head:/src/utils/mount.ecryptfs_private.c#L225)
* but got expanded as we found more filesystems that needed to be
- * overlaid. */
+ * overlaid.
+ */
typeof(fs_buf->f_type) f_type_whitelist[] = {
0x61756673 /* AUFS_SUPER_MAGIC */,
0x00000187 /* AUTOFS_SUPER_MAGIC */,
@@ -354,7 +358,7 @@ int check_nonroot_fstype(const char *progname, const struct statfs *fs_buf)
0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
0x858458f6 /* RAMFS_MAGIC */,
};
- for (i = 0; i < sizeof(f_type_whitelist)/sizeof(f_type_whitelist[0]); i++) {
+ for (i = 0; i < ARRAY_SIZE(f_type_whitelist); i++) {
if (f_type_whitelist[i] == fs_buf->f_type)
return 0;
}
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 11/17] mount_service: use over the other non-root user checks
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (9 preceding siblings ...)
2026-03-27 1:27 ` [PATCH 10/17] util: fix more checkpatch complaints in fuser_conf.[ch] Darrick J. Wong
@ 2026-03-27 1:27 ` Darrick J. Wong
2026-03-27 1:27 ` [PATCH 12/17] mount.fuse3: integrate systemd service startup Darrick J. Wong
` (5 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:27 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Now that we've hoisted the code that checks non-root fuse mounts to a
common file, make fuservicemount obey them too.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/mount_service.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/util/mount_service.c b/util/mount_service.c
index 9f6feab902f89d..6e53447e1d65be 100644
--- a/util/mount_service.c
+++ b/util/mount_service.c
@@ -1224,6 +1224,30 @@ static int mount_service_fsopen_mount(struct mount_service *mo,
# define mount_service_fsopen_mount(...) (-2)
#endif
+static int check_nonroot_file_access(const struct mount_service *mo)
+{
+ char buf[32];
+ char *mntpt;
+ int fd;
+
+ if (mo->mountfd >= 0) {
+ snprintf(buf, sizeof(buf), "/dev/fd/%d", mo->mountfd);
+ mntpt = buf;
+ } else {
+ mntpt = mo->mountpoint;
+ }
+
+ fd = open(mntpt, O_WRONLY);
+ if (fd < 0) {
+ fprintf(stderr, "%s: user has no write access to mountpoint %s\n",
+ mo->msgtag, mo->mountpoint);
+ return -1;
+ }
+
+ close(fd);
+ return 0;
+}
+
static int mount_service_handle_mount_cmd(struct mount_service *mo,
struct fuse_service_packet *p)
{
@@ -1298,6 +1322,44 @@ static int mount_service_handle_mount_cmd(struct mount_service *mo,
return mount_service_send_reply(mo, EINVAL);
}
+ /*
+ * fuse.conf can limit the number of unprivileged fuse mounts.
+ * For unprivileged mounts (via setuid) we also require write access
+ * to the mountpoint, and we'll only accept certain underlying
+ * filesystems.
+ */
+ if (getuid() != 0) {
+ struct statfs fs_buf;
+
+ ret = check_nonroot_mount_count(mo->msgtag);
+ if (ret)
+ return mount_service_send_reply(mo, ENOMEM);
+
+ ret = fstatfs(mo->mountfd, &fs_buf);
+ if (ret) {
+ int error = errno;
+
+ fprintf(stderr, "%s: %s: %s\n",
+ mo->msgtag, mo->mountpoint, strerror(error));
+ return mount_service_send_reply(mo, error);
+ }
+
+ drop_privs();
+ if (S_ISDIR(stbuf.st_mode))
+ ret = check_nonroot_dir_access(mo->msgtag,
+ mo->mountpoint,
+ mo->real_mountpoint,
+ &stbuf);
+ else
+ ret = check_nonroot_file_access(mo);
+ if (!ret)
+ ret = check_nonroot_fstype(mo->msgtag, &fs_buf);
+ restore_privs();
+
+ if (ret)
+ return mount_service_send_reply(mo, EPERM);
+ }
+
if (mo->fsopenfd >= 0) {
ret = mount_service_fsopen_mount(mo, oc, &stbuf);
if (ret != -2)
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 12/17] mount.fuse3: integrate systemd service startup
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (10 preceding siblings ...)
2026-03-27 1:27 ` [PATCH 11/17] mount_service: use over the other non-root user checks Darrick J. Wong
@ 2026-03-27 1:27 ` Darrick J. Wong
2026-03-27 1:28 ` [PATCH 13/17] mount_service: allow installation as a setuid program Darrick J. Wong
` (4 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:27 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Teach mount.fuse3 how to start fuse via systemd service, if present.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
util/mount_service.h | 8 +++++++
doc/fuservicemount3.8 | 10 ++++++++
util/fuservicemount.c | 48 +++++++++++++++++++++++++++++++++++++++++
util/meson.build | 12 +++++++---
util/mount.fuse.c | 58 +++++++++++++++++++++++++++++++------------------
util/mount_service.c | 18 +++++++++++++++
6 files changed, 128 insertions(+), 26 deletions(-)
diff --git a/util/mount_service.h b/util/mount_service.h
index 2b670c5569aa88..f02e08b9976b17 100644
--- a/util/mount_service.h
+++ b/util/mount_service.h
@@ -29,4 +29,12 @@ int mount_service_main(int argc, char *argv[]);
*/
const char *mount_service_subtype(const char *fstype);
+/**
+ * Discover if there is a fuse service socket for the given fuse subtype.
+ *
+ * @param subtype the subtype of a fuse filesystem type (e.g. Y from fuse.Y)
+ * @return true if available, false if not
+ */
+bool mount_service_present(const char *subtype);
+
#endif /* MOUNT_SERVICE_H_ */
diff --git a/doc/fuservicemount3.8 b/doc/fuservicemount3.8
index e45d6a89c8b81a..aa2167cb4872c6 100644
--- a/doc/fuservicemount3.8
+++ b/doc/fuservicemount3.8
@@ -7,12 +7,20 @@ .SH SYNOPSIS
.B mountpoint
.BI -t " fstype"
[
-.I options
+.BI -o " options"
]
+
+.B fuservicemount3
+.BI -t " fstype"
+.B --check
+
.SH DESCRIPTION
Mount a filesystem using a FUSE server that runs as a socket service.
These servers can be contained using the platform's service management
framework.
+
+The second form checks if there is a FUSE service available for the given
+filesystem type.
.SH "AUTHORS"
.LP
The author of the fuse socket service code is Darrick J. Wong <djwong@kernel.org>.
diff --git a/util/fuservicemount.c b/util/fuservicemount.c
index 9c694a4290f94e..d39d9c486c8997 100644
--- a/util/fuservicemount.c
+++ b/util/fuservicemount.c
@@ -9,10 +9,58 @@
* This program wraps the mounting of FUSE filesystems that run in systemd
*/
#define _GNU_SOURCE
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
#include "fuse_config.h"
#include "mount_service.h"
+static int check_service(const char *fstype)
+{
+ const char *subtype;
+
+ if (!fstype) {
+ fprintf(stderr,
+ "fuservicemount: expected fs type for --check\n");
+ return EXIT_FAILURE;
+ }
+
+ subtype = mount_service_subtype(fstype);
+ return mount_service_present(subtype) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
int main(int argc, char *argv[])
{
+ char *fstype = NULL;
+ bool check = false;
+ int i;
+
+ /*
+ * If the user passes us exactly the args -t FSTYPE --check then
+ * we'll just check if there's a service for the FSTYPE fuse server.
+ */
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "--check")) {
+ if (check) {
+ check = false;
+ break;
+ }
+ check = true;
+ } else if (!strcmp(argv[i], "-t") && i + 1 < argc) {
+ if (fstype) {
+ check = false;
+ break;
+ }
+ fstype = argv[i + 1];
+ i++;
+ } else {
+ check = false;
+ break;
+ }
+ }
+ if (check)
+ return check_service(fstype);
+
return mount_service_main(argc, argv);
}
diff --git a/util/meson.build b/util/meson.build
index 47c5f8ac213675..1741d2843ad074 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -6,21 +6,25 @@ executable('fusermount3', ['fusermount.c', '../lib/mount_util.c', '../lib/util.c
install_dir: get_option('bindir'),
c_args: '-DFUSE_CONF="@0@"'.format(fuseconf_path))
+mount_service_sources = []
+mount_service_cflags = []
if private_cfg.get('HAVE_SERVICEMOUNT', false)
- executable('fuservicemount3', ['mount_service.c', 'fuservicemount.c', '../lib/mount_util.c', 'fuser_conf.c'],
+ mount_service_sources += ['mount_service.c', '../lib/mount_util.c', 'fuser_conf.c']
+ mount_service_cflags += ['-DFUSE_CONF="@0@"'.format(fuseconf_path)]
+ executable('fuservicemount3', ['fuservicemount.c'] + mount_service_sources,
include_directories: include_dirs,
link_with: [ libfuse ],
install: true,
install_dir: get_option('sbindir'),
- c_args: ['-DFUSE_USE_VERSION=317', '-DFUSE_CONF="@0@"'.format(fuseconf_path)])
+ c_args: ['-DFUSE_USE_VERSION=317'] + mount_service_cflags)
endif
-executable('mount.fuse3', ['mount.fuse.c'],
+executable('mount.fuse3', ['mount.fuse.c'] + mount_service_sources,
include_directories: include_dirs,
link_with: [ libfuse ],
install: true,
install_dir: get_option('sbindir'),
- c_args: '-DFUSE_USE_VERSION=317')
+ c_args: ['-DFUSE_USE_VERSION=317'] + mount_service_cflags)
udevrulesdir = get_option('udevrulesdir')
diff --git a/util/mount.fuse.c b/util/mount.fuse.c
index f1a90fe8abae7c..b6a55eebb7f88b 100644
--- a/util/mount.fuse.c
+++ b/util/mount.fuse.c
@@ -49,6 +49,9 @@
#endif
#include "fuse.h"
+#ifdef HAVE_SERVICEMOUNT
+# include "mount_service.h"
+#endif
static char *progname;
@@ -280,9 +283,7 @@ int main(int argc, char *argv[])
mountpoint = argv[2];
for (i = 3; i < argc; i++) {
- if (strcmp(argv[i], "-v") == 0) {
- continue;
- } else if (strcmp(argv[i], "-t") == 0) {
+ if (strcmp(argv[i], "-t") == 0) {
i++;
if (i == argc) {
@@ -303,6 +304,39 @@ int main(int argc, char *argv[])
progname);
exit(1);
}
+ }
+ }
+
+ if (!type) {
+ if (source) {
+ dup_source = xstrdup(source);
+ type = dup_source;
+ source = strchr(type, '#');
+ if (source)
+ *source++ = '\0';
+ if (!type[0]) {
+ fprintf(stderr, "%s: empty filesystem type\n",
+ progname);
+ exit(1);
+ }
+ } else {
+ fprintf(stderr, "%s: empty source\n", progname);
+ exit(1);
+ }
+ }
+
+#ifdef HAVE_SERVICEMOUNT
+ /*
+ * Now that we know the desired filesystem type, see if we can find
+ * a socket service implementing that.
+ */
+ if (mount_service_present(type))
+ return mount_service_main(argc, argv);
+#endif
+
+ for (i = 3; i < argc; i++) {
+ if (strcmp(argv[i], "-v") == 0) {
+ continue;
} else if (strcmp(argv[i], "-o") == 0) {
char *opts;
char *opt;
@@ -366,24 +400,6 @@ int main(int argc, char *argv[])
if (suid)
options = add_option("suid", options);
- if (!type) {
- if (source) {
- dup_source = xstrdup(source);
- type = dup_source;
- source = strchr(type, '#');
- if (source)
- *source++ = '\0';
- if (!type[0]) {
- fprintf(stderr, "%s: empty filesystem type\n",
- progname);
- exit(1);
- }
- } else {
- fprintf(stderr, "%s: empty source\n", progname);
- exit(1);
- }
- }
-
if (setuid_name && setuid_name[0]) {
#ifdef linux
if (drop_privileges) {
diff --git a/util/mount_service.c b/util/mount_service.c
index 6e53447e1d65be..8f199ca18346cc 100644
--- a/util/mount_service.c
+++ b/util/mount_service.c
@@ -1511,3 +1511,21 @@ int mount_service_main(int argc, char *argv[])
mount_service_destroy(&mo);
return ret;
}
+
+bool mount_service_present(const char *fstype)
+{
+ struct stat stbuf;
+ char path[PATH_MAX];
+ int ret;
+
+ snprintf(path, sizeof(path), FUSE_SERVICE_SOCKET_DIR "/%s", fstype);
+ ret = stat(path, &stbuf);
+ if (ret)
+ return false;
+
+ if (!S_ISSOCK(stbuf.st_mode))
+ return false;
+
+ ret = access(path, R_OK | W_OK);
+ return ret == 0;
+}
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 13/17] mount_service: allow installation as a setuid program
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (11 preceding siblings ...)
2026-03-27 1:27 ` [PATCH 12/17] mount.fuse3: integrate systemd service startup Darrick J. Wong
@ 2026-03-27 1:28 ` Darrick J. Wong
2026-03-27 1:28 ` [PATCH 14/17] example/service_ll: create a sample systemd service fuse server Darrick J. Wong
` (3 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:28 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Allow installation of the mount service helper as a setuid program so
that regular users can access containerized filesystem drivers.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
README.md | 3 +++
test/ci-build.sh | 7 +++++++
util/install_helper.sh | 6 ++++++
util/meson.build | 3 ++-
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index bcf1210e6a23fa..b692a6f6915635 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,9 @@ Security implications
The *fusermount3* program is installed setuid root. This is done to
allow normal users to mount their own filesystem implementations.
+If built, the *fuservicemount3* program will also be installed setuid
+root so that normal users can access containerized filesystem
+implementations.
To limit the harm that malicious users can do this way, *fusermount3*
enforces the following limitations:
diff --git a/test/ci-build.sh b/test/ci-build.sh
index 8b019a0b5e52c1..6fddcb6bc42d72 100755
--- a/test/ci-build.sh
+++ b/test/ci-build.sh
@@ -60,11 +60,18 @@ non_sanitized_build()
# libfuse will first try the install path and then system defaults
sudo chmod 4755 ${PREFIX_DIR}/bin/fusermount3
+ test -x "${PREFIX_DIR}/sbin/fuservicemount3" && \
+ sudo chmod 4755 ${PREFIX_DIR}/sbin/fuservicemount3
# also needed for some of the tests
sudo chown root:root util/fusermount3
sudo chmod 4755 util/fusermount3
+ if [ -x util/fuservicemount3 ]; then
+ sudo chown root:root util/fuservicemount3
+ sudo chmod 4755 util/fuservicemount3
+ fi
+
${TEST_CMD}
popd
rm -fr build-${CC}
diff --git a/util/install_helper.sh b/util/install_helper.sh
index 76f2b47fe6c8f9..1c076739b8bfd8 100755
--- a/util/install_helper.sh
+++ b/util/install_helper.sh
@@ -11,6 +11,7 @@ bindir="$2"
udevrulesdir="$3"
useroot="$4"
initscriptdir="$5"
+sbindir="$6"
# Both sysconfdir and bindir are absolute paths (since they are joined
# with --prefix in meson.build), but need to be interpreted relative
@@ -31,6 +32,11 @@ if $useroot; then
chown root:root "${DESTDIR}${bindir}/fusermount3"
chmod u+s "${DESTDIR}${bindir}/fusermount3"
+ if [ -x "${DESTDIR}${sbindir}/fuservicemount3" ]; then
+ chown root:root "${DESTDIR}${sbindir}/fuservicemount3"
+ chmod u+s "${DESTDIR}${sbindir}/fuservicemount3"
+ fi
+
if test ! -e "${DESTDIR}/dev/fuse"; then
mkdir -p "${DESTDIR}/dev"
mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
diff --git a/util/meson.build b/util/meson.build
index 1741d2843ad074..efc188194b3816 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -44,4 +44,5 @@ meson.add_install_script('install_helper.sh',
join_paths(get_option('prefix'), get_option('bindir')),
udevrulesdir,
'@0@'.format(get_option('useroot')),
- get_option('initscriptdir'))
+ get_option('initscriptdir'),
+ join_paths(get_option('prefix'), get_option('sbindir')))
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 14/17] example/service_ll: create a sample systemd service fuse server
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (12 preceding siblings ...)
2026-03-27 1:28 ` [PATCH 13/17] mount_service: allow installation as a setuid program Darrick J. Wong
@ 2026-03-27 1:28 ` Darrick J. Wong
2026-03-27 1:28 ` [PATCH 15/17] example/service: create a sample systemd service for a high-level " Darrick J. Wong
` (2 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:28 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Create a simple fuse server that can be run as a systemd service.
I plan to create some more single-file fuse server examples, so most of
the boilerplate code goes in a separate file.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
example/single_file.h | 143 +++++++++++
lib/util.h | 35 +++
example/meson.build | 14 +
example/service_ll.c | 303 ++++++++++++++++++++++
example/service_ll.socket.in | 15 +
example/service_ll@.service | 102 ++++++++
example/single_file.c | 569 ++++++++++++++++++++++++++++++++++++++++++
meson.build | 15 +
8 files changed, 1196 insertions(+)
create mode 100644 example/single_file.h
create mode 100644 example/service_ll.c
create mode 100644 example/service_ll.socket.in
create mode 100644 example/service_ll@.service
create mode 100644 example/single_file.c
diff --git a/example/single_file.h b/example/single_file.h
new file mode 100644
index 00000000000000..d595ac0bac45db
--- /dev/null
+++ b/example/single_file.h
@@ -0,0 +1,143 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2026 Oracle.
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ */
+#ifndef FUSE_SINGLE_FILE_H_
+#define FUSE_SINGLE_FILE_H_
+
+static inline uint64_t round_up(uint64_t b, unsigned int align)
+{
+ unsigned int m;
+
+ if (align == 0)
+ return b;
+ m = b % align;
+ if (m)
+ b += align - m;
+ return b;
+}
+
+static inline uint64_t round_down(uint64_t b, unsigned int align)
+{
+ unsigned int m;
+
+ if (align == 0)
+ return b;
+ m = b % align;
+ return b - m;
+}
+
+static inline uint64_t howmany(uint64_t b, unsigned int align)
+{
+ unsigned int m;
+
+ if (align == 0)
+ return b;
+ m = (b % align) ? 1 : 0;
+ return (b / align) + m;
+}
+
+struct single_file {
+ int backing_fd;
+
+ uint64_t isize;
+ uint64_t blocks;
+
+ mode_t mode;
+
+ bool ro;
+ bool allow_dio;
+ bool sync;
+
+ unsigned int blocksize;
+
+ struct timespec atime;
+ struct timespec mtime;
+
+ pthread_mutex_t lock;
+};
+
+extern struct single_file single_file;
+
+static inline uint64_t b_to_fsbt(uint64_t off)
+{
+ return off / single_file.blocksize;
+}
+
+static inline uint64_t b_to_fsb(uint64_t off)
+{
+ return (off + single_file.blocksize - 1) / single_file.blocksize;
+}
+
+static inline uint64_t fsb_to_b(uint64_t fsb)
+{
+ return fsb * single_file.blocksize;
+}
+
+enum single_file_opt_keys {
+ SINGLE_FILE_RO = 171717, /* how many options could we possibly have? */
+ SINGLE_FILE_RW,
+ SINGLE_FILE_DIO,
+ SINGLE_FILE_NODIO,
+ SINGLE_FILE_SYNC,
+ SINGLE_FILE_NOSYNC,
+ SINGLE_FILE_SIZE,
+ SINGLE_FILE_BLOCKSIZE,
+
+ SINGLE_FILE_NR_KEYS,
+};
+
+#define SINGLE_FILE_OPT_KEYS \
+ FUSE_OPT_KEY("ro", SINGLE_FILE_RO), \
+ FUSE_OPT_KEY("rw", SINGLE_FILE_RW), \
+ FUSE_OPT_KEY("dio", SINGLE_FILE_DIO), \
+ FUSE_OPT_KEY("nodio", SINGLE_FILE_NODIO), \
+ FUSE_OPT_KEY("sync", SINGLE_FILE_SYNC), \
+ FUSE_OPT_KEY("nosync", SINGLE_FILE_NOSYNC), \
+ FUSE_OPT_KEY("size=%s", SINGLE_FILE_SIZE), \
+ FUSE_OPT_KEY("blocksize=%s", SINGLE_FILE_BLOCKSIZE)
+
+int single_file_opt_proc(void *data, const char *arg, int key,
+ struct fuse_args *outargs);
+
+unsigned long long parse_num_blocks(const char *arg, int log_block_size);
+
+struct fuse_service;
+int single_file_service_open(struct fuse_service *sf, const char *path);
+
+int single_file_configure(const char *device, const char *filename);
+int single_file_configure_simple(const char *filename);
+void single_file_close(void);
+
+/* low-level fuse operation handlers */
+
+bool is_single_file_child(fuse_ino_t parent, const char *name);
+bool is_single_file_ino(fuse_ino_t ino);
+
+void single_file_ll_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
+ off_t off, struct fuse_file_info *fi);
+
+void single_file_ll_statfs(fuse_req_t req, fuse_ino_t ino);
+
+void single_file_ll_statx(fuse_req_t req, fuse_ino_t ino, int flags, int mask,
+ struct fuse_file_info *fi);
+
+void single_file_ll_getattr(fuse_req_t req, fuse_ino_t ino,
+ struct fuse_file_info *fi);
+void single_file_ll_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
+ int to_set, struct fuse_file_info *fi);
+
+void single_file_ll_lookup(fuse_req_t req, fuse_ino_t parent, const char *name);
+void single_file_ll_open(fuse_req_t req, fuse_ino_t ino,
+ struct fuse_file_info *fi);
+
+void single_file_ll_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
+ struct fuse_file_info *fp);
+
+int reply_buf_limited(fuse_req_t req, const char *buf, size_t bufsize,
+ off_t off, size_t maxsize);
+
+#endif /* FUSE_SINGLE_FILE_H_ */
diff --git a/lib/util.h b/lib/util.h
index 107a2bfdd6105b..6ec6604fb74caf 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -4,6 +4,9 @@
#include <stdint.h>
#include <stdbool.h>
+#define max(x, y) ((x) > (y) ? (x) : (y))
+#define min(x, y) ((x) < (y) ? (x) : (y))
+
#define ROUND_UP(val, round_to) (((val) + (round_to - 1)) & ~(round_to - 1))
#define likely(x) __builtin_expect(!!(x), 1)
@@ -46,4 +49,36 @@ static inline uint64_t fuse_higher_32_bits(uint64_t nr)
#define fallthrough do {} while (0)
#endif
+static inline uint64_t round_up(uint64_t b, unsigned int align)
+{
+ unsigned int m;
+
+ if (align == 0)
+ return b;
+ m = b % align;
+ if (m)
+ b += align - m;
+ return b;
+}
+
+static inline uint64_t round_down(uint64_t b, unsigned int align)
+{
+ unsigned int m;
+
+ if (align == 0)
+ return b;
+ m = b % align;
+ return b - m;
+}
+
+static inline uint64_t howmany(uint64_t b, unsigned int align)
+{
+ unsigned int m;
+
+ if (align == 0)
+ return b;
+ m = (b % align) ? 1 : 0;
+ return (b / align) + m;
+}
+
#endif /* FUSE_UTIL_H_ */
diff --git a/example/meson.build b/example/meson.build
index 76cf2d96db0349..e948f6ba74fdfa 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -12,6 +12,15 @@ if not platform.endswith('bsd') and platform != 'dragonfly'
examples += [ 'null' ]
endif
+single_file_examples = [ ]
+
+if platform.endswith('linux')
+ single_file_examples += [ 'service_ll' ]
+ configure_file(input: 'service_ll.socket.in',
+ output: 'service_ll.socket',
+ configuration: private_cfg)
+endif
+
threaded_examples = [ 'notify_inval_inode',
'invalidate_path',
'notify_store_retrieve',
@@ -25,6 +34,11 @@ foreach ex : examples
install: false)
endforeach
+foreach ex : single_file_examples
+ executable(ex, [ex + '.c', 'single_file.c'],
+ dependencies: [ libfuse_dep ],
+ install: false)
+endforeach
foreach ex : threaded_examples
executable(ex, ex + '.c',
diff --git a/example/service_ll.c b/example/service_ll.c
new file mode 100644
index 00000000000000..c1d021afed657c
--- /dev/null
+++ b/example/service_ll.c
@@ -0,0 +1,303 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2026 Oracle.
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ */
+
+/** @file
+ *
+ * minimal example filesystem using low-level API and systemd service api
+ *
+ * Compile with:
+ *
+ * gcc -Wall single_file.c service_ll.c `pkg-config fuse3 --cflags --libs` -o service_ll
+ *
+ * Note: If the pkg-config command fails due to the absence of the fuse3.pc
+ * file, you should configure the path to the fuse3.pc file in the
+ * PKG_CONFIG_PATH variable.
+ *
+ * Change the ExecStart line in service_ll@.service:
+ *
+ * ExecStart=/path/to/service_ll
+ *
+ * to point to the actual path of the service_ll binary.
+ *
+ * Finally, install the service_ll@.service and service_ll.socket files to the
+ * systemd service directory, usually /run/systemd/system.
+ *
+ * ## Source code ##
+ * \include service_ll.c
+ * \include service_ll.socket
+ * \include service_ll@.service
+ * \include single_file.c
+ * \include single_file.h
+ */
+
+#define FUSE_USE_VERSION FUSE_MAKE_VERSION(3, 19)
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <fuse_lowlevel.h>
+#include <fuse_service.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <assert.h>
+#include <pthread.h>
+#include "single_file.h"
+
+struct service_ll {
+ struct fuse_session *se;
+ char *device;
+ struct fuse_service *service;
+
+ /* really booleans */
+ int debug;
+};
+
+static struct service_ll ll = { };
+
+static void service_ll_init(void *userdata, struct fuse_conn_info *conn)
+{
+ (void)userdata;
+
+ conn->time_gran = 1;
+}
+
+static void service_ll_read(fuse_req_t req, fuse_ino_t ino, size_t count,
+ off_t pos, struct fuse_file_info *fp)
+{
+ void *buf = NULL;
+ ssize_t got;
+ int ret;
+
+ if (!is_single_file_ino(ino)) {
+ ret = EIO;
+ goto out_reply;
+ }
+
+ if (ll.debug)
+ fprintf(stderr, "%s: pos 0x%llx count 0x%llx\n",
+ __func__,
+ (unsigned long long)pos,
+ (unsigned long long)count);
+
+ if (!single_file.allow_dio && fp->direct_io) {
+ ret = ENOSYS;
+ goto out_reply;
+ }
+
+ buf = malloc(count);
+ if (!buf) {
+ ret = ENOMEM;
+ goto out_reply;
+ }
+
+ got = pread(single_file.backing_fd, buf, count, pos);
+ if (got < 0) {
+ ret = -errno;
+ goto out_reply;
+ }
+
+ fuse_reply_buf(req, buf, got);
+ goto out_buf;
+
+out_reply:
+ fuse_reply_err(req, ret);
+out_buf:
+ free(buf);
+}
+
+static void service_ll_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
+ size_t count, off_t pos,
+ struct fuse_file_info *fp)
+{
+ ssize_t got;
+ int ret;
+
+ if (!is_single_file_ino(ino)) {
+ ret = EIO;
+ goto out_reply;
+ }
+
+ if (ll.debug)
+ fprintf(stderr, "%s: pos 0x%llx count 0x%llx\n",
+ __func__,
+ (unsigned long long)pos,
+ (unsigned long long)count);
+
+ if (!single_file.allow_dio && fp->direct_io) {
+ ret = ENOSYS;
+ goto out_reply;
+ }
+
+ if (pos >= single_file.isize) {
+ ret = EFBIG;
+ goto out_reply;
+ }
+
+ if (pos >= single_file.isize - count)
+ count = single_file.isize - pos;
+
+ got = pwrite(single_file.backing_fd, buf, count, pos);
+ if (got < 0) {
+ ret = -errno;
+ goto out_reply;
+ }
+
+ if (single_file.sync) {
+ ret = fsync(single_file.backing_fd);
+ if (ret < 0) {
+ ret = -errno;
+ goto out_reply;
+ }
+ }
+
+ fuse_reply_write(req, got);
+ return;
+
+out_reply:
+ fuse_reply_err(req, ret);
+}
+
+static const struct fuse_lowlevel_ops service_ll_oper = {
+ .lookup = single_file_ll_lookup,
+ .getattr = single_file_ll_getattr,
+ .setattr = single_file_ll_setattr,
+ .readdir = single_file_ll_readdir,
+ .open = single_file_ll_open,
+ .statfs = single_file_ll_statfs,
+ .statx = single_file_ll_statx,
+ .fsync = single_file_ll_fsync,
+
+ .init = service_ll_init,
+ .read = service_ll_read,
+ .write = service_ll_write,
+};
+
+#define SERVICE_LL_OPT(t, p, v) { t, offsetof(struct service_ll, p), v }
+
+static struct fuse_opt service_ll_opts[] = {
+ SERVICE_LL_OPT("debug", debug, 1),
+ SINGLE_FILE_OPT_KEYS,
+ FUSE_OPT_END
+};
+
+static int service_ll_opt_proc(void *data, const char *arg, int key,
+ struct fuse_args *outargs)
+{
+ if (single_file_opt_proc(data, arg, key, outargs) == 0)
+ return 0;
+
+ switch (key) {
+ case FUSE_OPT_KEY_NONOPT:
+ if (!ll.device) {
+ ll.device = strdup(arg);
+ return 0;
+ }
+ return 1;
+ }
+
+ return 1;
+}
+
+int main(int argc, char *argv[])
+{
+ struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
+ struct fuse_cmdline_opts opts = { };
+ int ret = 1;
+
+ if (fuse_service_accept(&ll.service))
+ goto err_args;
+
+ if (!fuse_service_accepted(ll.service))
+ goto err_args;
+
+ if (fuse_service_append_args(ll.service, &args))
+ goto err_service;
+
+ if (fuse_opt_parse(&args, &ll, service_ll_opts, service_ll_opt_proc))
+ goto err_service;
+
+ if (fuse_service_parse_cmdline_opts(&args, &opts))
+ goto err_service;
+
+ if (opts.show_help) {
+ printf("usage: %s [options] <mountpoint>\n\n", argv[0]);
+ fuse_cmdline_help();
+ fuse_lowlevel_help();
+ ret = 0;
+ goto err_service;
+ } else if (opts.show_version) {
+ printf("FUSE library version %s\n", fuse_pkgversion());
+ fuse_lowlevel_version();
+ ret = 0;
+ goto err_service;
+ }
+
+ if (opts.mountpoint == NULL || !ll.device) {
+ printf("usage: %s [options] <device> <mountpoint>\n", argv[0]);
+ printf(" %s --help\n", argv[0]);
+ goto err_service;
+ }
+
+ if (single_file_service_open(ll.service, ll.device))
+ goto err_service;
+
+ if (fuse_service_finish_file_requests(ll.service))
+ goto err_singlefile;
+
+ if (single_file_configure(ll.device, NULL))
+ goto err_singlefile;
+
+ ll.se = fuse_session_new(&args, &service_ll_oper,
+ sizeof(service_ll_oper), NULL);
+ if (ll.se == NULL)
+ goto err_singlefile;
+
+ if (fuse_set_signal_handlers(ll.se))
+ goto err_session;
+
+ if (fuse_service_session_mount(ll.service, ll.se, S_IFDIR, &opts))
+ goto err_signals;
+
+ fuse_service_send_goodbye(ll.service, 0);
+ fuse_service_release(ll.service);
+
+ fuse_daemonize(opts.foreground);
+
+ /* Block until ctrl+c or fusermount -u */
+ if (opts.singlethread) {
+ ret = fuse_session_loop(ll.se);
+ } else {
+ struct fuse_loop_config *config = fuse_loop_cfg_create();
+
+ fuse_loop_cfg_set_clone_fd(config, opts.clone_fd);
+ fuse_loop_cfg_set_max_threads(config, opts.max_threads);
+ ret = fuse_session_loop_mt(ll.se, config);
+ fuse_loop_cfg_destroy(config);
+ }
+
+ fuse_session_unmount(ll.se);
+err_signals:
+ fuse_remove_signal_handlers(ll.se);
+err_session:
+ fuse_session_destroy(ll.se);
+err_singlefile:
+ single_file_close();
+err_service:
+ free(opts.mountpoint);
+ free(ll.device);
+ fuse_service_send_goodbye(ll.service, ret);
+ fuse_service_destroy(&ll.service);
+err_args:
+ fuse_opt_free_args(&args);
+ return fuse_service_exit(ret);
+}
diff --git a/example/service_ll.socket.in b/example/service_ll.socket.in
new file mode 100644
index 00000000000000..91f4c75154dc1e
--- /dev/null
+++ b/example/service_ll.socket.in
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2026 Oracle. All Rights Reserved.
+# Author: Darrick J. Wong <djwong@kernel.org>
+[Unit]
+Description=Socket for service_ll Service
+
+[Socket]
+ListenSequentialPacket=@FUSE_SERVICE_SOCKET_DIR_RAW@/service_ll
+Accept=yes
+SocketMode=0220
+RemoveOnStop=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/example/service_ll@.service b/example/service_ll@.service
new file mode 100644
index 00000000000000..016d839babe3cc
--- /dev/null
+++ b/example/service_ll@.service
@@ -0,0 +1,102 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2026 Oracle. All Rights Reserved.
+# Author: Darrick J. Wong <djwong@kernel.org>
+[Unit]
+Description=service_ll Sample Fuse Service
+
+# Don't leave failed units behind, systemd does not clean them up!
+CollectMode=inactive-or-failed
+
+[Service]
+Type=exec
+ExecStart=/path/to/service_ll
+
+# Try to capture core dumps
+LimitCORE=infinity
+
+SyslogIdentifier=%N
+
+# No realtime CPU scheduling
+RestrictRealtime=true
+
+# Don't let us see anything in the regular system, and don't run as root
+DynamicUser=true
+ProtectSystem=strict
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+PrivateUsers=true
+
+# No network access
+PrivateNetwork=true
+ProtectHostname=true
+RestrictAddressFamilies=none
+IPAddressDeny=any
+
+# Don't let the program mess with the kernel configuration at all
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+ProtectProc=invisible
+RestrictNamespaces=true
+RestrictFileSystems=
+
+# Hide everything in /proc, even /proc/mounts
+ProcSubset=pid
+
+# Only allow the default personality Linux
+LockPersonality=true
+
+# No writable memory pages
+MemoryDenyWriteExecute=true
+
+# Don't let our mounts leak out to the host
+PrivateMounts=true
+
+# Restrict system calls to the native arch and only enough to get things going
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged
+SystemCallFilter=~@resources
+
+SystemCallFilter=~@clock
+SystemCallFilter=~@cpu-emulation
+SystemCallFilter=~@debug
+SystemCallFilter=~@module
+SystemCallFilter=~@reboot
+SystemCallFilter=~@swap
+
+SystemCallFilter=~@mount
+
+# libfuse io_uring wants to pin cores and memory
+SystemCallFilter=mbind
+SystemCallFilter=sched_setaffinity
+
+# Leave a breadcrumb if we get whacked by the system call filter
+SystemCallErrorNumber=EL3RST
+
+# Log to the kernel dmesg, just like an in-kernel filesystem driver
+StandardOutput=append:/dev/ttyprintk
+StandardError=append:/dev/ttyprintk
+
+# Run with no capabilities at all
+CapabilityBoundingSet=
+AmbientCapabilities=
+NoNewPrivileges=true
+
+# We don't create files
+UMask=7777
+
+# No access to hardware /dev files at all
+ProtectClock=true
+DevicePolicy=closed
+
+# Don't mess with set[ug]id anything.
+RestrictSUIDSGID=true
+
+# Don't let OOM kills of processes in this containment group kill the whole
+# service, because we don't want filesystem drivers to go down.
+OOMPolicy=continue
+OOMScoreAdjust=-1000
diff --git a/example/single_file.c b/example/single_file.c
new file mode 100644
index 00000000000000..3658f5e23bd0a4
--- /dev/null
+++ b/example/single_file.c
@@ -0,0 +1,569 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2026 Oracle.
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ */
+#define _GNU_SOURCE
+#include <pthread.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <linux/fs.h>
+#include <linux/stat.h>
+
+#define FUSE_USE_VERSION (FUSE_MAKE_VERSION(3, 19))
+
+#include "fuse_lowlevel.h"
+#include "fuse_service.h"
+#include "single_file.h"
+
+#define min(x, y) ((x) < (y) ? (x) : (y))
+
+#if __has_attribute(__fallthrough__)
+#define fallthrough __attribute__((__fallthrough__))
+#else
+#define fallthrough do {} while (0)
+#endif
+
+struct dirbuf {
+ char *p;
+ size_t size;
+};
+
+struct single_file_stat {
+ struct fuse_entry_param entry;
+};
+
+#define SINGLE_FILE_INO (FUSE_ROOT_ID + 1)
+
+static const char *single_file_name = "single_file";
+static bool single_file_name_set;
+
+struct single_file single_file = {
+ .backing_fd = -1,
+ .allow_dio = true,
+ .mode = S_IFREG | 0444,
+ .lock = PTHREAD_MUTEX_INITIALIZER,
+};
+
+static void dirbuf_add(fuse_req_t req, struct dirbuf *b, const char *name,
+ fuse_ino_t ino)
+{
+ struct stat stbuf;
+ size_t oldsize = b->size;
+
+ b->size += fuse_add_direntry(req, NULL, 0, name, NULL, 0);
+ b->p = (char *) realloc(b->p, b->size);
+ memset(&stbuf, 0, sizeof(stbuf));
+ stbuf.st_ino = ino;
+ fuse_add_direntry(req, b->p + oldsize, b->size - oldsize, name, &stbuf,
+ b->size);
+}
+
+int reply_buf_limited(fuse_req_t req, const char *buf, size_t bufsize,
+ off_t off, size_t maxsize)
+{
+ if (off < bufsize)
+ return fuse_reply_buf(req, buf + off,
+ min(bufsize - off, maxsize));
+ else
+ return fuse_reply_buf(req, NULL, 0);
+}
+
+bool is_single_file_child(fuse_ino_t parent, const char *name)
+{
+ return parent == FUSE_ROOT_ID &&
+ strcmp(name, single_file_name) == 0;
+}
+
+bool is_single_file_ino(fuse_ino_t ino)
+{
+ return ino == SINGLE_FILE_INO;
+}
+
+void single_file_ll_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
+ off_t off, struct fuse_file_info *fi)
+{
+ (void) fi;
+
+ if (ino != FUSE_ROOT_ID)
+ fuse_reply_err(req, ENOTDIR);
+ else {
+ struct dirbuf b;
+
+ memset(&b, 0, sizeof(b));
+ dirbuf_add(req, &b, ".", FUSE_ROOT_ID);
+ dirbuf_add(req, &b, "..", FUSE_ROOT_ID);
+ dirbuf_add(req, &b, single_file_name, SINGLE_FILE_INO);
+ reply_buf_limited(req, b.p, b.size, off, size);
+ free(b.p);
+ }
+}
+
+static bool sf_stat(fuse_ino_t ino, struct single_file_stat *llstat)
+{
+ struct fuse_entry_param *entry = &llstat->entry;
+ struct stat *stbuf = &entry->attr;
+
+ if (ino == FUSE_ROOT_ID) {
+ stbuf->st_mode = S_IFDIR | 0755;
+ stbuf->st_nlink = 2;
+ } else if (ino == SINGLE_FILE_INO) {
+ stbuf->st_mode = single_file.mode;
+ stbuf->st_nlink = 1;
+ stbuf->st_size = single_file.isize;
+ stbuf->st_blksize = single_file.blocksize;
+ stbuf->st_blocks = howmany(single_file.isize, 512);
+ stbuf->st_atim = single_file.atime;
+ stbuf->st_mtim = single_file.mtime;
+ } else {
+ return false;
+ }
+ stbuf->st_ino = ino;
+
+ entry->generation = ino + 1;
+ entry->attr_timeout = 0.0;
+ entry->entry_timeout = 0.0;
+ entry->ino = ino;
+
+ return true;
+}
+
+#if defined(STATX_BASIC_STATS)
+static inline void sf_set_statx_attr(struct statx *stx,
+ uint64_t statx_flag, int set)
+{
+ if (set)
+ stx->stx_attributes |= statx_flag;
+ stx->stx_attributes_mask |= statx_flag;
+}
+
+static void sf_statx_directio(struct statx *stx)
+{
+ struct statx devx;
+ int ret;
+
+ ret = statx(single_file.backing_fd, "", AT_EMPTY_PATH, STATX_DIOALIGN,
+ &devx);
+ if (ret)
+ return;
+ if (!(devx.stx_mask & STATX_DIOALIGN))
+ return;
+
+ stx->stx_mask |= STATX_DIOALIGN;
+ stx->stx_dio_mem_align = devx.stx_dio_mem_align;
+ stx->stx_dio_offset_align = devx.stx_dio_offset_align;
+}
+
+static bool sf_statx(fuse_ino_t ino, int statx_mask, struct statx *stx)
+{
+ (void)statx_mask;
+
+ if (ino == FUSE_ROOT_ID) {
+ stx->stx_mode = S_IFDIR | 0755;
+ stx->stx_nlink = 2;
+ } else if (ino == SINGLE_FILE_INO) {
+ stx->stx_mode = single_file.mode;
+ stx->stx_nlink = 1;
+ stx->stx_size = single_file.isize;
+ stx->stx_blksize = single_file.blocksize;
+ stx->stx_blocks = howmany(single_file.isize, 512);
+ stx->stx_atime.tv_sec = single_file.atime.tv_sec;
+ stx->stx_atime.tv_nsec = single_file.atime.tv_nsec;
+ stx->stx_mtime.tv_sec = single_file.mtime.tv_sec;
+ stx->stx_mtime.tv_nsec = single_file.mtime.tv_nsec;
+ } else {
+ return false;
+ }
+ stx->stx_mask = STATX_BASIC_STATS;
+ stx->stx_ino = ino;
+
+ sf_set_statx_attr(stx, STATX_ATTR_IMMUTABLE, single_file.ro);
+ sf_statx_directio(stx);
+
+ return true;
+}
+
+void single_file_ll_statx(fuse_req_t req, fuse_ino_t ino, int flags, int mask,
+ struct fuse_file_info *fi)
+{
+ struct statx stx = { };
+ bool filled;
+
+ (void)flags;
+ (void)fi;
+
+ pthread_mutex_lock(&single_file.lock);
+ filled = sf_statx(ino, mask, &stx);
+ pthread_mutex_unlock(&single_file.lock);
+ if (!filled)
+ fuse_reply_err(req, ENOENT);
+ else
+ fuse_reply_statx(req, 0, &stx, 0.0);
+}
+#else
+void single_file_ll_statx(fuse_req_t req, fuse_ino_t ino, int flags, int mask,
+ struct fuse_file_info *fi)
+{
+ fuse_reply_err(req, ENOSYS);
+}
+#endif /* STATX_BASIC_STATS */
+
+void single_file_ll_statfs(fuse_req_t req, fuse_ino_t ino)
+{
+ struct statvfs buf;
+
+ (void)ino;
+
+ pthread_mutex_lock(&single_file.lock);
+ buf.f_bsize = single_file.blocksize;
+ buf.f_frsize = 0;
+
+ buf.f_blocks = single_file.blocks;
+ buf.f_bfree = 0;
+ buf.f_bavail = 0;
+ buf.f_files = 1;
+ buf.f_ffree = 0;
+ buf.f_favail = 0;
+ buf.f_fsid = 0x50C00L;
+ buf.f_flag = 0;
+ if (single_file.ro)
+ buf.f_flag |= ST_RDONLY;
+ buf.f_namemax = 255;
+ pthread_mutex_unlock(&single_file.lock);
+
+ fuse_reply_statfs(req, &buf);
+}
+
+void single_file_ll_getattr(fuse_req_t req, fuse_ino_t ino,
+ struct fuse_file_info *fi)
+{
+ struct single_file_stat llstat;
+ bool filled;
+
+ (void) fi;
+
+ memset(&llstat, 0, sizeof(llstat));
+ pthread_mutex_lock(&single_file.lock);
+ filled = sf_stat(ino, &llstat);
+ pthread_mutex_unlock(&single_file.lock);
+ if (!filled)
+ fuse_reply_err(req, ENOENT);
+ else
+ fuse_reply_attr(req, &llstat.entry.attr,
+ llstat.entry.attr_timeout);
+}
+
+void single_file_ll_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
+ int to_set, struct fuse_file_info *fi)
+{
+ pthread_mutex_lock(&single_file.lock);
+ if (to_set & FUSE_SET_ATTR_MODE)
+ single_file.mode = attr->st_mode;
+ if (to_set & FUSE_SET_ATTR_ATIME)
+ single_file.atime = attr->st_atim;
+ if (to_set & FUSE_SET_ATTR_MTIME)
+ single_file.mtime = attr->st_mtim;
+ pthread_mutex_unlock(&single_file.lock);
+
+ single_file_ll_getattr(req, ino, fi);
+}
+
+void single_file_ll_lookup(fuse_req_t req, fuse_ino_t parent, const char *name)
+{
+ struct single_file_stat llstat;
+ bool filled;
+
+ if (!is_single_file_child(parent, name)) {
+ fuse_reply_err(req, ENOENT);
+ return;
+ }
+
+ memset(&llstat, 0, sizeof(llstat));
+ pthread_mutex_lock(&single_file.lock);
+ filled = sf_stat(SINGLE_FILE_INO, &llstat);
+ pthread_mutex_unlock(&single_file.lock);
+ if (!filled)
+ fuse_reply_err(req, ENOENT);
+ else
+ fuse_reply_entry(req, &llstat.entry);
+}
+
+void single_file_ll_open(fuse_req_t req, fuse_ino_t ino,
+ struct fuse_file_info *fi)
+{
+ if (ino != SINGLE_FILE_INO)
+ fuse_reply_err(req, EISDIR);
+ else if (single_file.ro && (fi->flags & O_ACCMODE) != O_RDONLY)
+ fuse_reply_err(req, EACCES);
+ else
+ fuse_reply_open(req, fi);
+}
+
+void single_file_ll_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
+ struct fuse_file_info *fp)
+{
+ int ret = 0;
+
+ (void)datasync;
+ (void)fp;
+
+ if (ino == SINGLE_FILE_INO) {
+ ret = fsync(single_file.backing_fd);
+ if (ret)
+ ret = -errno;
+ }
+
+ fuse_reply_err(req, ret);
+}
+
+unsigned long long parse_num_blocks(const char *arg, int log_block_size)
+{
+ char *p;
+ unsigned long long num;
+
+ num = strtoull(arg, &p, 0);
+
+ if (p[0] && p[1])
+ return 0;
+
+ switch (*p) {
+ case 'T': case 't':
+ num <<= 10;
+ fallthrough;
+ case 'G': case 'g':
+ num <<= 10;
+ fallthrough;
+ case 'M': case 'm':
+ num <<= 10;
+ fallthrough;
+ case 'K': case 'k':
+ if (log_block_size < 0)
+ num <<= 10;
+ else
+ num >>= log_block_size;
+ break;
+ case 's':
+ if (log_block_size < 0)
+ num <<= 9;
+ else
+ num >>= (1+log_block_size);
+ break;
+ case '\0':
+ break;
+ default:
+ return 0;
+ }
+ return num;
+}
+
+static int single_file_set_blocksize(const char *arg)
+{
+ single_file.blocksize = parse_num_blocks(arg, -1);
+ if (single_file.blocksize < 512 || single_file.blocksize > INT32_MAX ||
+ (single_file.blocksize & (single_file.blocksize - 1)) != 0) {
+ fprintf(stderr, "%s: block size must be power of two between 512 and 2G.\n",
+ arg);
+ return -1;
+ }
+
+ /* do not pass through to libfuse */
+ return 0;
+}
+
+static int single_file_set_size(const char *arg)
+{
+ single_file.isize = parse_num_blocks(arg, -1);
+ if (single_file.isize < 1 || (single_file.isize & 511) != 0) {
+ fprintf(stderr, "%s: size must be multiple of 512 and larger than zero.\n",
+ arg + 5);
+ return -1;
+ }
+
+ /* do not pass through to libfuse */
+ return 0;
+}
+
+int single_file_opt_proc(void *data, const char *arg, int key,
+ struct fuse_args *outargs)
+{
+ (void)data;
+ (void)outargs;
+
+ switch (key) {
+ case SINGLE_FILE_RO:
+ single_file.ro = true;
+ return 0;
+ case SINGLE_FILE_RW:
+ single_file.ro = false;
+ return 0;
+ case SINGLE_FILE_DIO:
+ single_file.allow_dio = true;
+ return 0;
+ case SINGLE_FILE_NODIO:
+ single_file.allow_dio = false;
+ return 0;
+ case SINGLE_FILE_SYNC:
+ single_file.sync = true;
+ return 0;
+ case SINGLE_FILE_NOSYNC:
+ single_file.sync = false;
+ return 0;
+ case SINGLE_FILE_BLOCKSIZE:
+ return single_file_set_blocksize(arg + 10);
+ case SINGLE_FILE_SIZE:
+ return single_file_set_size(arg + 5);
+ }
+
+ return 1;
+}
+
+int single_file_service_open(struct fuse_service *sf, const char *path)
+{
+ int open_flags = single_file.ro ? O_RDONLY : O_RDWR;
+ int fd;
+ int ret;
+
+again:
+ if (single_file.blocksize)
+ ret = fuse_service_request_blockdev(sf, path,
+ open_flags | O_EXCL, 0, 0,
+ single_file.blocksize);
+ else
+ ret = fuse_service_request_file(sf, path, open_flags | O_EXCL,
+ 0, 0);
+ if (ret)
+ return ret;
+
+ ret = fuse_service_receive_file(sf, path, &fd);
+ if (ret)
+ return ret;
+
+ /* downgrade from rw to ro if necessary */
+ if ((fd == -EPERM || fd == -EACCES) && open_flags == O_RDWR) {
+ open_flags = O_RDONLY;
+ goto again;
+ }
+
+ if (fd < 0) {
+ fprintf(stderr, "%s: opening file: %s.\n",
+ path, strerror(-fd));
+ return -1;
+ }
+
+ single_file.backing_fd = fd;
+ return 0;
+}
+
+int single_file_configure(const char *device, const char *filename)
+{
+ struct stat statbuf;
+ unsigned long long backing_size;
+ int lbasize;
+ int ret;
+
+ if (!single_file.blocksize)
+ single_file.blocksize = sysconf(_SC_PAGESIZE);
+
+ ret = fstat(single_file.backing_fd, &statbuf);
+ if (ret) {
+ perror(device);
+ return -1;
+ }
+ lbasize = statbuf.st_blksize;
+ backing_size = statbuf.st_size;
+
+ if (S_ISBLK(statbuf.st_mode)) {
+#ifdef BLKSSZGET
+ ret = ioctl(single_file.backing_fd, BLKSSZGET, &lbasize);
+ if (ret) {
+ perror(device);
+ return -1;
+ }
+#endif
+
+#ifdef BLKGETSIZE64
+ ret = ioctl(single_file.backing_fd, BLKGETSIZE64, &backing_size);
+ if (ret) {
+ perror(device);
+ return -1;
+ }
+#endif
+ }
+
+ if (backing_size == 0) {
+ fprintf(stderr, "%s: backing file size zero?\n", device);
+ return -1;
+ }
+
+ if (lbasize == 0) {
+ fprintf(stderr, "%s: blocksize zero?\n", device);
+ return -1;
+ }
+
+ if (lbasize > single_file.blocksize) {
+ fprintf(stderr, "%s: lba size %u smaller than blocksize %u\n",
+ device, lbasize, single_file.blocksize);
+ return -1;
+ }
+
+ if (single_file.isize % single_file.blocksize > 0) {
+ fprintf(stderr, "%s: size parameter %llu not congruent with blocksize %u\n",
+ device, (unsigned long long)single_file.isize,
+ single_file.blocksize);
+ return -1;
+ }
+
+ if (single_file.isize > backing_size) {
+ fprintf(stderr, "%s: file size %llu smaller than size param %llu\n",
+ device, backing_size,
+ (unsigned long long)single_file.isize);
+ return -1;
+ }
+
+ if (!single_file.isize)
+ single_file.isize = backing_size;
+ single_file.isize = round_down(single_file.isize, single_file.blocksize);
+ single_file.blocks = single_file.isize / single_file.blocksize;
+
+ return single_file_configure_simple(filename);
+}
+
+int single_file_configure_simple(const char *filename)
+{
+ if (!single_file.blocksize)
+ single_file.blocksize = sysconf(_SC_PAGESIZE);
+
+ if (filename) {
+ char *n = strdup(filename);
+
+ if (!n) {
+ perror(filename);
+ return -1;
+ }
+
+ if (single_file_name_set)
+ free((void *)single_file_name);
+ single_file_name = n;
+ single_file_name_set = true;
+ }
+
+ return 0;
+}
+
+void single_file_close(void)
+{
+ close(single_file.backing_fd);
+ single_file.backing_fd = -1;
+
+ if (single_file_name_set)
+ free((void *)single_file_name);
+ single_file_name_set = false;
+}
diff --git a/meson.build b/meson.build
index b0988548bf806a..d4ac4b7dcd3ac7 100644
--- a/meson.build
+++ b/meson.build
@@ -73,6 +73,7 @@ service_socket_dir = get_option('service-socket-dir')
if service_socket_dir == ''
service_socket_dir = '/run/filesystems'
endif
+private_cfg.set('FUSE_SERVICE_SOCKET_DIR_RAW', service_socket_dir)
private_cfg.set_quoted('FUSE_SERVICE_SOCKET_DIR', service_socket_dir)
# Test for presence of some functions
@@ -145,6 +146,20 @@ special_funcs = {
res = move_mount(mntfd, "", AT_FDCWD, "/mnt", MOVE_MOUNT_F_EMPTY_PATH);
return 0;
}
+ ''',
+ 'linux_bdev_ioctls': '''
+ #define _GNU_SOURCE
+ #include <stddef.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <linux/fs.h>
+ #include <linux/stat.h>
+
+ int main(void) {
+ ioctl(-1, BLKSSZGET, 0);
+ ioctl(-1, BLKGETSIZE64, 0);
+ return 0;
+ }
'''
}
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 15/17] example/service: create a sample systemd service for a high-level fuse server
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (13 preceding siblings ...)
2026-03-27 1:28 ` [PATCH 14/17] example/service_ll: create a sample systemd service fuse server Darrick J. Wong
@ 2026-03-27 1:28 ` Darrick J. Wong
2026-03-27 1:28 ` [PATCH 16/17] example/hello_ll: port to single-file common code Darrick J. Wong
2026-03-27 1:29 ` [PATCH 17/17] nullfs: support fuse systemd service mode Darrick J. Wong
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:28 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Create a simple high-level fuse server that can be run as a systemd
service.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
example/single_file.h | 30 ++++++
example/meson.build | 6 +
example/service_hl.c | 215 ++++++++++++++++++++++++++++++++++++++++++
example/service_hl.socket.in | 15 +++
example/service_hl@.service | 102 ++++++++++++++++++++
example/service_ll.c | 1
example/single_file.c | 189 ++++++++++++++++++++++++++++++++++---
7 files changed, 541 insertions(+), 17 deletions(-)
create mode 100644 example/service_hl.c
create mode 100644 example/service_hl.socket.in
create mode 100644 example/service_hl@.service
diff --git a/example/single_file.h b/example/single_file.h
index d595ac0bac45db..eede2510cdff8f 100644
--- a/example/single_file.h
+++ b/example/single_file.h
@@ -114,6 +114,7 @@ void single_file_close(void);
/* low-level fuse operation handlers */
+#ifdef USE_SINGLE_FILE_LL_API
bool is_single_file_child(fuse_ino_t parent, const char *name);
bool is_single_file_ino(fuse_ino_t ino);
@@ -139,5 +140,34 @@ void single_file_ll_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
int reply_buf_limited(fuse_req_t req, const char *buf, size_t bufsize,
off_t off, size_t maxsize);
+#endif
+
+/* high-level fuse operation handlers */
+
+#ifdef USE_SINGLE_FILE_HL_API
+bool is_single_file_path(const char *name);
+
+int single_file_hl_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+ off_t offset, struct fuse_file_info *fi,
+ enum fuse_readdir_flags flags);
+
+int single_file_hl_statfs(const char *path, struct statvfs *buf);
+
+int single_file_hl_getattr(const char *path, struct stat *stbuf,
+ struct fuse_file_info *fi);
+int single_file_hl_chmod(const char *path, mode_t mode,
+ struct fuse_file_info *fp);
+int single_file_hl_utimens(const char *path, const struct timespec ctv[2],
+ struct fuse_file_info *fi);
+
+int single_file_hl_open(const char *path, struct fuse_file_info *fi);
+
+int single_file_hl_fsync(const char *path, int datasync,
+ struct fuse_file_info *fp);
+#endif
+
+#if !defined(USE_SINGLE_FILE_LL_API) && !defined(USE_SINGLE_FILE_HL_API)
+# warning USE_SINGLE_FILE_[HL]L_API not defined!
+#endif
#endif /* FUSE_SINGLE_FILE_H_ */
diff --git a/example/meson.build b/example/meson.build
index e948f6ba74fdfa..19a383f7cd2c74 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -19,6 +19,12 @@ if platform.endswith('linux')
configure_file(input: 'service_ll.socket.in',
output: 'service_ll.socket',
configuration: private_cfg)
+
+ single_file_examples += [ 'service_hl' ]
+ configure_file(input: 'service_hl.socket.in',
+ output: 'service_hl.socket',
+ configuration: private_cfg)
+
endif
threaded_examples = [ 'notify_inval_inode',
diff --git a/example/service_hl.c b/example/service_hl.c
new file mode 100644
index 00000000000000..8083b952e34c80
--- /dev/null
+++ b/example/service_hl.c
@@ -0,0 +1,215 @@
+/*
+ * FUSE: Filesystem in Userspace
+ * Copyright (C) 2026 Oracle.
+ *
+ * This program can be distributed under the terms of the GNU GPLv2.
+ * See the file GPL2.txt.
+ */
+
+/** @file
+ *
+ * minimal example filesystem using high-level API and systemd service api
+ *
+ * Compile with:
+ *
+ * gcc -Wall single_file.c service_hl.c `pkg-config fuse3 --cflags --libs` -o service_hl
+ *
+ * Note: If the pkg-config command fails due to the absence of the fuse3.pc
+ * file, you should configure the path to the fuse3.pc file in the
+ * PKG_CONFIG_PATH variable.
+ *
+ * Change the ExecStart line in service_hl@.service:
+ *
+ * ExecStart=/path/to/service_hl
+ *
+ * to point to the actual path of the service_hl binary.
+ *
+ * Finally, install the service_hl@.service and service_hl.socket files to the
+ * systemd service directory, usually /run/systemd/system.
+ *
+ * ## Source code ##
+ * \include service_hl.c
+ * \include service_hl.socket
+ * \include service_hl@.service
+ * \include single_file.c
+ * \include single_file.h
+ */
+
+#define FUSE_USE_VERSION FUSE_MAKE_VERSION(3, 19)
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <fuse.h>
+#include <fuse_service.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <assert.h>
+#include <pthread.h>
+#include <stddef.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <linux/fs.h>
+#include <linux/stat.h>
+#define USE_SINGLE_FILE_HL_API
+#include "single_file.h"
+
+struct service_hl {
+ char *device;
+ struct fuse_service *service;
+
+ /* really booleans */
+ int debug;
+};
+
+static struct service_hl hl = { };
+
+static void *service_hl_init(struct fuse_conn_info *conn,
+ struct fuse_config *cfg)
+{
+ (void) conn;
+ cfg->kernel_cache = 1;
+
+ return NULL;
+}
+
+static int service_hl_read(const char *path, char *buf, size_t count,
+ off_t pos, struct fuse_file_info *fp)
+{
+ ssize_t got;
+
+ (void)fp;
+
+ if (!is_single_file_path(path))
+ return -EIO;
+
+ if (hl.debug)
+ fprintf(stderr, "%s: pos 0x%llx count 0x%llx\n",
+ __func__,
+ (unsigned long long)pos,
+ (unsigned long long)count);
+
+ got = pread(single_file.backing_fd, buf, count, pos);
+ if (got < 0)
+ return -errno;
+
+ return got;
+}
+
+static int service_hl_write(const char *path, const char *buf, size_t count,
+ off_t pos, struct fuse_file_info *fp)
+{
+ ssize_t got;
+
+ (void)fp;
+
+ if (!is_single_file_path(path))
+ return -EIO;
+
+ if (hl.debug)
+ fprintf(stderr, "%s: pos 0x%llx count 0x%llx\n",
+ __func__,
+ (unsigned long long)pos,
+ (unsigned long long)count);
+
+ if (pos >= single_file.isize)
+ return -EFBIG;
+
+ if (pos >= single_file.isize - count)
+ count = single_file.isize - pos;
+
+ got = pwrite(single_file.backing_fd, buf, count, pos);
+ if (got < 0)
+ return -errno;
+
+ return got;
+}
+
+static const struct fuse_operations service_hl_oper = {
+ .getattr = single_file_hl_getattr,
+ .readdir = single_file_hl_readdir,
+ .open = single_file_hl_open,
+ .statfs = single_file_hl_statfs,
+ .chmod = single_file_hl_chmod,
+ .utimens = single_file_hl_utimens,
+ .fsync = single_file_hl_fsync,
+
+ .init = service_hl_init,
+ .read = service_hl_read,
+ .write = service_hl_write,
+};
+
+#define SERVICE_HL_OPT(t, p, v) { t, offsetof(struct service_hl, p), v }
+
+static struct fuse_opt service_hl_opts[] = {
+ SERVICE_HL_OPT("debug", debug, 1),
+ SINGLE_FILE_OPT_KEYS,
+ FUSE_OPT_END
+};
+
+static int service_hl_opt_proc(void *data, const char *arg, int key,
+ struct fuse_args *outargs)
+{
+ (void)data;
+ (void)outargs;
+
+ switch (key) {
+ case FUSE_OPT_KEY_NONOPT:
+ if (!hl.device) {
+ hl.device = strdup(arg);
+ return 0;
+ }
+ return 1;
+ default:
+ break;
+ }
+
+ return 1;
+}
+
+int main(int argc, char *argv[])
+{
+ struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
+ int ret = 1;
+
+ if (fuse_service_accept(&hl.service))
+ goto err_args;
+
+ if (!fuse_service_accepted(hl.service))
+ goto err_args;
+
+ if (fuse_service_append_args(hl.service, &args))
+ goto err_service;
+
+ if (fuse_opt_parse(&args, &hl, service_hl_opts, service_hl_opt_proc))
+ goto err_service;
+
+ if (single_file_service_open(hl.service, hl.device))
+ goto err_service;
+
+ if (fuse_service_finish_file_requests(hl.service))
+ goto err_singlefile;
+
+ if (single_file_configure(hl.device, NULL))
+ goto err_singlefile;
+
+ fuse_service_expect_mount_mode(hl.service, S_IFDIR);
+
+ ret = fuse_service_main(hl.service, args.argc, args.argv,
+ &service_hl_oper, NULL);
+
+err_singlefile:
+ single_file_close();
+err_service:
+ free(hl.device);
+ fuse_service_send_goodbye(hl.service, ret);
+ fuse_service_destroy(&hl.service);
+err_args:
+ fuse_opt_free_args(&args);
+ return fuse_service_exit(ret);
+}
diff --git a/example/service_hl.socket.in b/example/service_hl.socket.in
new file mode 100644
index 00000000000000..065f5a0fb4d087
--- /dev/null
+++ b/example/service_hl.socket.in
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2026 Oracle. All Rights Reserved.
+# Author: Darrick J. Wong <djwong@kernel.org>
+[Unit]
+Description=Socket for service_hl Service
+
+[Socket]
+ListenSequentialPacket=@FUSE_SERVICE_SOCKET_DIR_RAW@/service_hl
+Accept=yes
+SocketMode=0220
+RemoveOnStop=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/example/service_hl@.service b/example/service_hl@.service
new file mode 100644
index 00000000000000..883b9c649cbc90
--- /dev/null
+++ b/example/service_hl@.service
@@ -0,0 +1,102 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2026 Oracle. All Rights Reserved.
+# Author: Darrick J. Wong <djwong@kernel.org>
+[Unit]
+Description=service_hl Sample Fuse Service
+
+# Don't leave failed units behind, systemd does not clean them up!
+CollectMode=inactive-or-failed
+
+[Service]
+Type=exec
+ExecStart=/path/to/service_hl
+
+# Try to capture core dumps
+LimitCORE=infinity
+
+SyslogIdentifier=%N
+
+# No realtime CPU scheduling
+RestrictRealtime=true
+
+# Don't let us see anything in the regular system, and don't run as root
+DynamicUser=true
+ProtectSystem=strict
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+PrivateUsers=true
+
+# No network access
+PrivateNetwork=true
+ProtectHostname=true
+RestrictAddressFamilies=none
+IPAddressDeny=any
+
+# Don't let the program mess with the kernel configuration at all
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+ProtectProc=invisible
+RestrictNamespaces=true
+RestrictFileSystems=
+
+# Hide everything in /proc, even /proc/mounts
+ProcSubset=pid
+
+# Only allow the default personality Linux
+LockPersonality=true
+
+# No writable memory pages
+MemoryDenyWriteExecute=true
+
+# Don't let our mounts leak out to the host
+PrivateMounts=true
+
+# Restrict system calls to the native arch and only enough to get things going
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged
+SystemCallFilter=~@resources
+
+SystemCallFilter=~@clock
+SystemCallFilter=~@cpu-emulation
+SystemCallFilter=~@debug
+SystemCallFilter=~@module
+SystemCallFilter=~@reboot
+SystemCallFilter=~@swap
+
+SystemCallFilter=~@mount
+
+# libfuse io_uring wants to pin cores and memory
+SystemCallFilter=mbind
+SystemCallFilter=sched_setaffinity
+
+# Leave a breadcrumb if we get whacked by the system call filter
+SystemCallErrorNumber=EL3RST
+
+# Log to the kernel dmesg, just like an in-kernel filesystem driver
+StandardOutput=append:/dev/ttyprintk
+StandardError=append:/dev/ttyprintk
+
+# Run with no capabilities at all
+CapabilityBoundingSet=
+AmbientCapabilities=
+NoNewPrivileges=true
+
+# We don't create files
+UMask=7777
+
+# No access to hardware /dev files at all
+ProtectClock=true
+DevicePolicy=closed
+
+# Don't mess with set[ug]id anything.
+RestrictSUIDSGID=true
+
+# Don't let OOM kills of processes in this containment group kill the whole
+# service, because we don't want filesystem drivers to go down.
+OOMPolicy=continue
+OOMScoreAdjust=-1000
diff --git a/example/service_ll.c b/example/service_ll.c
index c1d021afed657c..c00b7348945984 100644
--- a/example/service_ll.c
+++ b/example/service_ll.c
@@ -51,6 +51,7 @@
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
+#define USE_SINGLE_FILE_LL_API
#include "single_file.h"
struct service_ll {
diff --git a/example/single_file.c b/example/single_file.c
index 3658f5e23bd0a4..a89947e2ecf1bf 100644
--- a/example/single_file.c
+++ b/example/single_file.c
@@ -21,7 +21,10 @@
#define FUSE_USE_VERSION (FUSE_MAKE_VERSION(3, 19))
#include "fuse_lowlevel.h"
+#include "fuse.h"
#include "fuse_service.h"
+#define USE_SINGLE_FILE_LL_API
+#define USE_SINGLE_FILE_HL_API
#include "single_file.h"
#define min(x, y) ((x) < (y) ? (x) : (y))
@@ -53,6 +56,15 @@ struct single_file single_file = {
.lock = PTHREAD_MUTEX_INITIALIZER,
};
+static fuse_ino_t single_file_path_to_ino(const char *path)
+{
+ if (strcmp(path, "/") == 0)
+ return FUSE_ROOT_ID;
+ if (strcmp(path + 1, single_file_name) == 0)
+ return SINGLE_FILE_INO;
+ return 0;
+}
+
static void dirbuf_add(fuse_req_t req, struct dirbuf *b, const char *name,
fuse_ino_t ino)
{
@@ -88,6 +100,11 @@ bool is_single_file_ino(fuse_ino_t ino)
return ino == SINGLE_FILE_INO;
}
+bool is_single_file_path(const char *name)
+{
+ return name[0] == '/' && strcmp(name + 1, single_file_name) == 0;
+}
+
void single_file_ll_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
off_t off, struct fuse_file_info *fi)
{
@@ -107,6 +124,34 @@ void single_file_ll_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
}
}
+int single_file_hl_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+ off_t offset, struct fuse_file_info *fi,
+ enum fuse_readdir_flags flags)
+{
+ struct stat stbuf;
+ fuse_ino_t ino = single_file_path_to_ino(path);
+
+ memset(&stbuf, 0, sizeof(stbuf));
+
+ (void) offset;
+ (void) fi;
+ (void) flags;
+
+ if (!ino)
+ return -ENOENT;
+ if (ino != SINGLE_FILE_INO)
+ return -ENOTDIR;
+
+ stbuf.st_ino = FUSE_ROOT_ID;
+ filler(buf, ".", &stbuf, 0, FUSE_FILL_DIR_DEFAULTS);
+ filler(buf, "..", &stbuf, 0, FUSE_FILL_DIR_DEFAULTS);
+
+ stbuf.st_ino = SINGLE_FILE_INO;
+ filler(buf, single_file_name, &stbuf, 0, FUSE_FILL_DIR_DEFAULTS);
+
+ return 0;
+}
+
static bool sf_stat(fuse_ino_t ino, struct single_file_stat *llstat)
{
struct fuse_entry_param *entry = &llstat->entry;
@@ -216,32 +261,44 @@ void single_file_ll_statx(fuse_req_t req, fuse_ino_t ino, int flags, int mask,
}
#endif /* STATX_BASIC_STATS */
+static void single_file_statfs(struct statvfs *buf)
+{
+ pthread_mutex_lock(&single_file.lock);
+ buf->f_bsize = single_file.blocksize;
+ buf->f_frsize = 0;
+
+ buf->f_blocks = single_file.blocks;
+ buf->f_bfree = 0;
+ buf->f_bavail = 0;
+ buf->f_files = 1;
+ buf->f_ffree = 0;
+ buf->f_favail = 0;
+ buf->f_fsid = 0x50C00L;
+ buf->f_flag = 0;
+ if (single_file.ro)
+ buf->f_flag |= ST_RDONLY;
+ buf->f_namemax = 255;
+ pthread_mutex_unlock(&single_file.lock);
+}
+
void single_file_ll_statfs(fuse_req_t req, fuse_ino_t ino)
{
struct statvfs buf;
(void)ino;
- pthread_mutex_lock(&single_file.lock);
- buf.f_bsize = single_file.blocksize;
- buf.f_frsize = 0;
-
- buf.f_blocks = single_file.blocks;
- buf.f_bfree = 0;
- buf.f_bavail = 0;
- buf.f_files = 1;
- buf.f_ffree = 0;
- buf.f_favail = 0;
- buf.f_fsid = 0x50C00L;
- buf.f_flag = 0;
- if (single_file.ro)
- buf.f_flag |= ST_RDONLY;
- buf.f_namemax = 255;
- pthread_mutex_unlock(&single_file.lock);
-
+ single_file_statfs(&buf);
fuse_reply_statfs(req, &buf);
}
+int single_file_hl_statfs(const char *path, struct statvfs *buf)
+{
+ (void)path;
+
+ single_file_statfs(buf);
+ return 0;
+}
+
void single_file_ll_getattr(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi)
{
@@ -261,6 +318,30 @@ void single_file_ll_getattr(fuse_req_t req, fuse_ino_t ino,
llstat.entry.attr_timeout);
}
+int single_file_hl_getattr(const char *path, struct stat *stbuf,
+ struct fuse_file_info *fi)
+{
+ struct single_file_stat llstat;
+ fuse_ino_t ino = single_file_path_to_ino(path);
+ bool filled;
+
+ (void) fi;
+
+ if (!ino)
+ return -ENOENT;
+
+ memset(&llstat, 0, sizeof(llstat));
+ pthread_mutex_lock(&single_file.lock);
+ filled = sf_stat(ino, &llstat);
+ pthread_mutex_unlock(&single_file.lock);
+
+ if (!filled)
+ return -ENOENT;
+
+ memcpy(stbuf, &llstat.entry.attr, sizeof(*stbuf));
+ return 0;
+}
+
void single_file_ll_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
int to_set, struct fuse_file_info *fi)
{
@@ -276,6 +357,45 @@ void single_file_ll_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
single_file_ll_getattr(req, ino, fi);
}
+int single_file_hl_chmod(const char *path, mode_t mode,
+ struct fuse_file_info *fp)
+{
+ fuse_ino_t ino = single_file_path_to_ino(path);
+
+ (void)fp;
+
+ if (!ino)
+ return -ENOENT;
+ if (ino != SINGLE_FILE_INO)
+ return 0;
+
+ pthread_mutex_lock(&single_file.lock);
+ single_file.mode = (single_file.mode & ~0xFFF) | (mode & 0xFFF);
+ pthread_mutex_unlock(&single_file.lock);
+
+ return 0;
+}
+
+int single_file_hl_utimens(const char *path, const struct timespec ctv[2],
+ struct fuse_file_info *fi)
+{
+ fuse_ino_t ino = single_file_path_to_ino(path);
+
+ (void)fi;
+
+ if (!ino)
+ return -ENOENT;
+ if (ino != SINGLE_FILE_INO)
+ return 0;
+
+ pthread_mutex_lock(&single_file.lock);
+ single_file.atime = ctv[0];
+ single_file.mtime = ctv[1];
+ pthread_mutex_unlock(&single_file.lock);
+
+ return 0;
+}
+
void single_file_ll_lookup(fuse_req_t req, fuse_ino_t parent, const char *name)
{
struct single_file_stat llstat;
@@ -307,6 +427,20 @@ void single_file_ll_open(fuse_req_t req, fuse_ino_t ino,
fuse_reply_open(req, fi);
}
+int single_file_hl_open(const char *path, struct fuse_file_info *fi)
+{
+ fuse_ino_t ino = single_file_path_to_ino(path);
+
+ if (!ino)
+ return -ENOENT;
+ if (ino != SINGLE_FILE_INO)
+ return -EISDIR;
+ if (single_file.ro && (fi->flags & O_ACCMODE) != O_RDONLY)
+ return -EACCES;
+
+ return 0;
+}
+
void single_file_ll_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
struct fuse_file_info *fp)
{
@@ -324,6 +458,27 @@ void single_file_ll_fsync(fuse_req_t req, fuse_ino_t ino, int datasync,
fuse_reply_err(req, ret);
}
+int single_file_hl_fsync(const char *path, int datasync,
+ struct fuse_file_info *fp)
+{
+ fuse_ino_t ino = single_file_path_to_ino(path);
+ int ret = 0;
+
+ (void)datasync;
+ (void)fp;
+
+ if (!ino)
+ return -ENOENT;
+
+ if (ino == SINGLE_FILE_INO) {
+ ret = fsync(single_file.backing_fd);
+ if (ret)
+ return -errno;
+ }
+
+ return 0;
+}
+
unsigned long long parse_num_blocks(const char *arg, int log_block_size)
{
char *p;
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 16/17] example/hello_ll: port to single-file common code
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (14 preceding siblings ...)
2026-03-27 1:28 ` [PATCH 15/17] example/service: create a sample systemd service for a high-level " Darrick J. Wong
@ 2026-03-27 1:28 ` Darrick J. Wong
2026-03-27 1:29 ` [PATCH 17/17] nullfs: support fuse systemd service mode Darrick J. Wong
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:28 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
Port the hello_ll example fuse server to our new single-file library.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
example/hello_ll.c | 128 ++++-----------------------------------------------
example/meson.build | 4 +-
2 files changed, 13 insertions(+), 119 deletions(-)
diff --git a/example/hello_ll.c b/example/hello_ll.c
index bd5fecdcd4d992..cccd44f352ec9d 100644
--- a/example/hello_ll.c
+++ b/example/hello_ll.c
@@ -32,30 +32,10 @@
#include <fcntl.h>
#include <unistd.h>
#include <assert.h>
+#define USE_SINGLE_FILE_LL_API
+#include "single_file.h"
static const char *hello_str = "Hello World!\n";
-static const char *hello_name = "hello";
-
-static int hello_stat(fuse_ino_t ino, struct stat *stbuf)
-{
- stbuf->st_ino = ino;
- switch (ino) {
- case 1:
- stbuf->st_mode = S_IFDIR | 0755;
- stbuf->st_nlink = 2;
- break;
-
- case 2:
- stbuf->st_mode = S_IFREG | 0444;
- stbuf->st_nlink = 1;
- stbuf->st_size = strlen(hello_str);
- break;
-
- default:
- return -1;
- }
- return 0;
-}
static void hello_ll_init(void *userdata, struct fuse_conn_info *conn)
{
@@ -69,97 +49,6 @@ static void hello_ll_init(void *userdata, struct fuse_conn_info *conn)
conn->want &= ~FUSE_CAP_ASYNC_READ;
}
-static void hello_ll_getattr(fuse_req_t req, fuse_ino_t ino,
- struct fuse_file_info *fi)
-{
- struct stat stbuf;
-
- (void) fi;
-
- memset(&stbuf, 0, sizeof(stbuf));
- if (hello_stat(ino, &stbuf) == -1)
- fuse_reply_err(req, ENOENT);
- else
- fuse_reply_attr(req, &stbuf, 1.0);
-}
-
-static void hello_ll_lookup(fuse_req_t req, fuse_ino_t parent, const char *name)
-{
- struct fuse_entry_param e;
-
- if (parent != 1 || strcmp(name, hello_name) != 0)
- fuse_reply_err(req, ENOENT);
- else {
- memset(&e, 0, sizeof(e));
- e.ino = 2;
- e.attr_timeout = 1.0;
- e.entry_timeout = 1.0;
- hello_stat(e.ino, &e.attr);
-
- fuse_reply_entry(req, &e);
- }
-}
-
-struct dirbuf {
- char *p;
- size_t size;
-};
-
-static void dirbuf_add(fuse_req_t req, struct dirbuf *b, const char *name,
- fuse_ino_t ino)
-{
- struct stat stbuf;
- size_t oldsize = b->size;
- b->size += fuse_add_direntry(req, NULL, 0, name, NULL, 0);
- b->p = (char *) realloc(b->p, b->size);
- memset(&stbuf, 0, sizeof(stbuf));
- stbuf.st_ino = ino;
- fuse_add_direntry(req, b->p + oldsize, b->size - oldsize, name, &stbuf,
- b->size);
-}
-
-#define min(x, y) ((x) < (y) ? (x) : (y))
-
-static int reply_buf_limited(fuse_req_t req, const char *buf, size_t bufsize,
- off_t off, size_t maxsize)
-{
- if (off < bufsize)
- return fuse_reply_buf(req, buf + off,
- min(bufsize - off, maxsize));
- else
- return fuse_reply_buf(req, NULL, 0);
-}
-
-static void hello_ll_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
- off_t off, struct fuse_file_info *fi)
-{
- (void) fi;
-
- if (ino != 1)
- fuse_reply_err(req, ENOTDIR);
- else {
- struct dirbuf b;
-
- memset(&b, 0, sizeof(b));
- dirbuf_add(req, &b, ".", 1);
- dirbuf_add(req, &b, "..", 1);
- dirbuf_add(req, &b, hello_name, 2);
- reply_buf_limited(req, b.p, b.size, off, size);
- free(b.p);
- }
-}
-
-static void hello_ll_open(fuse_req_t req, fuse_ino_t ino,
- struct fuse_file_info *fi)
-{
- if (ino != 2)
- fuse_reply_err(req, EISDIR);
- else if ((fi->flags & O_ACCMODE) != O_RDONLY)
- fuse_reply_err(req, EACCES);
- else
- fuse_reply_open(req, fi);
-}
-
static void hello_ll_read(fuse_req_t req, fuse_ino_t ino, size_t size,
off_t off, struct fuse_file_info *fi)
{
@@ -219,10 +108,10 @@ static void hello_ll_removexattr(fuse_req_t req, fuse_ino_t ino, const char *nam
static const struct fuse_lowlevel_ops hello_ll_oper = {
.init = hello_ll_init,
- .lookup = hello_ll_lookup,
- .getattr = hello_ll_getattr,
- .readdir = hello_ll_readdir,
- .open = hello_ll_open,
+ .lookup = single_file_ll_lookup,
+ .getattr = single_file_ll_getattr,
+ .readdir = single_file_ll_readdir,
+ .open = single_file_ll_open,
.read = hello_ll_read,
.setxattr = hello_ll_setxattr,
.getxattr = hello_ll_getxattr,
@@ -259,6 +148,10 @@ int main(int argc, char *argv[])
goto err_out1;
}
+ ret = single_file_configure_simple("hello");
+ if (ret)
+ goto err_out1;
+
se = fuse_session_new(&args, &hello_ll_oper,
sizeof(hello_ll_oper), NULL);
if (se == NULL)
@@ -291,6 +184,7 @@ int main(int argc, char *argv[])
fuse_session_destroy(se);
err_out1:
free(opts.mountpoint);
+ single_file_close();
fuse_opt_free_args(&args);
return ret ? 1 : 0;
diff --git a/example/meson.build b/example/meson.build
index 19a383f7cd2c74..0a7cc3dbf31da4 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -1,5 +1,5 @@
examples = [ 'passthrough', 'passthrough_fh',
- 'hello', 'hello_ll',
+ 'hello',
'printcap', 'ioctl_client', 'ioctl_ll_client', 'poll_client',
'ioctl', 'ioctl_ll', 'cuse', 'cuse_client' ]
@@ -12,7 +12,7 @@ if not platform.endswith('bsd') and platform != 'dragonfly'
examples += [ 'null' ]
endif
-single_file_examples = [ ]
+single_file_examples = [ 'hello_ll' ]
if platform.endswith('linux')
single_file_examples += [ 'service_ll' ]
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH 17/17] nullfs: support fuse systemd service mode
2026-03-27 1:24 [PATCHSET v3] libfuse: run fuse servers as a contained service Darrick J. Wong
` (15 preceding siblings ...)
2026-03-27 1:28 ` [PATCH 16/17] example/hello_ll: port to single-file common code Darrick J. Wong
@ 2026-03-27 1:29 ` Darrick J. Wong
16 siblings, 0 replies; 28+ messages in thread
From: Darrick J. Wong @ 2026-03-27 1:29 UTC (permalink / raw)
To: djwong, bschubert; +Cc: linux-fsdevel, bernd, miklos, neal, joannelkoong
From: Darrick J. Wong <djwong@kernel.org>
This is the only example fuse server that exports a regular file instead
of a directory tree. Port it to be usable as a systemd fuse service so
that we can test that capability.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
example/meson.build | 6 +++
example/null.c | 33 +++++++++++++-
example/nullfile.socket.in | 15 ++++++
example/nullfile@.service | 102 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 154 insertions(+), 2 deletions(-)
create mode 100644 example/nullfile.socket.in
create mode 100644 example/nullfile@.service
diff --git a/example/meson.build b/example/meson.build
index 0a7cc3dbf31da4..c08a81747e68ae 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -10,6 +10,12 @@ if not platform.endswith('bsd') and platform != 'dragonfly'
# support mounting files, This is enforced in vfs_domount_first()
# with the v_type != VDIR check.
examples += [ 'null' ]
+
+ if platform.endswith('linux')
+ configure_file(input: 'nullfile.socket.in',
+ output: 'nullfile.socket',
+ configuration: private_cfg)
+ endif
endif
single_file_examples = [ 'hello_ll' ]
diff --git a/example/null.c b/example/null.c
index ec41def40ed5c5..3e7e43f722a432 100644
--- a/example/null.c
+++ b/example/null.c
@@ -17,15 +17,24 @@
*
* gcc -Wall null.c `pkg-config fuse3 --cflags --libs` -o null
*
+ * Change the ExecStart line in nullfile@.service:
+ *
+ * ExecStart=/path/to/nullfile
+ *
+ * to point to the actual path of the nullfile binary.
+ *
+ * Finally, install the nullfile@.service and nullfile.socket files to the
+ * systemd service directory, usually /run/systemd/system.
+ *
* ## Source code ##
* \include passthrough_fh.c
*/
-
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION FUSE_MAKE_VERSION(3, 19)
#include <fuse.h>
#include <fuse_lowlevel.h>
+#include <fuse_service.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -117,6 +126,26 @@ int main(int argc, char *argv[])
struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
struct fuse_cmdline_opts opts;
struct stat stbuf;
+ struct fuse_service *service = NULL;
+ int ret;
+
+ if (fuse_service_accept(&service) != 0)
+ return 1;
+
+ if (fuse_service_accepted(service)) {
+ if (fuse_service_append_args(service, &args) != 0)
+ return 1;
+ if (fuse_service_finish_file_requests(service) != 0)
+ return 1;
+
+ fuse_service_expect_mount_mode(service, S_IFREG);
+
+ ret = fuse_service_main(service, args.argc, args.argv,
+ &null_oper, NULL);
+
+ fuse_opt_free_args(&args);
+ return fuse_service_exit(ret);
+ }
if (fuse_parse_cmdline(&args, &opts) != 0)
return 1;
diff --git a/example/nullfile.socket.in b/example/nullfile.socket.in
new file mode 100644
index 00000000000000..23e57a25f2eb93
--- /dev/null
+++ b/example/nullfile.socket.in
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2026 Oracle. All Rights Reserved.
+# Author: Darrick J. Wong <djwong@kernel.org>
+[Unit]
+Description=Socket for nullfile Service
+
+[Socket]
+ListenSequentialPacket=@FUSE_SERVICE_SOCKET_DIR_RAW@/nullfile
+Accept=yes
+SocketMode=0220
+RemoveOnStop=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/example/nullfile@.service b/example/nullfile@.service
new file mode 100644
index 00000000000000..665f8d4226ff49
--- /dev/null
+++ b/example/nullfile@.service
@@ -0,0 +1,102 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2026 Oracle. All Rights Reserved.
+# Author: Darrick J. Wong <djwong@kernel.org>
+[Unit]
+Description=nullfile Sample Fuse Service
+
+# Don't leave failed units behind, systemd does not clean them up!
+CollectMode=inactive-or-failed
+
+[Service]
+Type=exec
+ExecStart=/path/to/null
+
+# Try to capture core dumps
+LimitCORE=infinity
+
+SyslogIdentifier=%N
+
+# No realtime CPU scheduling
+RestrictRealtime=true
+
+# Don't let us see anything in the regular system, and don't run as root
+DynamicUser=true
+ProtectSystem=strict
+ProtectHome=true
+PrivateTmp=true
+PrivateDevices=true
+PrivateUsers=true
+
+# No network access
+PrivateNetwork=true
+ProtectHostname=true
+RestrictAddressFamilies=none
+IPAddressDeny=any
+
+# Don't let the program mess with the kernel configuration at all
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+ProtectProc=invisible
+RestrictNamespaces=true
+RestrictFileSystems=
+
+# Hide everything in /proc, even /proc/mounts
+ProcSubset=pid
+
+# Only allow the default personality Linux
+LockPersonality=true
+
+# No writable memory pages
+MemoryDenyWriteExecute=true
+
+# Don't let our mounts leak out to the host
+PrivateMounts=true
+
+# Restrict system calls to the native arch and only enough to get things going
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged
+SystemCallFilter=~@resources
+
+SystemCallFilter=~@clock
+SystemCallFilter=~@cpu-emulation
+SystemCallFilter=~@debug
+SystemCallFilter=~@module
+SystemCallFilter=~@reboot
+SystemCallFilter=~@swap
+
+SystemCallFilter=~@mount
+
+# libfuse io_uring wants to pin cores and memory
+SystemCallFilter=mbind
+SystemCallFilter=sched_setaffinity
+
+# Leave a breadcrumb if we get whacked by the system call filter
+SystemCallErrorNumber=EL3RST
+
+# Log to the kernel dmesg, just like an in-kernel filesystem driver
+StandardOutput=append:/dev/ttyprintk
+StandardError=append:/dev/ttyprintk
+
+# Run with no capabilities at all
+CapabilityBoundingSet=
+AmbientCapabilities=
+NoNewPrivileges=true
+
+# We don't create files
+UMask=7777
+
+# No access to hardware /dev files at all
+ProtectClock=true
+DevicePolicy=closed
+
+# Don't mess with set[ug]id anything.
+RestrictSUIDSGID=true
+
+# Don't let OOM kills of processes in this containment group kill the whole
+# service, because we don't want filesystem drivers to go down.
+OOMPolicy=continue
+OOMScoreAdjust=-1000
^ permalink raw reply related [flat|nested] 28+ messages in thread