fs/fuse/dev.c | 28 +++++++++++---- fs/fuse/dev_uring.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_dev_i.h | 15 ++++++++ 3 files changed, 119 insertions(+), 7 deletions(-)
Once the FUSE io_uring is registered and marked ready, most request
types are delivered through io_uring, while FORGET notifications were still
queued with fuse_dev_queue_forget() and only consumed through the legacy
path on /dev/fuse.
Deliver single FORGET operations through fuse_uring_queue_fuse_req() when
the ring is ready. Otherwise, fall back to the legacy forget list path so
behavior matches the previous implementation.
Benefits:
- While io-uring is active, the daemon can handle forgets in the same
commit/fetch loop as other opcodes instead of also draining a separate
/dev/fuse read path for forget traffic.
- Reduces split-brain transport for high-volume forgets (eviction,
unmount) when the ring is already the primary channel, which simplifies
userspace and keeps teardown forgets on the same completion path as
other uring-backed work.
- Reuses the same per-queue io-uring machinery and noreply/force request
setup (creds, FR_WAITING/FR_FORCE, etc.) already used for similar
kernel-initiated traffic.
Signed-off-by: Li Wang <liwang@kylinos.cn>
---
Changes since v1:
- Single forget enqueue entry: fuse_io_uring_ops.send_forget stays
fuse_dev_queue_forget(); when fuse_uring_ready() call
fuse_io_uring_send_forget(), else use the legacy list. v1 wired
send_forget to fuse_io_uring_send_forget() directly.
- Move fuse_io_uring_send_forget() and fuse_forget_uring_data from dev.c
to dev_uring.c; declare fuse_request_alloc, fuse_adjust_compat,
fuse_force_creds, fuse_args_to_req, fuse_drop_waiting in fuse_dev_i.h.
- Split list-only enqueue into fuse_dev_queue_forget_list(); use it on
fallback paths inside fuse_io_uring_send_forget() to avoid recursion.
fs/fuse/dev.c | 28 +++++++++++----
fs/fuse/dev_uring.c | 83 ++++++++++++++++++++++++++++++++++++++++++++
fs/fuse/fuse_dev_i.h | 15 ++++++++
3 files changed, 119 insertions(+), 7 deletions(-)
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index b212565a78cf..558c05862f68 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -137,7 +137,7 @@ static void fuse_request_init(struct fuse_mount *fm, struct fuse_req *req)
req->create_time = jiffies;
}
-static struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags)
+struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags)
{
struct fuse_req *req = kmem_cache_zalloc(fuse_req_cachep, flags);
if (req)
@@ -175,7 +175,7 @@ static bool fuse_block_alloc(struct fuse_conn *fc, bool for_background)
(fc->io_uring && fc->connected && !fuse_uring_ready(fc));
}
-static void fuse_drop_waiting(struct fuse_conn *fc)
+void fuse_drop_waiting(struct fuse_conn *fc)
{
/*
* lockess check of fc->connected is okay, because atomic_dec_and_test()
@@ -335,8 +335,8 @@ __releases(fiq->lock)
spin_unlock(&fiq->lock);
}
-void fuse_dev_queue_forget(struct fuse_iqueue *fiq,
- struct fuse_forget_link *forget)
+void fuse_dev_queue_forget_list(struct fuse_iqueue *fiq,
+ struct fuse_forget_link *forget)
{
spin_lock(&fiq->lock);
if (fiq->connected) {
@@ -349,6 +349,20 @@ void fuse_dev_queue_forget(struct fuse_iqueue *fiq,
}
}
+void fuse_dev_queue_forget(struct fuse_iqueue *fiq,
+ struct fuse_forget_link *forget)
+{
+#ifdef CONFIG_FUSE_IO_URING
+ struct fuse_conn *fc = container_of(fiq, struct fuse_conn, iq);
+
+ if (fuse_uring_ready(fc)) {
+ fuse_io_uring_send_forget(fiq, forget);
+ return;
+ }
+#endif
+ fuse_dev_queue_forget_list(fiq, forget);
+}
+
void fuse_dev_queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req)
{
spin_lock(&fiq->lock);
@@ -606,7 +620,7 @@ static void __fuse_request_send(struct fuse_req *req)
smp_rmb();
}
-static void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args)
+void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args)
{
if (fc->minor < 4 && args->opcode == FUSE_STATFS)
args->out_args[0].size = FUSE_COMPAT_STATFS_SIZE;
@@ -639,7 +653,7 @@ static void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args)
}
}
-static void fuse_force_creds(struct fuse_req *req)
+void fuse_force_creds(struct fuse_req *req)
{
struct fuse_conn *fc = req->fm->fc;
@@ -654,7 +668,7 @@ static void fuse_force_creds(struct fuse_req *req)
req->in.h.pid = pid_nr_ns(task_pid(current), fc->pid_ns);
}
-static void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args)
+void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args)
{
req->in.h.opcode = args->opcode;
req->in.h.nodeid = args->nodeid;
diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c
index 7b9822e8837b..75579e488937 100644
--- a/fs/fuse/dev_uring.c
+++ b/fs/fuse/dev_uring.c
@@ -1358,6 +1358,89 @@ bool fuse_uring_remove_pending_req(struct fuse_req *req)
return fuse_remove_pending_req(req, &queue->lock);
}
+struct fuse_forget_uring_data {
+ struct fuse_args args;
+ struct fuse_forget_in inarg;
+};
+
+static void fuse_forget_uring_free(struct fuse_mount *fm, struct fuse_args *args,
+ int error)
+{
+ struct fuse_forget_uring_data *d =
+ container_of(args, struct fuse_forget_uring_data, args);
+
+ kfree(d);
+}
+
+/*
+ * Send FUSE_FORGET through the io-uring ring when active; same payload as
+ * fuse_read_single_forget(), with userspace committing like any other request.
+ * Called from fuse_dev_queue_forget() when fuse_uring_ready().
+ */
+void fuse_io_uring_send_forget(struct fuse_iqueue *fiq,
+ struct fuse_forget_link *forget)
+{
+ struct fuse_conn *fc = container_of(fiq, struct fuse_conn, iq);
+ struct fuse_mount *fm;
+ struct fuse_req *req;
+ struct fuse_forget_uring_data *d;
+
+ if (!fuse_uring_ready(fc)) {
+ fuse_dev_queue_forget_list(fiq, forget);
+ return;
+ }
+
+ down_read(&fc->killsb);
+ if (list_empty(&fc->mounts)) {
+ up_read(&fc->killsb);
+ fuse_dev_queue_forget_list(fiq, forget);
+ return;
+ }
+ fm = list_first_entry(&fc->mounts, struct fuse_mount, fc_entry);
+ up_read(&fc->killsb);
+
+ d = kmalloc(sizeof(*d), GFP_KERNEL);
+ if (!d)
+ goto fallback;
+
+ atomic_inc(&fc->num_waiting);
+ req = fuse_request_alloc(fm, GFP_KERNEL);
+ if (!req) {
+ kfree(d);
+ fuse_drop_waiting(fc);
+ goto fallback;
+ }
+
+ memset(&d->args, 0, sizeof(d->args));
+ d->inarg.nlookup = forget->forget_one.nlookup;
+ d->args.opcode = FUSE_FORGET;
+ d->args.nodeid = forget->forget_one.nodeid;
+ d->args.in_numargs = 1;
+ d->args.in_args[0].size = sizeof(d->inarg);
+ d->args.in_args[0].value = &d->inarg;
+ d->args.force = true;
+ d->args.noreply = true;
+ d->args.end = fuse_forget_uring_free;
+
+ kfree(forget);
+
+ fuse_force_creds(req);
+ __set_bit(FR_WAITING, &req->flags);
+ if (!d->args.abort_on_kill)
+ __set_bit(FR_FORCE, &req->flags);
+ fuse_adjust_compat(fc, &d->args);
+ fuse_args_to_req(req, &d->args);
+ req->in.h.len = sizeof(struct fuse_in_header) +
+ fuse_len_args(req->args->in_numargs,
+ (struct fuse_arg *)req->args->in_args);
+
+ fuse_uring_queue_fuse_req(fiq, req);
+ return;
+
+fallback:
+ fuse_dev_queue_forget_list(fiq, forget);
+}
+
static const struct fuse_iqueue_ops fuse_io_uring_ops = {
/* should be send over io-uring as enhancement */
.send_forget = fuse_dev_queue_forget,
diff --git a/fs/fuse/fuse_dev_i.h b/fs/fuse/fuse_dev_i.h
index 134bf44aff0d..0e6bd08c421f 100644
--- a/fs/fuse/fuse_dev_i.h
+++ b/fs/fuse/fuse_dev_i.h
@@ -68,8 +68,23 @@ int fuse_copy_args(struct fuse_copy_state *cs, unsigned int numargs,
int zeroing);
int fuse_copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,
unsigned int nbytes);
+struct fuse_mount;
+struct fuse_conn;
+
+struct fuse_req *fuse_request_alloc(struct fuse_mount *fm, gfp_t flags);
+void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args);
+void fuse_force_creds(struct fuse_req *req);
+void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args);
+void fuse_drop_waiting(struct fuse_conn *fc);
+
+void fuse_dev_queue_forget_list(struct fuse_iqueue *fiq,
+ struct fuse_forget_link *forget);
void fuse_dev_queue_forget(struct fuse_iqueue *fiq,
struct fuse_forget_link *forget);
+#ifdef CONFIG_FUSE_IO_URING
+void fuse_io_uring_send_forget(struct fuse_iqueue *fiq,
+ struct fuse_forget_link *forget);
+#endif
void fuse_dev_queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req);
bool fuse_remove_pending_req(struct fuse_req *req, spinlock_t *lock);
--
2.34.1
© 2016 - 2026 Red Hat, Inc.