fuse: fix missing barriers in io-uring init
Subsystems (3)
Joanne Koong
maintainerv3 cover fuse: fix missing barriers in io-uring init
These are pre-existing issues Sashiko reported [1] on the fuse zerocopy series.
[1] https://sashiko.dev/#/patchset/20260630211436.2062816-1-joannelkoong%40gmail.com
Changelog
---------
v2: https://lore.kernel.org/fuse-devel/[email protected]/
* Add Bernd's reviewed-bys
* Move deletion of unnecessary smp_rmb() in fuse_get_req from 2nd patch to 1st patch (Bernd)
* Add READ_ONCE for uniformity per Bernd's preference
v1: https://lore.kernel.org/fuse-devel/[email protected]/
* Fix some other pre-existing issues Sashiko found in response to v1
* Add patch for using releasing/acquire for fch->initialized to make things
Joanne Koong (3):
fuse: fix missing barrier when checking io-uring readiness
fuse: use release/acquire for fch->initialized
fuse: publish io-uring queues with release semantics
fs/fuse/cuse.c | 3 ++- fs/fuse/dev.c | 17 +++++++++-------- fs/fuse/dev_uring.c | 24 ++++++++++++++---------- 3 files changed, 25 insertions(+), 19 deletions(-)
Signature · 1 line
2.52.0
Joanne Koong
maintainerPATCH v3 1/3 fuse: fix missing barrier when checking io-uring readiness
fuse_block_alloc() reads fch->initialized and then fch->io_uring. fch->io_uring is set before fch->initialized, ordered by the smp_wmb() in fuse_chan_set_intialized(), but fuse_block_alloc() has no matching read barrier between the two loads.
This may lead a CPU to observe fch->initialized=1 but fch->io_uring=0, and skip the check that blocks request allocation until the io-uring queues are ready. This can reintroduce the lock-order inversion deadlock that commit 3393ff964e0f prevents.
Add an smp_rmb() barrier to pair with the smp_wmb() in fuse_chan_set_initialized() to prevent this.
--- fs/fuse/dev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/fuse/dev.c +7 -4
@@ -85,7 +85,13 @@ void fuse_chan_set_initialized(struct fuse_chan *fch, struct fuse_chan_param *pastatic bool fuse_block_alloc (struct fuse_chan *fch,bool for_background) { -return !fch->initialized || (for_background && fch->blocked) || +if (!fch->initialized) +return true; + +/* Pairs with smp_wmb() in fuse_chan_set_initialized() */ +smp_rmb (); + +return (for_background && fch->blocked) || (fch->io_uring && fch->connected && !fuse_uring_ready (fch)); }
@@ -120,9 +126,6 @@ static struct fuse_req *fuse_get_req(struct fuse_chan *fch, bool for_background) goto out; } -/* Matches smp_wmb() in fuse_chan_set_initialized() */ -smp_rmb (); - err = -ENOTCONN ;if (!fch->connected) goto out;
Signature · 1 line
2.52.0
Joanne Koong
maintainerPATCH v3 2/3 fuse: use release/acquire for fch->initialized
In reply to Joanne Koongfuse_chan_set_initialized() sets values for the connection state and then sets fch->initialized to true, but lockless readers read fch->initialized and if true, go to read the connection state values, without using any barriers.
There are a few instances where this happens (fuse_uring_cmd() before dispatching register / commit-and-fetch cmds, fuse_dev_do_wriite() for handling notify retrieves, etc).
To make this as simple as possible, use release/acquire semantics for writing/reading fch->initialized. Add the missing read barriers. This is not marked for stable as these are not realistically reachable on a well-behaved server, and buggy/malicious servers who trigger this path fail benignly rather than crash or deadlock the kernel.
--- fs/fuse/cuse.c | 3 ++- fs/fuse/dev.c | 14 ++++++-------- fs/fuse/dev_uring.c | 4 +++- 3 files changed, 11 insertions(+), 10 deletions(-)
fs/fuse/cuse.c +2 -1
@@ -530,7 +530,8 @@ static int cuse_channel_open(struct inode *inode, struct file *file)INIT_LIST_HEAD (&cc->list); - cc->fc.chan->initialized =1 ; +/* Pairs with smp_load_acquire() readers of fch->initialized */ +smp_store_release (&cc->fc.chan->initialized,1 ); rc =cuse_send_init (cc);if (rc) {fuse_dev_put (fud);
fs/fuse/dev.c +6 -8
@@ -77,20 +77,17 @@ void fuse_chan_set_initialized(struct fuse_chan *fch, struct fuse_chan_param *pa fch->max_pages = param->max_pages; } -/* Make sure stores before this are seen on another CPU */ -smp_wmb (); - fch->initialized =1 ; +/* Pairs with smp_load_acquire() readers of fch->initialized */ +smp_store_release (&fch->initialized,1 );wake_up_all (&fch->blocked_waitq); }static bool fuse_block_alloc (struct fuse_chan *fch,bool for_background) { -if (!fch->initialized) +/* Pairs with smp_store_release() in fuse_chan_set_initialized() */ +if (!smp_load_acquire (&fch->initialized))return true; -/* Pairs with smp_wmb() in fuse_chan_set_initialized() */ -smp_rmb (); -return (for_background && fch->blocked) || (fch->io_uring && fch->connected && !fuse_uring_ready (fch)); }
@@ -1891,7 +1888,8 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,* initialized and connected state */ err = -EINVAL ; -if (!fch->initialized || !fch->connected) +/* Pairs with smp_store_release() in fuse_chan_set_initialized() */ +if (!smp_load_acquire (&fch->initialized) || !fch->connected) goto copy_finish;/* Don't try to move folios (yet) */
fs/fuse/dev_uring.c +3 -1
@@ -1251,8 +1251,10 @@ int fuse_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)/* * fuse_uring_register() needs the ring to be initialized, * we need to know the max payload size +* +* Pairs with smp_store_release() in fuse_chan_set_initialized() */ -if (!fch->initialized) +if (!smp_load_acquire (&fch->initialized))return -EAGAIN ;switch (cmd_op) {
Signature · 1 line
2.52.0
Joanne Koong
maintainerPATCH v3 3/3 fuse: publish io-uring queues with release semantics
In reply to Joanne Koongfuse_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
@@ -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;
Signature · 1 line
2.52.0
Quoted 3 lines · Joanne Koong
These are pre-existing issues Sashiko reported [1] on the fuse zerocopy series.
Applied, thanks.
Miklos