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 D149E26B08F for ; Thu, 30 Apr 2026 08:24:51 +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=1777537491; cv=none; b=jMcJrXbWV4P8LkX3Gq3FEGPOyCRR+AzHXYBLbikEdQRSz7SbZxNYXzyo4z4SU+q9BPgxD4skUllzu4Z01+0bILRarrZASN7DmZEvVvw9FyggDoQrYBuPFoVxrWo/pnsn1fWjMJSHuM9heP0Xl4/Zk0xHqdtEbzLVOu9tUkXcGTA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777537491; c=relaxed/simple; bh=HKyOaXEP5Ybpb7qPtcrKAJO+alU3NY+TdXhLorbbAco=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=blXMWOVtzVnlds3a13pO+1MdVN7/hXrl3gyLBnx4PA/bXWpKCGci174aJntmLpu7K+PZyxkjVdZYeckHc0bz2LumQXqJS5ysnFCRiJLW7u98Ohgrc9GXOnhsbrzG+fHskM6gebNXYtW7ln06L5Z+4nig2ONEMZKzUXK1cxNJnaU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XoX6tcmv; 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="XoX6tcmv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27798C2BCB4; Thu, 30 Apr 2026 08:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777537491; bh=HKyOaXEP5Ybpb7qPtcrKAJO+alU3NY+TdXhLorbbAco=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=XoX6tcmv6FuCruNfJ3Sve0FOs04+H5NzmgWbghNZiAulddAG+Wxwwpzr+GeAibHfy awRBELTmDeDe64gF1JYLNMwjHjD03/DCZEo3zUfCaCdtzU0xiyu58wcBT0dysOBDvr kxV2J2P/rzL2drHKEB0ESGUDoe2JBKFfPKdT7oVP9aWAHi0DgOlx+IJsb+v5BxyErZ 22J7N9AEJQCr3qsyj/MubcJfyfaqUJhQ32jiBLow7BqsmVmS3zfbkRu4L197nACsyt fjgJ7Ea7mBdr+Y8+tq4jS0e7Zeylzb9sVZQRTrHbR8rsaNY8VDfx2eqnfAMcgViVWx pQx2QTPlHv/tA== Message-ID: <4c6d2c7000bdb847da58ef0dd77b83d52c1bf761.camel@kernel.org> Subject: Re: [PATCH v2 09/14] fuse: rearrange io-uring iovec and ent allocation logic From: Jeff Layton To: Joanne Koong , miklos@szeredi.hu Cc: bernd@bsbernd.com, axboe@kernel.dk, linux-fsdevel@vger.kernel.org Date: Thu, 30 Apr 2026 09:24:48 +0100 In-Reply-To: <20260402162840.2989717-10-joannelkoong@gmail.com> References: <20260402162840.2989717-1-joannelkoong@gmail.com> <20260402162840.2989717-10-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: > Move fuse_uring_get_iovec_from_sqe() to earlier in the file and > move the allocation logic in fuse_uring_create_ring_ent() to the > beginning of the function. >=20 > There is no change in logic, this is done to make the subsequent commit > that adds buffer rings easier to review. >=20 > Signed-off-by: Joanne Koong > --- > fs/fuse/dev_uring.c | 78 ++++++++++++++++++++++++--------------------- > 1 file changed, 41 insertions(+), 37 deletions(-) >=20 > diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c > index cce8994241b7..a061f175b3fd 100644 > --- a/fs/fuse/dev_uring.c > +++ b/fs/fuse/dev_uring.c > @@ -277,6 +277,32 @@ static struct fuse_ring *fuse_uring_create(struct fu= se_conn *fc) > return res; > } > =20 > +/* > + * sqe->addr is a ptr to an iovec array, iov[FUSE_URING_IOV_HEADERS] has= the > + * headers, iov[FUSE_URING_IOV_PAYLOAD] the payload > + */ > +static int fuse_uring_get_iovec_from_sqe(const struct io_uring_sqe *sqe, > + struct iovec iov[FUSE_URING_IOV_SEGS]) > +{ > + struct iovec __user *uiov =3D u64_to_user_ptr(READ_ONCE(sqe->addr)); > + struct iov_iter iter; > + ssize_t ret; > + > + if (sqe->len !=3D FUSE_URING_IOV_SEGS) > + return -EINVAL; > + > + /* > + * Direction for buffer access will actually be READ and WRITE, > + * using write for the import should include READ access as well. > + */ > + ret =3D import_iovec(WRITE, uiov, FUSE_URING_IOV_SEGS, > + FUSE_URING_IOV_SEGS, &iov, &iter); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > static struct fuse_ring_queue *fuse_uring_create_queue(struct fuse_ring = *ring, > int qid) > { > @@ -1076,32 +1102,6 @@ static void fuse_uring_do_register(struct fuse_rin= g_ent *ent, > } > } > =20 > -/* > - * sqe->addr is a ptr to an iovec array, iov[FUSE_URING_IOV_HEADERS] has= the > - * headers, iov[FUSE_URING_IOV_PAYLOAD] the payload > - */ > -static int fuse_uring_get_iovec_from_sqe(const struct io_uring_sqe *sqe, > - struct iovec iov[FUSE_URING_IOV_SEGS]) > -{ > - struct iovec __user *uiov =3D u64_to_user_ptr(READ_ONCE(sqe->addr)); > - struct iov_iter iter; > - ssize_t ret; > - > - if (sqe->len !=3D FUSE_URING_IOV_SEGS) > - return -EINVAL; > - > - /* > - * Direction for buffer access will actually be READ and WRITE, > - * using write for the import should include READ access as well. > - */ > - ret =3D import_iovec(WRITE, uiov, FUSE_URING_IOV_SEGS, > - FUSE_URING_IOV_SEGS, &iov, &iter); > - if (ret < 0) > - return ret; > - > - return 0; > -} > - > static struct fuse_ring_ent * > fuse_uring_create_ring_ent(struct io_uring_cmd *cmd, > struct fuse_ring_queue *queue) > @@ -1112,40 +1112,44 @@ fuse_uring_create_ring_ent(struct io_uring_cmd *c= md, > struct iovec *headers, *payload; > int err; > =20 > + ent =3D kzalloc_obj(*ent, GFP_KERNEL_ACCOUNT); > + if (!ent) > + return ERR_PTR(-ENOMEM); > + > + INIT_LIST_HEAD(&ent->list); > + > + ent->queue =3D queue; > + > err =3D fuse_uring_get_iovec_from_sqe(cmd->sqe, iov); > if (err) { > pr_info_ratelimited("Failed to get iovec from sqe, err=3D%d\n", > err); > - return ERR_PTR(err); > + goto error; > } > =20 > err =3D -EINVAL; > headers =3D &iov[FUSE_URING_IOV_HEADERS]; > if (headers->iov_len < sizeof(struct fuse_uring_req_header)) { > pr_info_ratelimited("Invalid header len %zu\n", headers->iov_len); > - return ERR_PTR(err); > + goto error; > } > =20 > payload =3D &iov[FUSE_URING_IOV_PAYLOAD]; > if (payload->iov_len < ring->max_payload_sz) { > pr_info_ratelimited("Invalid req payload len %zu\n", > payload->iov_len); > - return ERR_PTR(err); > + goto error; > } > =20 > - err =3D -ENOMEM; > - ent =3D kzalloc_obj(*ent, GFP_KERNEL_ACCOUNT); > - if (!ent) > - return ERR_PTR(err); > - > - INIT_LIST_HEAD(&ent->list); > - > - ent->queue =3D queue; > ent->headers =3D headers->iov_base; > ent->payload =3D payload->iov_base; > =20 > atomic_inc(&ring->queue_refs); > return ent; > + > +error: > + kfree(ent); > + return ERR_PTR(err); > } > =20 > /* Reviewed-by: Jeff Layton