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 965B21DB377 for ; Fri, 1 Aug 2025 17:10:56 +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=1754068256; cv=none; b=WhyHrGI7TRF9X9LPHDnyPIp9z2/EoH5TEvF7d2X3q3bjNydpKIus67i57cre0p+DbvA5YPNlSGuNuMbMcv5X8rfxrkrs2TOUZTf9ypC7YK2r2KtYZnRBlFt4/nwI4QXZirNit6h709bNpKAHx/s3KOywkHtrUR48RK2vD5hzlfY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754068256; c=relaxed/simple; bh=Cr87E4BrbH2X3hg9terMx5NqC7yoJAGx9mlnYqKJuA8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=horKnYlLR9tTgUZZgiaJrTZBnkYsoZJYPHwq+/W5QK20vQJMUlxxBBHcPHaojMt0YWnhcFmZWB4RiO9GtMt8uSuocGsdYX5hHdpANw6mPOishR1bMaEVsPYq6vgENSbayc4aHjiQ06x8wfPJAQFblG0ipVVS325R4uGWhcJZ+54= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ps/swZqi; 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="Ps/swZqi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02335C4CEF6; Fri, 1 Aug 2025 17:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754068256; bh=Cr87E4BrbH2X3hg9terMx5NqC7yoJAGx9mlnYqKJuA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ps/swZqiS+qmvqlsW8wGTRgekCzJkn5ii/pO+sm8I13/ZyKYCjZ75JGVODxx4OV0U hXWlJJU+4CRyEgovuy23gz1FOjmNQ8swbvi8S3kXQDcEeZ2tXvcesRJiVmpb90i1DC S5Dedhlvyqcky4LuYeHJyP3rE223wMt1mr5cbcvIM8r1fWOw2sV9qtfS83dPv3Q8nZ 3ogvihF3lV+U4BnYYtMQ+R745qJMibp87vMZOgLTfhn3RQ7qsPvOSsimw8gL1+nT5J 7lmaoTR6Fwjb6fiPgYE+0rphMmePPue0xxrv81mUeVtkURCW/otRqmzUPBRUOM82Y8 EXyosjD6S6eBA== From: Mike Snitzer To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v6 4/7] nfs/localio: refactor iocb initialization Date: Fri, 1 Aug 2025 13:10:46 -0400 Message-ID: <20250801171049.94235-5-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250801171049.94235-1-snitzer@kernel.org> References: <20250801171049.94235-1-snitzer@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mike Snitzer No functional change, but slighty cleaner. Signed-off-by: Mike Snitzer --- fs/nfs/localio.c | 56 ++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c index 0c48db38f74f0..9ce242454c665 100644 --- a/fs/nfs/localio.c +++ b/fs/nfs/localio.c @@ -282,23 +282,6 @@ nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred, } EXPORT_SYMBOL_GPL(nfs_local_open_fh); -static struct bio_vec * -nfs_bvec_alloc_and_import_pagevec(struct page **pagevec, - unsigned int npages, gfp_t flags) -{ - struct bio_vec *bvec, *p; - - bvec = kmalloc_array(npages, sizeof(*bvec), flags); - if (bvec != NULL) { - for (p = bvec; npages > 0; p++, pagevec++, npages--) { - p->bv_page = *pagevec; - p->bv_len = PAGE_SIZE; - p->bv_offset = 0; - } - } - return bvec; -} - static void nfs_local_iocb_free(struct nfs_local_kiocb *iocb) { @@ -315,8 +298,9 @@ nfs_local_iocb_alloc(struct nfs_pgio_header *hdr, iocb = kmalloc(sizeof(*iocb), flags); if (iocb == NULL) return NULL; - iocb->bvec = nfs_bvec_alloc_and_import_pagevec(hdr->page_array.pagevec, - hdr->page_array.npages, flags); + + iocb->bvec = kmalloc_array(hdr->page_array.npages, + sizeof(struct bio_vec), flags); if (iocb->bvec == NULL) { kfree(iocb); return NULL; @@ -339,8 +323,22 @@ static void nfs_local_iter_init(struct iov_iter *i, struct nfs_local_kiocb *iocb, int dir) { struct nfs_pgio_header *hdr = iocb->hdr; + struct page **pagevec = hdr->page_array.pagevec; + unsigned long v, total; + size_t len; - iov_iter_bvec(i, dir, iocb->bvec, hdr->page_array.npages, + v = 0; + total = hdr->args.count + hdr->args.pgbase; + while (total) { + len = min_t(size_t, total, PAGE_SIZE); + bvec_set_page(&iocb->bvec[v], *(pagevec++), + len, 0); + total -= len; + ++v; + } + WARN_ON_ONCE(v != hdr->page_array.npages); + + iov_iter_bvec(i, dir, iocb->bvec, v, hdr->args.count + hdr->args.pgbase); if (hdr->args.pgbase != 0) iov_iter_advance(i, hdr->args.pgbase); @@ -469,6 +467,10 @@ static void nfs_local_call_read(struct work_struct *work) save_cred = override_creds(filp->f_cred); nfs_local_iter_init(&iter, iocb, READ); + if (iocb->kiocb.ki_flags & IOCB_DIRECT) { + iocb->kiocb.ki_complete = nfs_local_read_aio_complete; + iocb->aio_complete_work = nfs_local_read_aio_complete_work; + } status = filp->f_op->read_iter(&iocb->kiocb, &iter); if (status != -EIOCBQUEUED) { @@ -502,11 +504,6 @@ nfs_do_local_read(struct nfs_pgio_header *hdr, nfs_local_pgio_init(hdr, call_ops); hdr->res.eof = false; - if (iocb->kiocb.ki_flags & IOCB_DIRECT) { - iocb->kiocb.ki_complete = nfs_local_read_aio_complete; - iocb->aio_complete_work = nfs_local_read_aio_complete_work; - } - INIT_WORK(&iocb->work, nfs_local_call_read); queue_work(nfslocaliod_workqueue, &iocb->work); @@ -663,6 +660,10 @@ static void nfs_local_call_write(struct work_struct *work) save_cred = override_creds(filp->f_cred); nfs_local_iter_init(&iter, iocb, WRITE); + if (iocb->kiocb.ki_flags & IOCB_DIRECT) { + iocb->kiocb.ki_complete = nfs_local_write_aio_complete; + iocb->aio_complete_work = nfs_local_write_aio_complete_work; + } file_start_write(filp); status = filp->f_op->write_iter(&iocb->kiocb, &iter); @@ -712,11 +713,6 @@ nfs_do_local_write(struct nfs_pgio_header *hdr, nfs_set_local_verifier(hdr->inode, hdr->res.verf, hdr->args.stable); - if (iocb->kiocb.ki_flags & IOCB_DIRECT) { - iocb->kiocb.ki_complete = nfs_local_write_aio_complete; - iocb->aio_complete_work = nfs_local_write_aio_complete_work; - } - INIT_WORK(&iocb->work, nfs_local_call_write); queue_work(nfslocaliod_workqueue, &iocb->work); -- 2.44.0