From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F15AC83F09 for ; Tue, 8 Jul 2025 16:06:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B320E6B009D; Tue, 8 Jul 2025 12:06:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0B5B6B009E; Tue, 8 Jul 2025 12:06:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D1D56B009F; Tue, 8 Jul 2025 12:06:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8C6EB6B009D for ; Tue, 8 Jul 2025 12:06:46 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5992D1406A2 for ; Tue, 8 Jul 2025 16:06:46 +0000 (UTC) X-FDA: 83641575612.14.1170DA2 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf23.hostedemail.com (Postfix) with ESMTP id B718C140015 for ; Tue, 8 Jul 2025 16:06:44 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="gO/7VjG5"; spf=pass (imf23.hostedemail.com: domain of snitzer@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=snitzer@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751990804; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lxW/wNgvhd+XGqOcjXdv2++DtYgLiym0RqhPIkFaY/o=; b=X+OXRABjE5fWk0SZuytIM57oEutV6X935IIje2oIFfHidby+PxYCPjN9EeDJDpRzVikDzS voeX9e0ojpak4dP2Fe1H4V7Bm4KX4ie2kbv07AgcHBgUAdrht72pOtbIFYN+umTlYJAnDJ 2wlQThtlfMUf+4WHSNaG7ZqHIjGF0r8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="gO/7VjG5"; spf=pass (imf23.hostedemail.com: domain of snitzer@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=snitzer@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751990804; a=rsa-sha256; cv=none; b=Mv1FBpIq4AvoWfLbs7JXhNma/+5iGi7wLZE9qjj4HPCZDVxkWabj9qx98R/GBcCT28qVjL 8Tj3UKJQZirL+HZ/UqU3QE5uN9MUk9abnYDERsxI39VM+xdtAf3UBufn+hZ6xyN7jWNmFk JeyCi403zXk5EhArdcrU2mBkxCTFEKg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id E93A861132; Tue, 8 Jul 2025 16:06:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C658C4CEED; Tue, 8 Jul 2025 16:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751990803; bh=sMyEzMD4O9ALHGaJehLGpywc1k9TReL5l0+ffF4KNwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gO/7VjG53jV0Qc5dPFiyuGd94djNaS5UQEDKzjZOngqqbE1Rj+SAttAqG9W9i1o1p OQjgbTCQPqnyq49zQnrG3hLZ73Onrb8EP4P1IKAH2HyektXYv3tbgu/O1YJrCjpzkT 8DGOuUr6JrETHpXna8go3vjXkfMdsKMV0d/TlmTebXzk0JBVkB3rl/bpYKnH6Jm3M5 F3q3OR3rCt4OmGExM3qS7hrQNWU6Be9f/sdU59HKr2wUaTIn3ZCLwrkih0j5fbYRrC F+imdJ1PXmmuUppMzwZMWG9yVmaXoKmMcXGfz4YWFdCH+ogOvgtgi01DigQm6NUGQT Ele31KaMXZY4w== From: Mike Snitzer To: Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linus-fsdevel@vger.kernel.org, linux-mm@kvack.org, snitzer@kernel.org Subject: [RFC PATCH v2 5/8] NFSD: pass nfsd_file to nfsd_iter_read() Date: Tue, 8 Jul 2025 12:06:16 -0400 Message-ID: <20250708160619.64800-6-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250708160619.64800-1-snitzer@kernel.org> References: <20250708160619.64800-1-snitzer@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: sr9fzaohnfgcokh5kaufmze6xi3teat3 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: B718C140015 X-HE-Tag: 1751990804-863915 X-HE-Meta: U2FsdGVkX1+6vxrY4Fc4LcgPh62KaKii9hLX7Ih5suSyJZD/dggeDiSCjzYmwaqwhHUl37B+vve7Jw2mBTaI5pd4pSeCKWlqHWaHKXuCaMpMsM4s3eh7qAX6JMqL40Ix7bXdehRAnQc5jhprnM/vXKULOYAL6f0QJLVXG1UFoRoGkMpLy9FDVTyme51u15vLTOSekmvFYE4LV8WSJWv9kVG1mIWy/7qpePaDcAt1zdhviaPJ7hD01qT53LEzzdemOSQNLmgk4t0ZFw/PvkrrmS2HYDa3oFG03M0PB/rFwFIfffL1XueNh54n5bDodg4wDPqTf5YzFZD54hA4IxLTESLGi1KljsQgJPmsxkABG6Ibjdy4S18VrY7S6lniPimb54xUBgz+nspDID/BmUfe/SS05LFmCpu783Ogy5+uZqPDKpwotD8EbZbJB3u7mnqYyHPTgfcUdScseUXXisvTK7bcYCBJw2CqhaaySi1KUP7eqYLeuA3bLUzaVl9r1POVw1pwjdXDq6/rJZNT/v79c9dzNwKDCyuepaAqDsVjE1jreHJz2aQmQQQh8F3mZQfmHRByZGfxrSCWta9/VN2ben2UD7gGpTHD0TZHVgOdHJ2TdBBB/BlRCQ7nSQbYgjWW8dfI6aGvUXe+aqj7U93pnoBPWwDLTkXJPpMWnaxkRRbsFAYX9lDKqGMlnu4LNjoOdAzcq/cvvaSqO8WXFOjrCXZhZHdFlyU5x+UHNlycCeJLbkeOWQvGTXwFu4Gig5y2h+dvgwer0hJ7CSuob/dCp2XiAnq7v6Dq3F11VxlXr7hPnwD/TtgyyB+oS+nIrEOheXQOHJRGzOCB8hbpTNFd4FyKxqHby9e7LkZcIuN4Q6lTvsbl4p1q8SJFbFSJ66B5xFopu1mbwalJyo4eHGxpDUK9jC8B/LNf02Q985jZTgqVjzQ/P8668WJGo19LIYCNFzdJwkcGB6kUHAGokOL 2dkkU1Sk DNyxzK2n7SlG0Fo8j1ktBf5pO1O+nU1qjPGAwg5T+sgTH/NaYvMyolS/ePeaD5N/8qrG7M23343htCDfxU0L8yJd8dw9hu2YYQzRIzl4ZFUOn1ZPQvVskKlDiK3PnYRyU0ERmymcCNESxjTl3M4omGok7i2h6VSPOPFs/j5zXWdDQ+ccFXyycFbJ68O7Zl6P6np+MjRMiW1vMR1kiqJwDN2EOpk66XmdJFproAUJw7+QyS7rBhuOMMHVAxZoa3PlR1+dR6tZHNcfhH+8fYftx8haxqOpl0GIxZnV73AdufT7j93hGu9nMc8xEcdsxtNdRCLyG X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Prepares for nfsd_iter_read() to use DIO alignment stored in nfsd_file. Signed-off-by: Mike Snitzer --- fs/nfsd/nfs4xdr.c | 8 ++++---- fs/nfsd/vfs.c | 7 ++++--- fs/nfsd/vfs.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2ee218ff4958..4e29297c610a 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4476,7 +4476,7 @@ static __be32 nfsd4_encode_splice_read( static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, struct nfsd4_read *read, - struct file *file, unsigned long maxcount) + unsigned long maxcount) { struct xdr_stream *xdr = resp->xdr; unsigned int base = xdr->buf->page_len & ~PAGE_MASK; @@ -4487,7 +4487,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, if (xdr_reserve_space_vec(xdr, maxcount) < 0) return nfserr_resource; - nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, file, + nfserr = nfsd_iter_read(resp->rqstp, read->rd_fhp, read->rd_nf, read->rd_offset, &maxcount, base, &read->rd_eof); read->rd_length = maxcount; @@ -4534,7 +4534,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, if (file->f_op->splice_read && splice_ok) nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount); else - nfserr = nfsd4_encode_readv(resp, read, file, maxcount); + nfserr = nfsd4_encode_readv(resp, read, maxcount); if (nfserr) { xdr_truncate_encode(xdr, eof_offset); return nfserr; @@ -5430,7 +5430,7 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, if (file->f_op->splice_read && splice_ok) nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount); else - nfserr = nfsd4_encode_readv(resp, read, file, maxcount); + nfserr = nfsd4_encode_readv(resp, read, maxcount); if (nfserr) return nfserr; diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 2edf76feaeb9..845c212ad10b 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1067,7 +1067,7 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, * nfsd_iter_read - Perform a VFS read using an iterator * @rqstp: RPC transaction context * @fhp: file handle of file to be read - * @file: opened struct file of file to be read + * @nf: opened struct nfsd_file of file to be read * @offset: starting byte offset * @count: IN: requested number of bytes; OUT: number of bytes read * @base: offset in first page of read buffer @@ -1080,9 +1080,10 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, * returned. */ __be32 nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp, - struct file *file, loff_t offset, unsigned long *count, + struct nfsd_file *nf, loff_t offset, unsigned long *count, unsigned int base, u32 *eof) { + struct file *file = nf->nf_file; unsigned long v, total; struct iov_iter iter; struct kiocb kiocb; @@ -1304,7 +1305,7 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, if (file->f_op->splice_read && nfsd_read_splice_ok(rqstp)) err = nfsd_splice_read(rqstp, fhp, file, offset, count, eof); else - err = nfsd_iter_read(rqstp, fhp, file, offset, count, 0, eof); + err = nfsd_iter_read(rqstp, fhp, nf, offset, count, 0, eof); nfsd_file_put(nf); trace_nfsd_read_done(rqstp, fhp, offset, *count); diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h index 0c0292611c6d..fa46f8b5f132 100644 --- a/fs/nfsd/vfs.h +++ b/fs/nfsd/vfs.h @@ -121,7 +121,7 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, unsigned long *count, u32 *eof); __be32 nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp, - struct file *file, loff_t offset, + struct nfsd_file *nf, loff_t offset, unsigned long *count, unsigned int base, u32 *eof); bool nfsd_read_splice_ok(struct svc_rqst *rqstp); -- 2.44.0