| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <176169813786.1427432.414564085463311156.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 18:02:57 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: djwong@...nel.org, bschubert@....com
Cc: linux-ext4@...r.kernel.org, linux-fsdevel@...r.kernel.org,
bernd@...ernd.com, miklos@...redi.hu, joannelkoong@...il.com, neal@...pa.dev
Subject: [PATCH 14/22] libfuse: add lower level iomap_config implementation
From: Darrick J. Wong <djwong@...nel.org>
Add FUSE_IOMAP_CONFIG helpers to the low level fuse library.
Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
include/fuse_common.h | 31 ++++++++++++++++++
include/fuse_kernel.h | 31 ++++++++++++++++++
include/fuse_lowlevel.h | 27 +++++++++++++++
lib/fuse_lowlevel.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
lib/fuse_versionscript | 1 +
5 files changed, 172 insertions(+)
diff --git a/include/fuse_common.h b/include/fuse_common.h
index 86ae8894d81dbb..59b79b44a36e8d 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -1233,6 +1233,37 @@ static inline bool fuse_iomap_need_write_allocate(unsigned int opflags,
/* use iomap for this inode */
#define FUSE_IFLAG_IOMAP (1U << 1)
+/* Which fields are set in fuse_iomap_config_out? */
+#define FUSE_IOMAP_CONFIG_SID (1 << 0ULL)
+#define FUSE_IOMAP_CONFIG_UUID (1 << 1ULL)
+#define FUSE_IOMAP_CONFIG_BLOCKSIZE (1 << 2ULL)
+#define FUSE_IOMAP_CONFIG_MAX_LINKS (1 << 3ULL)
+#define FUSE_IOMAP_CONFIG_TIME (1 << 4ULL)
+#define FUSE_IOMAP_CONFIG_MAXBYTES (1 << 5ULL)
+
+struct fuse_iomap_config{
+ uint64_t flags; /* FUSE_IOMAP_CONFIG_* */
+
+ char s_id[32]; /* Informational name */
+ char s_uuid[16]; /* UUID */
+
+ uint8_t s_uuid_len; /* length of s_uuid */
+
+ uint8_t s_pad[3]; /* must be zeroes */
+
+ uint32_t s_blocksize; /* fs block size */
+ uint32_t s_max_links; /* max hard links */
+
+ /* Granularity of c/m/atime in ns (cannot be worse than a second) */
+ uint32_t s_time_gran;
+
+ /* Time limits for c/m/atime in seconds */
+ int64_t s_time_min;
+ int64_t s_time_max;
+
+ int64_t s_maxbytes; /* max file size */
+};
+
/* ----------------------------------------------------------- *
* Compatibility stuff *
* ----------------------------------------------------------- */
diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
index 3dc00cd4cb113f..77123c3d0323f7 100644
--- a/include/fuse_kernel.h
+++ b/include/fuse_kernel.h
@@ -243,6 +243,7 @@
* 7.99
* - add FUSE_IOMAP and iomap_{begin,end,ioend} for regular file operations
* - add FUSE_ATTR_IOMAP to enable iomap for specific inodes
+ * - add FUSE_IOMAP_CONFIG so the fuse server can configure more fs geometry
*/
#ifndef _LINUX_FUSE_H
@@ -671,6 +672,7 @@ enum fuse_opcode {
FUSE_STATX = 52,
FUSE_COPY_FILE_RANGE_64 = 53,
+ FUSE_IOMAP_CONFIG = 4092,
FUSE_IOMAP_IOEND = 4093,
FUSE_IOMAP_BEGIN = 4094,
FUSE_IOMAP_END = 4095,
@@ -1373,4 +1375,33 @@ struct fuse_iomap_ioend_in {
uint32_t reserved1; /* zero */
};
+struct fuse_iomap_config_in {
+ uint64_t flags; /* supported FUSE_IOMAP_CONFIG_* flags */
+ int64_t maxbytes; /* max supported file size */
+ uint64_t padding[6]; /* zero */
+};
+
+struct fuse_iomap_config_out {
+ uint64_t flags; /* FUSE_IOMAP_CONFIG_* */
+
+ char s_id[32]; /* Informational name */
+ char s_uuid[16]; /* UUID */
+
+ uint8_t s_uuid_len; /* length of s_uuid */
+
+ uint8_t s_pad[3]; /* must be zeroes */
+
+ uint32_t s_blocksize; /* fs block size */
+ uint32_t s_max_links; /* max hard links */
+
+ /* Granularity of c/m/atime in ns (cannot be worse than a second) */
+ uint32_t s_time_gran;
+
+ /* Time limits for c/m/atime in seconds */
+ int64_t s_time_min;
+ int64_t s_time_max;
+
+ int64_t s_maxbytes; /* max file size */
+};
+
#endif /* _LINUX_FUSE_H */
diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 5ce7b4aaa2ae94..20c0a1e38595e1 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1408,6 +1408,20 @@ struct fuse_lowlevel_ops {
uint64_t attr_ino, off_t pos, size_t written,
uint32_t ioendflags, int error,
uint64_t new_addr);
+
+ /**
+ * Configure the filesystem geometry for iomap mode
+ *
+ * Valid replies:
+ * fuse_reply_iomap_config
+ * fuse_reply_err
+ *
+ * @param req request handle
+ * @param flags FUSE_IOMAP_CONFIG_* flags that can be passed back
+ * @param maxbytes maximum supported file size
+ */
+ void (*iomap_config) (fuse_req_t req, uint64_t flags,
+ uint64_t maxbytes);
};
/**
@@ -1898,6 +1912,19 @@ void fuse_iomap_pure_overwrite(struct fuse_file_iomap *write,
int fuse_reply_iomap_begin(fuse_req_t req, const struct fuse_file_iomap *read,
const struct fuse_file_iomap *write);
+/**
+ * Reply with iomap configuration
+ *
+ * Possible requests:
+ * iomap_config
+ *
+ * @param req request handle
+ * @param cfg iomap configuration
+ * @return zero for success, -errno for failure to send reply
+ */
+int fuse_reply_iomap_config(fuse_req_t req,
+ const struct fuse_iomap_config *cfg);
+
/* ----------------------------------------------------------- *
* Notification *
* ----------------------------------------------------------- */
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 4e7bf40833b578..3c3aa7aec9f494 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2753,6 +2753,86 @@ static void do_iomap_ioend(fuse_req_t req, const fuse_ino_t nodeid,
_do_iomap_ioend(req, nodeid, inarg, NULL);
}
+#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
+#define offsetofend(TYPE, MEMBER) \
+ (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER))
+
+#define FUSE_IOMAP_CONFIG_V1 (FUSE_IOMAP_CONFIG_SID | \
+ FUSE_IOMAP_CONFIG_UUID | \
+ FUSE_IOMAP_CONFIG_BLOCKSIZE | \
+ FUSE_IOMAP_CONFIG_MAX_LINKS | \
+ FUSE_IOMAP_CONFIG_TIME | \
+ FUSE_IOMAP_CONFIG_MAXBYTES)
+
+#define FUSE_IOMAP_CONFIG_ALL (FUSE_IOMAP_CONFIG_V1)
+
+static ssize_t iomap_config_reply_size(const struct fuse_iomap_config *cfg)
+{
+ if (cfg->flags & ~FUSE_IOMAP_CONFIG_ALL)
+ return -EINVAL;
+
+ return offsetofend(struct fuse_iomap_config_out, s_maxbytes);
+}
+
+int fuse_reply_iomap_config(fuse_req_t req, const struct fuse_iomap_config *cfg)
+{
+ struct fuse_iomap_config_out arg = {
+ .flags = cfg->flags,
+ };
+ const ssize_t reply_size = iomap_config_reply_size(cfg);
+
+ if (reply_size < 0)
+ fuse_reply_err(req, -reply_size);
+
+ if (cfg->flags & FUSE_IOMAP_CONFIG_BLOCKSIZE)
+ arg.s_blocksize = cfg->s_blocksize;
+
+ if (cfg->flags & FUSE_IOMAP_CONFIG_SID)
+ memcpy(arg.s_id, cfg->s_id, sizeof(arg.s_id));
+
+ if (cfg->flags & FUSE_IOMAP_CONFIG_UUID) {
+ arg.s_uuid_len = cfg->s_uuid_len;
+ if (arg.s_uuid_len > sizeof(arg.s_uuid))
+ arg.s_uuid_len = sizeof(arg.s_uuid);
+ memcpy(arg.s_uuid, cfg->s_uuid, arg.s_uuid_len);
+ }
+
+ if (cfg->flags & FUSE_IOMAP_CONFIG_MAX_LINKS)
+ arg.s_max_links = cfg->s_max_links;
+
+ if (cfg->flags & FUSE_IOMAP_CONFIG_TIME) {
+ arg.s_time_gran = cfg->s_time_gran;
+ arg.s_time_min = cfg->s_time_min;
+ arg.s_time_max = cfg->s_time_max;
+ }
+
+ if (cfg->flags & FUSE_IOMAP_CONFIG_MAXBYTES)
+ arg.s_maxbytes = cfg->s_maxbytes;
+
+ return send_reply_ok(req, &arg, reply_size);
+}
+
+static void _do_iomap_config(fuse_req_t req, const fuse_ino_t nodeid,
+ const void *op_in, const void *in_payload)
+{
+ (void)nodeid;
+ (void)in_payload;
+ const struct fuse_iomap_config_in *arg = op_in;
+
+ if (req->se->op.iomap_config)
+ req->se->op.iomap_config(req,
+ arg->flags & FUSE_IOMAP_CONFIG_ALL,
+ arg->maxbytes);
+ else
+ fuse_reply_err(req, ENOSYS);
+}
+
+static void do_iomap_config(fuse_req_t req, const fuse_ino_t nodeid,
+ const void *inarg)
+{
+ _do_iomap_config(req, nodeid, inarg, NULL);
+}
+
static bool want_flags_valid(uint64_t capable, uint64_t want)
{
uint64_t unknown_flags = want & (~capable);
@@ -3660,6 +3740,7 @@ static struct {
[FUSE_COPY_FILE_RANGE_64] = { do_copy_file_range_64, "COPY_FILE_RANGE_64" },
[FUSE_LSEEK] = { do_lseek, "LSEEK" },
[FUSE_STATX] = { do_statx, "STATX" },
+ [FUSE_IOMAP_CONFIG]= { do_iomap_config, "IOMAP_CONFIG" },
[FUSE_IOMAP_BEGIN] = { do_iomap_begin, "IOMAP_BEGIN" },
[FUSE_IOMAP_END] = { do_iomap_end, "IOMAP_END" },
[FUSE_IOMAP_IOEND] = { do_iomap_ioend, "IOMAP_IOEND" },
@@ -3719,6 +3800,7 @@ static struct {
[FUSE_COPY_FILE_RANGE_64] = { _do_copy_file_range_64, "COPY_FILE_RANGE_64" },
[FUSE_LSEEK] = { _do_lseek, "LSEEK" },
[FUSE_STATX] = { _do_statx, "STATX" },
+ [FUSE_IOMAP_CONFIG] = { _do_iomap_config, "IOMAP_CONFIG" },
[FUSE_IOMAP_BEGIN] = { _do_iomap_begin, "IOMAP_BEGIN" },
[FUSE_IOMAP_END] = { _do_iomap_end, "IOMAP_END" },
[FUSE_IOMAP_IOEND] = { _do_iomap_ioend, "IOMAP_IOEND" },
diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 704e8c2908ec4b..6e57e943a60e2d 100644
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -233,6 +233,7 @@ FUSE_3.99 {
fuse_fs_can_enable_iomap;
fuse_fs_can_enable_iomapx;
fuse_lowlevel_discover_iomap;
+ fuse_reply_iomap_config;
} FUSE_3.18;
# Local Variables:
Powered by blists - more mailing lists