FAILED: patch "[PATCH] fuse: publish io-uring queues with release semantics" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 42df916e5a5f8fb4b60c8cefb54318d1ec02c580
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026083152-cucumber-unwieldy-2691@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 42df916e5a5f8fb4b60c8cefb54318d1ec02c580 Mon Sep 17 00:00:00 2001
From: Joanne Koong <[email protected]>
Date: Thu, 16 Jul 2026 11:31:44 -0700
Subject: [PATCH] fuse: publish io-uring queues with release semantics
fuse_uring_create_queue() initializes a fuse_ring_queue and then publishes the pointer into ring->queues[qid] with WRITE_ONCE() under the fch->lock. There are several readers that may concurrently be fetching that pointer locklessly and then deferencing it.
WRITE_ONCE() doesn't ensure ordering of the queue's field initialization before the ring->queues[qid] pointer assignment. The queue must be published with smp_store_release() so the field initialization is guaranteed to happen before.
Readers in paths where the read may happen concurrently with the store need to use READ_ONCE() because any race involving a plain access is undefined.
fs/fuse/dev_uring.c +11 -9
@@ -204,7 +204,7 @@ void fuse_uring_destruct(struct fuse_chan *fch)return ;for (qid =0 ; qid < ring->nr_queues; qid++) { -struct fuse_ring_queue *queue = ring->queues[qid]; +struct fuse_ring_queue *queue =READ_ONCE (ring->queues[qid]);struct fuse_ring_ent *ent, *next;if (!queue)
@@ -223,7 +223,7 @@ void fuse_uring_destruct(struct fuse_chan *fch)kfree (queue->fpq.processing);kfree (queue); - ring->queues[qid] =NULL ; +WRITE_ONCE (ring->queues[qid],NULL ); }kfree (ring->queues);
@@ -321,9 +321,11 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, }/* -* write_once and lock as the caller mostly doesn't take the lock at all +* fch->lock serializes concurrent creators for this qid. +* smp_store_release() are for the lockless readers who must see a +* fully initialized queue after &ring->queues[qid] is set */ -WRITE_ONCE (ring->queues[qid], queue); +smp_store_release (&ring->queues[qid], queue);spin_unlock (&fch->lock);return queue;
@@ -434,7 +436,7 @@ static void fuse_uring_log_ent_state(struct fuse_ring *ring)struct fuse_ring_ent *ent;for (qid =0 ; qid < ring->nr_queues; qid++) { -struct fuse_ring_queue *queue = ring->queues[qid]; +struct fuse_ring_queue *queue =READ_ONCE (ring->queues[qid]);if (!queue)continue ;
@@ -967,7 +969,7 @@ static int fuse_uring_commit_fetch(struct io_uring_cmd *cmd, int issue_flags,if (qid >= ring->nr_queues)return -EINVAL ; - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);if (!queue)return err; fpq = &queue->fpq;
@@ -1035,7 +1037,7 @@ static bool is_ring_ready(struct fuse_ring *ring, int current_qid)if (current_qid == qid)continue ; - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);if (!queue) { ready = false;break ;
@@ -1191,7 +1193,7 @@ static int fuse_uring_register(struct io_uring_cmd *cmd,return -EINVAL ; } - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);if (!queue) { queue =fuse_uring_create_queue (ring, qid);if (!queue)
@@ -1332,7 +1334,7 @@ static struct fuse_ring_queue *fuse_uring_task_to_queue(struct fuse_ring *ring) ring->nr_queues)) qid =0 ; - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);WARN_ONCE (!queue,"Missing queue for qid %d\n" , qid);return queue;
Sasha Levin
maintainerPATCH 1/1 fuse: publish io-uring queues with release semantics
From: Joanne Koong <[email protected]>
[ Upstream commit 42df916e5a5f8fb4b60c8cefb54318d1ec02c580 ]
fuse_uring_create_queue() initializes a fuse_ring_queue and then publishes the pointer into ring->queues[qid] with WRITE_ONCE() under the fch->lock. There are several readers that may concurrently be fetching that pointer locklessly and then deferencing it.
WRITE_ONCE() doesn't ensure ordering of the queue's field initialization before the ring->queues[qid] pointer assignment. The queue must be published with smp_store_release() so the field initialization is guaranteed to happen before.
Readers in paths where the read may happen concurrently with the store need to use READ_ONCE() because any race involving a plain access is undefined.
--- fs/fuse/dev_uring.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
fs/fuse/dev_uring.c +11 -9
@@ -194,7 +194,7 @@ void fuse_uring_destruct(struct fuse_conn *fc)return ;for (qid =0 ; qid < ring->nr_queues; qid++) { -struct fuse_ring_queue *queue = ring->queues[qid]; +struct fuse_ring_queue *queue =READ_ONCE (ring->queues[qid]);struct fuse_ring_ent *ent, *next;if (!queue)
@@ -213,7 +213,7 @@ void fuse_uring_destruct(struct fuse_conn *fc)kfree (queue->fpq.processing);kfree (queue); - ring->queues[qid] =NULL ; +WRITE_ONCE (ring->queues[qid],NULL ); }kfree (ring->queues);
@@ -307,9 +307,11 @@ static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring *ring, }/* -* write_once and lock as the caller mostly doesn't take the lock at all +* fc->lock serializes concurrent creators for this qid. +* smp_store_release() are for the lockless readers who must see a +* fully initialized queue after &ring->queues[qid] is set */ -WRITE_ONCE (ring->queues[qid], queue); +smp_store_release (&ring->queues[qid], queue);spin_unlock (&fc->lock);return queue;
@@ -406,7 +408,7 @@ static void fuse_uring_log_ent_state(struct fuse_ring *ring)struct fuse_ring_ent *ent;for (qid =0 ; qid < ring->nr_queues; qid++) { -struct fuse_ring_queue *queue = ring->queues[qid]; +struct fuse_ring_queue *queue =READ_ONCE (ring->queues[qid]);if (!queue)continue ;
@@ -911,7 +913,7 @@ static int fuse_uring_commit_fetch(struct io_uring_cmd *cmd, int issue_flags,if (qid >= ring->nr_queues)return -EINVAL ; - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);if (!queue)return err; fpq = &queue->fpq;
@@ -980,7 +982,7 @@ static bool is_ring_ready(struct fuse_ring *ring, int current_qid)if (current_qid == qid)continue ; - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);if (!queue) { ready = false;break ;
@@ -1134,7 +1136,7 @@ static int fuse_uring_register(struct io_uring_cmd *cmd,return -EINVAL ; } - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);if (!queue) { queue =fuse_uring_create_queue (ring, qid);if (!queue)
@@ -1286,7 +1288,7 @@ static struct fuse_ring_queue *fuse_uring_task_to_queue(struct fuse_ring *ring) ring->nr_queues)) qid =0 ; - queue = ring->queues[qid]; + queue =READ_ONCE (ring->queues[qid]);WARN_ONCE (!queue,"Missing queue for qid %d\n" , qid);return queue;
Signature · 1 line
2.53.0