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 BCA8A192D83 for ; Sat, 9 Aug 2025 05:03:07 +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=1754715787; cv=none; b=QPDan9MDZclCxOsJJNHFVXRxrMwKRffrDMS3WuXbguXBC5JehocLF2ESeZEHoLXaIZrn0gFqYa9p/0FPxlIepOMljCOMJ4OINwMVP5V5pEIm2ifN4pbPycUjvz1EMySq4NOY41YX/mIQz0fAjzqOWTn386EoK0IFhXJPZKRAlm0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754715787; c=relaxed/simple; bh=DY0ZeGv/8xIFYIFs5TLOrjCcSK5sdNUgr2yKmKqqtQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QezVbLq6Cqtc/k4VSOdqegAXxHYIJmlx7pvNmEI9INTswzbO5RdMCjjvZEsPB0U6E3tpc3kF/7nQ6zT3pon+eUr9TamLyrYUl4jUiuP88O05k9CT0CbvzDJNnW2qQhU/LNwwA/kncVng4cbJ7Al1d7d0JtISX0TFqRw+cyYV7x4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ISRefzAH; 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="ISRefzAH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E86BC4CEE7; Sat, 9 Aug 2025 05:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754715787; bh=DY0ZeGv/8xIFYIFs5TLOrjCcSK5sdNUgr2yKmKqqtQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ISRefzAHrCz3A8wr/ASCFiTHZ9dAjjMBEAadAzhr84jDYsD/mspRH1oC3EPSVlgX0 /BOZi0CTTatoITQ/8toBR8Lj0QQLLAuS/SF4HR/PlXdPebtwqS0wxYvDPUiacORXa+ vdhDKMZ7aM8+uPWdWst0pzpaRJS74I5Zi0CZIlXwi988gX5O8GGeUdO2pKwrgzW7Mu 72fM3RlwhTm9LTXDRZqtPgreCe0E8f4S+001ZTicT8fzNpnCGiz7dM/xJypABQz4Jf yPBXpfw3xDcLI9p3kv0hZzVOd896l9nxVIwtg3uNHMwsbwaaXNu8ky4w40OYtMgDx0 soaLtImW6hpXA== From: Mike Snitzer To: Chuck Lever , Jeff Layton Cc: linux-nfs@vger.kernel.org Subject: [PATCH v6 6/7] NFSD: issue WRITEs using O_DIRECT even if IO is misaligned Date: Sat, 9 Aug 2025 01:02:56 -0400 Message-ID: <20250809050257.27355-7-snitzer@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250809050257.27355-1-snitzer@kernel.org> References: <20250809050257.27355-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 If NFSD_IO_DIRECT is used, split any misaligned WRITE into a start, middle and end as needed. The large middle extent is DIO-aligned and the start and/or end are misaligned. Buffered IO is used for the misaligned extents and O_DIRECT is used for the middle DIO-aligned extent. Signed-off-by: Mike Snitzer --- fs/nfsd/vfs.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 163 insertions(+), 8 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index eaffa67d09bf0..a11c59dcb537b 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1318,6 +1318,164 @@ static int wait_for_concurrent_writes(struct file *file) return err; } +struct nfsd_write_dio { + loff_t middle_offset; /* Offset for start of DIO-aligned middle */ + loff_t end_offset; /* Offset for start of DIO-aligned end */ + ssize_t start_len; /* Length for misaligned first extent */ + ssize_t middle_len; /* Length for DIO-aligned middle extent */ + ssize_t end_len; /* Length for misaligned last extent */ +}; + +static bool +nfsd_analyze_write_dio(struct svc_rqst *rqstp, struct svc_fh *fhp, + struct nfsd_file *nf, loff_t offset, + unsigned long len, struct nfsd_write_dio *write_dio) +{ + const u32 dio_blocksize = nf->nf_dio_offset_align; + loff_t orig_end, middle_end, start_end, start_offset = offset; + ssize_t start_len = len; + + if (WARN_ONCE(!nf->nf_dio_mem_align || !dio_blocksize, + "%s: underlying filesystem has not provided DIO alignment info\n", + __func__)) + return false; + if (WARN_ONCE(dio_blocksize > PAGE_SIZE, + "%s: underlying storage's dio_blocksize=%u > PAGE_SIZE=%lu\n", + __func__, dio_blocksize, PAGE_SIZE)) + return false; + if (unlikely(len < dio_blocksize)) + return false; + + memset(write_dio, 0, sizeof(*write_dio)); + + if (((offset | len) & (dio_blocksize-1)) == 0) { + /* already DIO-aligned, no misaligned head or tail */ + write_dio->middle_offset = offset; + write_dio->middle_len = len; + /* clear these for the benefit of trace_nfsd_analyze_write_dio */ + start_offset = 0; + start_len = 0; + return true; + } + + start_end = round_up(offset, dio_blocksize); + start_len = start_end - offset; + orig_end = offset + len; + middle_end = round_down(orig_end, dio_blocksize); + + write_dio->start_len = start_len; + write_dio->middle_offset = start_end; + write_dio->middle_len = middle_end - start_end; + write_dio->end_offset = middle_end; + write_dio->end_len = orig_end - middle_end; + + return true; +} + +/* + * Setup as many as 3 iov_iter based on extents described by @write_dio. + * @iterp: pointer to pointer to onstack array of 3 iov_iter structs from caller. + * @iter_is_dio_aligned: pointer to onstack array of 3 bools from caller. + * @rq_bvec: backing bio_vec used to setup all 3 iov_iter permutations. + * @nvecs: number of segments in @rq_bvec + * @cnt: size of the request in bytes + * @write_dio: nfsd_write_dio struct that describes start, middle and end extents. + * + * Returns the number of iov_iter that were setup. + */ +static int +nfsd_setup_write_dio_iters(struct iov_iter **iterp, bool *iter_is_dio_aligned, + struct bio_vec *rq_bvec, unsigned int nvecs, + unsigned long cnt, struct nfsd_write_dio *write_dio) +{ + int n_iters = 0; + struct iov_iter *iters = *iterp; + + /* Setup misaligned start? */ + if (write_dio->start_len) { + iter_is_dio_aligned[n_iters] = false; + iov_iter_bvec(&iters[n_iters], ITER_SOURCE, rq_bvec, nvecs, cnt); + iters[n_iters].count = write_dio->start_len; + ++n_iters; + } + + /* Setup DIO-aligned middle */ + iter_is_dio_aligned[n_iters] = true; + iov_iter_bvec(&iters[n_iters], ITER_SOURCE, rq_bvec, nvecs, cnt); + if (write_dio->start_len) + iov_iter_advance(&iters[n_iters], write_dio->start_len); + iters[n_iters].count -= write_dio->end_len; + ++n_iters; + + /* Setup misaligned end? */ + if (write_dio->end_len) { + iter_is_dio_aligned[n_iters] = false; + iov_iter_bvec(&iters[n_iters], ITER_SOURCE, rq_bvec, nvecs, cnt); + iov_iter_advance(&iters[n_iters], + write_dio->start_len + write_dio->middle_len); + ++n_iters; + } + + return n_iters; +} + +static int +nfsd_issue_write_buffered(struct svc_rqst *rqstp, struct file *file, + unsigned int nvecs, unsigned long *cnt, + struct kiocb *kiocb) +{ + struct iov_iter iter; + int host_err; + + iov_iter_bvec(&iter, ITER_SOURCE, rqstp->rq_bvec, nvecs, *cnt); + host_err = vfs_iocb_iter_write(file, kiocb, &iter); + if (host_err < 0) + return host_err; + *cnt = host_err; + + return 0; +} + +static noinline int +nfsd_issue_write_dio(struct svc_rqst *rqstp, struct svc_fh *fhp, + struct nfsd_file *nf, loff_t offset, + unsigned int nvecs, unsigned long *cnt, + struct kiocb *kiocb) +{ + struct nfsd_write_dio write_dio; + struct file *file = nf->nf_file; + + if (!nfsd_analyze_write_dio(rqstp, fhp, nf, offset, + *cnt, &write_dio)) { + return nfsd_issue_write_buffered(rqstp, file, + nvecs, cnt, kiocb); + } else { + bool iter_is_dio_aligned[3]; + struct iov_iter iter_stack[3]; + struct iov_iter *iter = iter_stack; + unsigned int n_iters = 0; + int host_err; + + n_iters = nfsd_setup_write_dio_iters(&iter, + iter_is_dio_aligned, rqstp->rq_bvec, + nvecs, *cnt, &write_dio); + *cnt = 0; + for (int i = 0; i < n_iters; i++) { + if (iter_is_dio_aligned[i]) + kiocb->ki_flags |= IOCB_DIRECT; + else + kiocb->ki_flags &= ~IOCB_DIRECT; + host_err = vfs_iocb_iter_write(file, kiocb, + &iter[i]); + if (host_err < 0) + return host_err; + *cnt += host_err; + } + } + + return 0; +} + /** * nfsd_vfs_write - write data to an already-open file * @rqstp: RPC execution context @@ -1345,7 +1503,6 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct super_block *sb = file_inode(file)->i_sb; struct kiocb kiocb; struct svc_export *exp; - struct iov_iter iter; errseq_t since; __be32 nfserr; int host_err; @@ -1382,31 +1539,29 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, kiocb.ki_flags |= IOCB_DSYNC; nvecs = xdr_buf_to_bvec(rqstp->rq_bvec, rqstp->rq_maxpages, payload); - iov_iter_bvec(&iter, ITER_SOURCE, rqstp->rq_bvec, nvecs, *cnt); + since = READ_ONCE(file->f_wb_err); if (verf) nfsd_copy_write_verifier(verf, nn); switch (nfsd_io_cache_write) { case NFSD_IO_DIRECT: - /* direct I/O must be aligned to device logical sector size */ - if (nf->nf_dio_mem_align && nf->nf_dio_offset_align && - (((offset | *cnt) & (nf->nf_dio_offset_align-1)) == 0)) - kiocb.ki_flags |= IOCB_DIRECT; + host_err = nfsd_issue_write_dio(rqstp, fhp, nf, offset, + nvecs, cnt, &kiocb); break; case NFSD_IO_DONTCACHE: kiocb.ki_flags |= IOCB_DONTCACHE; fallthrough; case NFSD_IO_UNSPECIFIED: case NFSD_IO_BUFFERED: + host_err = nfsd_issue_write_buffered(rqstp, file, + nvecs, cnt, &kiocb); break; } - host_err = vfs_iocb_iter_write(file, &kiocb, &iter); if (host_err < 0) { commit_reset_write_verifier(nn, rqstp, host_err); goto out_nfserr; } - *cnt = host_err; nfsd_stats_io_write_add(nn, exp, *cnt); fsnotify_modify(file); host_err = filemap_check_wb_err(file->f_mapping, since); -- 2.44.0