| 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: <176169813587.1427432.12051320125204977032.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 18:00:05 -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 03/22] libfuse: add fuse commands for iomap_begin and end
From: Darrick J. Wong <djwong@...nel.org>
Teach the low level API how to handle iomap begin and end commands that
we get from the kernel.
Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
include/fuse_common.h | 71 +++++++++++++++++++++++++++++++++
include/fuse_kernel.h | 40 ++++++++++++++++++
include/fuse_lowlevel.h | 59 +++++++++++++++++++++++++++
lib/fuse_lowlevel.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++
lib/fuse_versionscript | 3 +
5 files changed, 275 insertions(+)
diff --git a/include/fuse_common.h b/include/fuse_common.h
index 9d53354de78868..12b951039f0a67 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -1135,7 +1135,78 @@ bool fuse_get_feature_flag(struct fuse_conn_info *conn, uint64_t flag);
*/
int fuse_convert_to_conn_want_ext(struct fuse_conn_info *conn);
+/**
+ * iomap operations.
+ * These APIs are introduced in version 399 (FUSE_MAKE_VERSION(3, 99)).
+ */
+/* mapping types; see corresponding IOMAP_TYPE_ */
+#define FUSE_IOMAP_TYPE_HOLE (0)
+#define FUSE_IOMAP_TYPE_DELALLOC (1)
+#define FUSE_IOMAP_TYPE_MAPPED (2)
+#define FUSE_IOMAP_TYPE_UNWRITTEN (3)
+#define FUSE_IOMAP_TYPE_INLINE (4)
+
+/* fuse-specific mapping type indicating that writes use the read mapping */
+#define FUSE_IOMAP_TYPE_PURE_OVERWRITE (255)
+
+#define FUSE_IOMAP_DEV_NULL (0U) /* null device cookie */
+
+/* mapping flags passed back from iomap_begin; see corresponding IOMAP_F_ */
+#define FUSE_IOMAP_F_NEW (1U << 0)
+#define FUSE_IOMAP_F_DIRTY (1U << 1)
+#define FUSE_IOMAP_F_SHARED (1U << 2)
+#define FUSE_IOMAP_F_MERGED (1U << 3)
+#define FUSE_IOMAP_F_BOUNDARY (1U << 4)
+#define FUSE_IOMAP_F_ANON_WRITE (1U << 5)
+#define FUSE_IOMAP_F_ATOMIC_BIO (1U << 6)
+
+/* fuse-specific mapping flag asking for ->iomap_end call */
+#define FUSE_IOMAP_F_WANT_IOMAP_END (1U << 7)
+
+/* mapping flags passed to iomap_end */
+#define FUSE_IOMAP_F_SIZE_CHANGED (1U << 8)
+#define FUSE_IOMAP_F_STALE (1U << 9)
+
+/* operation flags from iomap; see corresponding IOMAP_* */
+#define FUSE_IOMAP_OP_WRITE (1U << 0)
+#define FUSE_IOMAP_OP_ZERO (1U << 1)
+#define FUSE_IOMAP_OP_REPORT (1U << 2)
+#define FUSE_IOMAP_OP_FAULT (1U << 3)
+#define FUSE_IOMAP_OP_DIRECT (1U << 4)
+#define FUSE_IOMAP_OP_NOWAIT (1U << 5)
+#define FUSE_IOMAP_OP_OVERWRITE_ONLY (1U << 6)
+#define FUSE_IOMAP_OP_UNSHARE (1U << 7)
+#define FUSE_IOMAP_OP_DAX (1U << 8)
+#define FUSE_IOMAP_OP_ATOMIC (1U << 9)
+#define FUSE_IOMAP_OP_DONTCACHE (1U << 10)
+
+/* pagecache writeback operation */
+#define FUSE_IOMAP_OP_WRITEBACK (1U << 31)
+
+#define FUSE_IOMAP_NULL_ADDR (-1ULL) /* addr is not valid */
+
+struct fuse_file_iomap {
+ uint64_t addr; /* disk offset of mapping, bytes */
+ uint64_t offset; /* file offset of mapping, bytes */
+ uint64_t length; /* length of mapping, bytes */
+ uint16_t type; /* FUSE_IOMAP_TYPE_* */
+ uint16_t flags; /* FUSE_IOMAP_F_* */
+ uint32_t dev; /* device cookie */
+};
+
+static inline bool fuse_iomap_is_write(unsigned int opflags)
+{
+ return opflags & (FUSE_IOMAP_OP_WRITE | FUSE_IOMAP_OP_ZERO |
+ FUSE_IOMAP_OP_UNSHARE | FUSE_IOMAP_OP_WRITEBACK);
+}
+
+static inline bool fuse_iomap_need_write_allocate(unsigned int opflags,
+ const struct fuse_file_iomap *map)
+{
+ return map->type == FUSE_IOMAP_TYPE_HOLE &&
+ !(opflags & FUSE_IOMAP_OP_ZERO);
+}
/* ----------------------------------------------------------- *
* Compatibility stuff *
diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
index 80ac8c09d2dd64..99cc2a4245fa6a 100644
--- a/include/fuse_kernel.h
+++ b/include/fuse_kernel.h
@@ -668,6 +668,9 @@ enum fuse_opcode {
FUSE_STATX = 52,
FUSE_COPY_FILE_RANGE_64 = 53,
+ FUSE_IOMAP_BEGIN = 4094,
+ FUSE_IOMAP_END = 4095,
+
/* CUSE specific operations */
CUSE_INIT = 4096,
@@ -1305,4 +1308,41 @@ struct fuse_uring_cmd_req {
uint8_t padding[6];
};
+struct fuse_iomap_io {
+ uint64_t offset; /* file offset of mapping, bytes */
+ uint64_t length; /* length of mapping, bytes */
+ uint64_t addr; /* disk offset of mapping, bytes */
+ uint16_t type; /* FUSE_IOMAP_TYPE_* */
+ uint16_t flags; /* FUSE_IOMAP_F_* */
+ uint32_t dev; /* device cookie */
+};
+
+struct fuse_iomap_begin_in {
+ uint32_t opflags; /* FUSE_IOMAP_OP_* */
+ uint32_t reserved; /* zero */
+ uint64_t attr_ino; /* matches fuse_attr:ino */
+ uint64_t pos; /* file position, in bytes */
+ uint64_t count; /* operation length, in bytes */
+};
+
+struct fuse_iomap_begin_out {
+ /* read file data from here */
+ struct fuse_iomap_io read;
+
+ /* write file data to here, if applicable */
+ struct fuse_iomap_io write;
+};
+
+struct fuse_iomap_end_in {
+ uint32_t opflags; /* FUSE_IOMAP_OP_* */
+ uint32_t reserved; /* zero */
+ uint64_t attr_ino; /* matches fuse_attr:ino */
+ uint64_t pos; /* file position, in bytes */
+ uint64_t count; /* operation length, in bytes */
+ int64_t written; /* bytes processed */
+
+ /* mapping that the kernel acted upon */
+ struct fuse_iomap_io map;
+};
+
#endif /* _LINUX_FUSE_H */
diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index c41ad8f13c0d3c..344d1457e217ee 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1342,6 +1342,43 @@ struct fuse_lowlevel_ops {
*/
void (*statx)(fuse_req_t req, fuse_ino_t ino, int flags, int mask,
struct fuse_file_info *fi);
+
+ /**
+ * Fetch file I/O mappings to begin an operation
+ *
+ * Valid replies:
+ * fuse_reply_iomap_begin
+ * fuse_reply_err
+ *
+ * @param req request handle
+ * @param nodeid the inode number
+ * @param attr_ino inode number as told by fuse_attr::ino
+ * @param pos position in file, in bytes
+ * @param count length of operation, in bytes
+ * @param opflags mask of FUSE_IOMAP_OP_ flags specifying operation
+ */
+ void (*iomap_begin) (fuse_req_t req, fuse_ino_t nodeid,
+ uint64_t attr_ino, off_t pos, uint64_t count,
+ uint32_t opflags);
+
+ /**
+ * Complete an iomap operation
+ *
+ * Valid replies:
+ * fuse_reply_err
+ *
+ * @param req request handle
+ * @param nodeid the inode number
+ * @param attr_ino inode number as told by fuse_attr::ino
+ * @param pos position in file, in bytes
+ * @param count length of operation, in bytes
+ * @param written number of bytes processed, or a negative errno
+ * @param opflags mask of FUSE_IOMAP_OP_ flags specifying operation
+ * @param iomap file I/O mapping that was acted upon
+ */
+ void (*iomap_end) (fuse_req_t req, fuse_ino_t nodeid, uint64_t attr_ino,
+ off_t pos, uint64_t count, uint32_t opflags,
+ ssize_t written, const struct fuse_file_iomap *iomap);
};
/**
@@ -1736,6 +1773,28 @@ int fuse_reply_lseek(fuse_req_t req, off_t off);
*/
int fuse_reply_statx(fuse_req_t req, int flags, struct statx *statx, double attr_timeout);
+/**
+ * Set an iomap write mapping to be a pure overwrite of the read mapping.
+ * @param write mapping for file data writes
+ * @param read mapping for file data reads
+ */
+void fuse_iomap_pure_overwrite(struct fuse_file_iomap *write,
+ const struct fuse_file_iomap *read);
+
+/**
+ * Reply with iomappings for an iomap_begin operation
+ *
+ * Possible requests:
+ * iomap_begin
+ *
+ * @param req request handle
+ * @param read mapping for file data reads
+ * @param write mapping for file data writes
+ * @return zero for success, -errno for failure to send reply
+ */
+int fuse_reply_iomap_begin(fuse_req_t req, const struct fuse_file_iomap *read,
+ const struct fuse_file_iomap *write);
+
/* ----------------------------------------------------------- *
* Notification *
* ----------------------------------------------------------- */
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 913a2d910504e1..ed0999e2c46b3c 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2549,6 +2549,104 @@ static void do_statx(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
_do_statx(req, nodeid, inarg, NULL);
}
+void fuse_iomap_pure_overwrite(struct fuse_file_iomap *write,
+ const struct fuse_file_iomap *read)
+{
+ write->addr = FUSE_IOMAP_NULL_ADDR;
+ write->offset = read->offset;
+ write->length = read->length;
+ write->type = FUSE_IOMAP_TYPE_PURE_OVERWRITE;
+ write->flags = 0;
+ write->dev = FUSE_IOMAP_DEV_NULL;
+}
+
+static inline void fuse_iomap_to_kernel(struct fuse_iomap_io *fmap,
+ const struct fuse_file_iomap *fimap)
+{
+ fmap->addr = fimap->addr;
+ fmap->offset = fimap->offset;
+ fmap->length = fimap->length;
+ fmap->type = fimap->type;
+ fmap->flags = fimap->flags;
+ fmap->dev = fimap->dev;
+}
+
+static inline void fuse_iomap_from_kernel(struct fuse_file_iomap *fimap,
+ const struct fuse_iomap_io *fmap)
+{
+ fimap->addr = fmap->addr;
+ fimap->offset = fmap->offset;
+ fimap->length = fmap->length;
+ fimap->type = fmap->type;
+ fimap->flags = fmap->flags;
+ fimap->dev = fmap->dev;
+}
+
+int fuse_reply_iomap_begin(fuse_req_t req, const struct fuse_file_iomap *read,
+ const struct fuse_file_iomap *write)
+{
+ struct fuse_iomap_begin_out arg = {
+ .write = {
+ .addr = FUSE_IOMAP_NULL_ADDR,
+ .offset = read->offset,
+ .length = read->length,
+ .type = FUSE_IOMAP_TYPE_PURE_OVERWRITE,
+ .flags = 0,
+ .dev = FUSE_IOMAP_DEV_NULL,
+ },
+ };
+
+ fuse_iomap_to_kernel(&arg.read, read);
+ if (write)
+ fuse_iomap_to_kernel(&arg.write, write);
+
+ return send_reply_ok(req, &arg, sizeof(arg));
+}
+
+static void _do_iomap_begin(fuse_req_t req, const fuse_ino_t nodeid,
+ const void *op_in, const void *in_payload)
+{
+ const struct fuse_iomap_begin_in *arg = op_in;
+ (void)in_payload;
+ (void)nodeid;
+
+ if (req->se->op.iomap_begin)
+ req->se->op.iomap_begin(req, nodeid, arg->attr_ino, arg->pos,
+ arg->count, arg->opflags);
+ else
+ fuse_reply_err(req, ENOSYS);
+}
+
+static void do_iomap_begin(fuse_req_t req, const fuse_ino_t nodeid,
+ const void *inarg)
+{
+ _do_iomap_begin(req, nodeid, inarg, NULL);
+}
+
+static void _do_iomap_end(fuse_req_t req, const fuse_ino_t nodeid,
+ const void *op_in, const void *in_payload)
+{
+ const struct fuse_iomap_end_in *arg = op_in;
+ (void)in_payload;
+ (void)nodeid;
+
+ if (req->se->op.iomap_end) {
+ struct fuse_file_iomap fimap;
+
+ fuse_iomap_from_kernel(&fimap, &arg->map);
+ req->se->op.iomap_end(req, nodeid, arg->attr_ino, arg->pos,
+ arg->count, arg->opflags, arg->written,
+ &fimap);
+ } else
+ fuse_reply_err(req, ENOSYS);
+}
+
+static void do_iomap_end(fuse_req_t req, const fuse_ino_t nodeid,
+ const void *inarg)
+{
+ _do_iomap_end(req, nodeid, inarg, NULL);
+}
+
static bool want_flags_valid(uint64_t capable, uint64_t want)
{
uint64_t unknown_flags = want & (~capable);
@@ -3456,6 +3554,8 @@ 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_BEGIN] = { do_iomap_begin, "IOMAP_BEGIN" },
+ [FUSE_IOMAP_END] = { do_iomap_end, "IOMAP_END" },
[CUSE_INIT] = { cuse_lowlevel_init, "CUSE_INIT" },
};
@@ -3512,6 +3612,8 @@ 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_BEGIN] = { _do_iomap_begin, "IOMAP_BEGIN" },
+ [FUSE_IOMAP_END] = { _do_iomap_end, "IOMAP_END" },
[CUSE_INIT] = { _cuse_lowlevel_init, "CUSE_INIT" },
};
diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 96a94e43f73909..eb4d2f350ec63c 100644
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -219,6 +219,9 @@ FUSE_3.18 {
} FUSE_3.17;
FUSE_3.99 {
+ global:
+ fuse_iomap_pure_overwrite;
+ fuse_reply_iomap_begin;
} FUSE_3.18;
# Local Variables:
Powered by blists - more mailing lists