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 619B622AE5D for ; Thu, 24 Jul 2025 19:31:18 +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=1753385478; cv=none; b=bViOZi9vwtGjIrMi6Shm2x8jAiklYx1WcslUy+V7DeGa3uNV6XMMxZZE5hBpCGpy2wgvAgOeluacQjAuLZ1TZZpUzYjk4dDEq28mND4FtQK+1TIMpuGvrorTLXJrJxG80VcsFQU4AHWOpJ+UoA2MtAo3se49bAKkIl8iYbRuSEg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753385478; c=relaxed/simple; bh=tIdqmUN9Rm9L6IvdFcbQYC2GuIRpAW7caDRV6uhpJE0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YZlrWpEXxDHvg5PNRslk/fyJGCZNTWGdcsnWxU2aqS2ay+W2Wv0EGE0Ky412ObfBPvgt4DafXYiOtklYGc09CBlU90ZTXGepnofDX3J7O21RXCSELKRSICdOhlvX//wquDUDGBX0qOeQpmQnmL9dwsivLe65j6Mc+VsryButH80= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YMrPQYMC; 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="YMrPQYMC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0619C4CEED; Thu, 24 Jul 2025 19:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753385477; bh=tIdqmUN9Rm9L6IvdFcbQYC2GuIRpAW7caDRV6uhpJE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YMrPQYMCJh7Vy7rjI1Q3r2dPOTN0zrqJgrpOROROq43HB0mjs81PBooDpS1piep80 cGCnUQa4okM+FTzZE3CZgQBzX5RCgRq8SpHamzGpeMVE7RfxfiAWsv5uYS+cpn08wy veEKr7KzjNo3Ki36auZUESxeBvDluZuzKFSry/9j10h0BIbzhgHQILZFLbsFe2uN0A nteioxsATA/m6r+4044p544MYeuhV8AdG0hV/rmOgM3Vz5laH6AGW8x92MIdbQ5NfU ejcrHypW2iW0IKVOYQBzzCeqWyRvgI7MF4WN+g9y1HGsz0fEB4uhJowLrUwAbFNM+9 EJgzR//HT/SdA== From: Mike Snitzer To: Chuck Lever , Jeff Layton , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 10/13] nfs/localio: refactor iocb initialization Date: Thu, 24 Jul 2025 15:30:59 -0400 Message-ID: <20250724193102.65111-11-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250724193102.65111-1-snitzer@kernel.org> References: <20250724193102.65111-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 0c48db38f74f..9ce242454c66 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