From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36F4D37CD30 for ; Wed, 29 Apr 2026 11:52:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777463563; cv=none; b=PIU+X+KZf/dSVHsrve4UkFjnjIDWVtC3zME5UVpHouEkxm6FG5sO4Du+Th7nBVWfcSAjZpOpsSpMZMDhFmD5eN3AdXfZ2UCK6JwNCXv3WioTfSLz8lKpMJ/L8D5TkK1B80gBgXiRjPOVUZE0fBMdqt6HGus548E7oZNN1Go47yM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777463563; c=relaxed/simple; bh=wVkhVrfvM9E/BUt7Vn33EFYqrgZoPkyecU+8+z6L2/c=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=VEjeokluf4E0lJsBQVvqpgb0Xc+IxVKMF8Sk1ec7XsTb0bwdb91r2OZF8VVru1OzcwyOxW1ttVmKSxAcCZUpgCMtZIIW/MmByJ31OEPXeKShjliZlMlkKY7pZlXff1RJFOVc4TNC/YvKVvy4iGPsh07528fyQ8/KtvcUOk6j4cQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cuVaetLZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cuVaetLZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B50FC19425; Wed, 29 Apr 2026 11:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777463562; bh=wVkhVrfvM9E/BUt7Vn33EFYqrgZoPkyecU+8+z6L2/c=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=cuVaetLZqHGmPgtk8Vl4qkxcOg23HVANjuvKEzgGa/xWqsxD+4/naKI8Sfrhjq9kL nq4cGBnD0zSoddJ0Gh8znXc+oiVIR91u4HOXfn8pOheW9jJAmZgJNatsR6MRLsNqSB JqfwOzuiQ+4MSUk7SRMwQ/gpXK3F/YUTcFyT2E0by3v5tk6ClQJUvM6B9f875zkMHJ cJZbm2dUCjcYXo89tSm9/voT8piOImKs+Jcs6oKO/6GU3kjXNdbSipkxEcovkw+jin QodOp06fSrWMdzkWvx+fghikM/sbvC758Z/WBAJyp4GeUorMt7pCg3sppwhBe8u/p9 lmRIxZOUjdu/g== Message-ID: <3ae57112d7ea646e955a33a2466b94a2b6d7c8ef.camel@kernel.org> Subject: Re: [PATCH v2 01/14] fuse: separate next request fetching from sending logic From: Jeff Layton To: Joanne Koong , miklos@szeredi.hu Cc: bernd@bsbernd.com, axboe@kernel.dk, linux-fsdevel@vger.kernel.org, Bernd Schubert Date: Wed, 29 Apr 2026 12:52:39 +0100 In-Reply-To: <20260402162840.2989717-2-joannelkoong@gmail.com> References: <20260402162840.2989717-1-joannelkoong@gmail.com> <20260402162840.2989717-2-joannelkoong@gmail.com> Autocrypt: addr=jlayton@kernel.org; prefer-encrypt=mutual; keydata=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 QZIQXVeAA+smfTT0tDrisj1U5x6ZB9b3nBg65kc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.3 (3.58.3-1.fc43) Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Thu, 2026-04-02 at 09:28 -0700, Joanne Koong wrote: > Simplify the logic for fetching + sending off the next request. >=20 > This gets rid of fuse_uring_send_next_to_ring() which contained > duplicated logic from fuse_uring_send(). This decouples request fetching > from the send operation, which makes the control flow clearer and > reduces unnecessary parameter passing. >=20 > Signed-off-by: Joanne Koong > Reviewed-by: Bernd Schubert > --- > fs/fuse/dev_uring.c | 78 ++++++++++++++++----------------------------- > 1 file changed, 28 insertions(+), 50 deletions(-) >=20 > diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c > index 3a38b61aac26..54436d3fda4d 100644 > --- a/fs/fuse/dev_uring.c > +++ b/fs/fuse/dev_uring.c > @@ -714,34 +714,6 @@ static int fuse_uring_prepare_send(struct fuse_ring_= ent *ent, > return err; > } > =20 > -/* > - * Write data to the ring buffer and send the request to userspace, > - * userspace will read it > - * This is comparable with classical read(/dev/fuse) > - */ > -static int fuse_uring_send_next_to_ring(struct fuse_ring_ent *ent, > - struct fuse_req *req, > - unsigned int issue_flags) > -{ > - struct fuse_ring_queue *queue =3D ent->queue; > - int err; > - struct io_uring_cmd *cmd; > - > - err =3D fuse_uring_prepare_send(ent, req); > - if (err) > - return err; > - > - spin_lock(&queue->lock); > - cmd =3D ent->cmd; > - ent->cmd =3D NULL; > - ent->state =3D FRRS_USERSPACE; > - list_move_tail(&ent->list, &queue->ent_in_userspace); > - spin_unlock(&queue->lock); > - > - io_uring_cmd_done(cmd, 0, issue_flags); > - return 0; > -} > - > /* > * Make a ring entry available for fuse_req assignment > */ > @@ -838,11 +810,13 @@ static void fuse_uring_commit(struct fuse_ring_ent = *ent, struct fuse_req *req, > } > =20 > /* > - * Get the next fuse req and send it > + * Get the next fuse req. > + * > + * Returns true if the next fuse request has been assigned to the ent. > + * Else, there is no next fuse request and this returns false. > */ > -static void fuse_uring_next_fuse_req(struct fuse_ring_ent *ent, > - struct fuse_ring_queue *queue, > - unsigned int issue_flags) > +static bool fuse_uring_get_next_fuse_req(struct fuse_ring_ent *ent, > + struct fuse_ring_queue *queue) > { > int err; > struct fuse_req *req; > @@ -854,10 +828,12 @@ static void fuse_uring_next_fuse_req(struct fuse_ri= ng_ent *ent, > spin_unlock(&queue->lock); > =20 > if (req) { > - err =3D fuse_uring_send_next_to_ring(ent, req, issue_flags); > + err =3D fuse_uring_prepare_send(ent, req); > if (err) > goto retry; > } > + > + return req !=3D NULL; > } > =20 > static int fuse_ring_ent_set_commit(struct fuse_ring_ent *ent) > @@ -875,6 +851,20 @@ static int fuse_ring_ent_set_commit(struct fuse_ring= _ent *ent) > return 0; > } > =20 > +static void fuse_uring_send(struct fuse_ring_ent *ent, struct io_uring_c= md *cmd, > + ssize_t ret, unsigned int issue_flags) > +{ > + struct fuse_ring_queue *queue =3D ent->queue; > + > + spin_lock(&queue->lock); > + ent->state =3D FRRS_USERSPACE; > + list_move_tail(&ent->list, &queue->ent_in_userspace); > + ent->cmd =3D NULL; > + spin_unlock(&queue->lock); > + > + io_uring_cmd_done(cmd, ret, issue_flags); > +} > + > /* FUSE_URING_CMD_COMMIT_AND_FETCH handler */ > static int fuse_uring_commit_fetch(struct io_uring_cmd *cmd, int issue_f= lags, > struct fuse_conn *fc) > @@ -947,7 +937,8 @@ static int fuse_uring_commit_fetch(struct io_uring_cm= d *cmd, int issue_flags, > * and fetching is done in one step vs legacy fuse, which has separated > * read (fetch request) and write (commit result). > */ > - fuse_uring_next_fuse_req(ent, queue, issue_flags); > + if (fuse_uring_get_next_fuse_req(ent, queue)) > + fuse_uring_send(ent, cmd, 0, issue_flags); > return 0; > } > =20 > @@ -1196,20 +1187,6 @@ int fuse_uring_cmd(struct io_uring_cmd *cmd, unsig= ned int issue_flags) > return -EIOCBQUEUED; > } > =20 > -static void fuse_uring_send(struct fuse_ring_ent *ent, struct io_uring_c= md *cmd, > - ssize_t ret, unsigned int issue_flags) > -{ > - struct fuse_ring_queue *queue =3D ent->queue; > - > - spin_lock(&queue->lock); > - ent->state =3D FRRS_USERSPACE; > - list_move_tail(&ent->list, &queue->ent_in_userspace); > - ent->cmd =3D NULL; > - spin_unlock(&queue->lock); > - > - io_uring_cmd_done(cmd, ret, issue_flags); > -} > - > /* > * This prepares and sends the ring request in fuse-uring task context. > * User buffers are not mapped yet - the application does not have permi= ssion > @@ -1226,8 +1203,9 @@ static void fuse_uring_send_in_task(struct io_tw_re= q tw_req, io_tw_token_t tw) > if (!tw.cancel) { > err =3D fuse_uring_prepare_send(ent, ent->fuse_req); > if (err) { > - fuse_uring_next_fuse_req(ent, queue, issue_flags); > - return; > + if (!fuse_uring_get_next_fuse_req(ent, queue)) > + return; > + err =3D 0; > } > } else { > err =3D -ECANCELED; Reviewed-by: Jeff Layton