| 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: <176169818574.1430840.331637712484434762.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 18:16:31 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: tytso@....edu
Cc: linux-fsdevel@...r.kernel.org, joannelkoong@...il.com, bernd@...ernd.com,
neal@...pa.dev, miklos@...redi.hu, linux-ext4@...r.kernel.org
Subject: [PATCH 1/3] fuse2fs: enable caching of iomaps
From: Darrick J. Wong <djwong@...nel.org>
Cache the iomaps we generate in the kernel for better performance.
Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
fuse4fs/fuse4fs.c | 25 +++++++++++++++++++++++++
misc/fuse2fs.c | 24 ++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/fuse4fs/fuse4fs.c b/fuse4fs/fuse4fs.c
index 958b3cab83a68d..438a9030e3da27 100644
--- a/fuse4fs/fuse4fs.c
+++ b/fuse4fs/fuse4fs.c
@@ -293,6 +293,8 @@ struct fuse4fs {
#ifdef STATX_WRITE_ATOMIC
unsigned int awu_min, awu_max;
#endif
+ /* options set by fuse_opt_parse must be of type int */
+ int iomap_cache;
#endif
unsigned int blockmask;
unsigned long offset;
@@ -6886,6 +6888,24 @@ static void op_iomap_begin(fuse_req_t req, fuse_ino_t fino, uint64_t dontcare,
if (opflags & FUSE_IOMAP_OP_ATOMIC)
read.flags |= FUSE_IOMAP_F_ATOMIC_BIO;
+ /*
+ * Cache the mapping in the kernel so that we can reuse them for
+ * subsequent IO.
+ */
+ if (ff->iomap_cache) {
+ ret = fuse_lowlevel_notify_iomap_upsert(ff->fuse, fino, ino,
+ &read, NULL);
+ if (ret) {
+ ret = translate_error(fs, ino, -ret);
+ goto out_unlock;
+ } else {
+ /* Tell the kernel to retry from cache */
+ read.type = FUSE_IOMAP_TYPE_RETRY_CACHE;
+ read.dev = FUSE_IOMAP_DEV_NULL;
+ read.addr = FUSE_IOMAP_NULL_ADDR;
+ }
+ }
+
out_unlock:
fuse4fs_finish(ff, ret);
if (ret)
@@ -7699,6 +7719,10 @@ static struct fuse_opt fuse4fs_opts[] = {
#ifdef HAVE_CLOCK_MONOTONIC
FUSE4FS_OPT("timing", timing, 1),
#endif
+#ifdef HAVE_FUSE_IOMAP
+ FUSE4FS_OPT("iomap_cache", iomap_cache, 1),
+ FUSE4FS_OPT("noiomap_cache", iomap_cache, 0),
+#endif
#ifdef HAVE_FUSE_IOMAP
#ifdef MS_LAZYTIME
@@ -8083,6 +8107,7 @@ int main(int argc, char *argv[])
.iomap_want = FT_DEFAULT,
.iomap_state = IOMAP_UNKNOWN,
.iomap_dev = FUSE_IOMAP_DEV_NULL,
+ .iomap_cache = 1,
#endif
#ifdef HAVE_FUSE_LOOPDEV
.loop_fd = -1,
diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index c0e8fa35dcf8ed..ff32a429179915 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -285,6 +285,8 @@ struct fuse2fs {
#ifdef STATX_WRITE_ATOMIC
unsigned int awu_min, awu_max;
#endif
+ /* options set by fuse_opt_parse must be of type int */
+ int iomap_cache;
#endif
unsigned int blockmask;
unsigned long offset;
@@ -6440,6 +6442,23 @@ static int op_iomap_begin(const char *path, uint64_t nodeid, uint64_t attr_ino,
if (opflags & FUSE_IOMAP_OP_ATOMIC)
read->flags |= FUSE_IOMAP_F_ATOMIC_BIO;
+ /*
+ * Cache the mapping in the kernel so that we can reuse them for
+ * subsequent IO.
+ */
+ if (ff->iomap_cache) {
+ ret = fuse_fs_iomap_upsert(nodeid, attr_ino, read, NULL);
+ if (ret) {
+ ret = translate_error(fs, attr_ino, -ret);
+ goto out_unlock;
+ } else {
+ /* Tell the kernel to retry from cache */
+ read->type = FUSE_IOMAP_TYPE_RETRY_CACHE;
+ read->dev = FUSE_IOMAP_DEV_NULL;
+ read->addr = FUSE_IOMAP_NULL_ADDR;
+ }
+ }
+
out_unlock:
fuse2fs_finish(ff, ret);
return ret;
@@ -7245,6 +7264,10 @@ static struct fuse_opt fuse2fs_opts[] = {
#ifdef HAVE_CLOCK_MONOTONIC
FUSE2FS_OPT("timing", timing, 1),
#endif
+#ifdef HAVE_FUSE_IOMAP
+ FUSE2FS_OPT("iomap_cache", iomap_cache, 1),
+ FUSE2FS_OPT("noiomap_cache", iomap_cache, 0),
+#endif
#ifdef HAVE_FUSE_IOMAP
#ifdef MS_LAZYTIME
@@ -7525,6 +7548,7 @@ int main(int argc, char *argv[])
.iomap_want = FT_DEFAULT,
.iomap_state = IOMAP_UNKNOWN,
.iomap_dev = FUSE_IOMAP_DEV_NULL,
+ .iomap_cache = 1,
#endif
#ifdef HAVE_FUSE_LOOPDEV
.loop_fd = -1,
Powered by blists - more mailing lists