From: Trond Myklebust <[email protected]>
This set of patches represents an initial effort to convert the page
cache I/O in the NFS client to use native folio functionality. It should
allow the nfs_page structs and their helpers to carry folios (including
folios of order > 0) and to pass their data contents through to the RPC
layer.
Note that because O_DIRECT uses pages, we still need to support the
traditional page based I/O, and so the new struct nfs_page will carry
both types.
I did not touch the fscache code, but I expect that to be able to
continue to work with order 0 folios.
The plan is to merge this functionality with order 0 folios first, in
order to catch any regressions in existing functionality. Then we can
enable order n > 0 once we're happy about the stability (at least for
the non-fscache case).
At this point, the xfstests are all passing without any regressions on
my setup, so I'm throwing the patches over the fence to allow for wider
testing.
Please make sure, in particular to test pNFS if your server supports it.
I didn't have to make any changes to the pNFS code, and I don't expect
any trouble, but it would be good to have validation of that assumption.
Trond Myklebust (17):
NFS: Fix for xfstests generic/208
NFS: Add basic functionality for tracking folios in struct nfs_page
NFS: Support folios in nfs_generic_pgio()
NFS: Fix nfs_coalesce_size() to work with folios
NFS: Add a helper to convert a struct nfs_page into an inode
NFS: Convert the remaining pagelist helper functions to support folios
NFS: Add a helper nfs_wb_folio()
NFS: Convert buffered reads to use folios
NFS: Convert the function nfs_wb_page() to use folios
NFS: Convert buffered writes to use folios
NFS: Remove unused function nfs_wb_page()
NFS: Convert nfs_write_begin/end to use folios
NFS: Fix up nfs_vm_page_mkwrite() for folios
NFS: Clean up O_DIRECT request allocation
NFS: fix up nfs_release_folio() to try to release the page
NFS: Enable tracing of nfs_invalidate_folio() and nfs_launder_folio()
NFS: Improve tracing of nfs_wb_folio()
fs/nfs/direct.c | 12 +-
fs/nfs/file.c | 124 +++++++------
fs/nfs/internal.h | 38 ++--
fs/nfs/nfstrace.h | 58 ++++--
fs/nfs/pagelist.c | 217 +++++++++++++++++-----
fs/nfs/pnfs.h | 10 +-
fs/nfs/pnfs_nfs.c | 18 +-
fs/nfs/read.c | 86 +++++----
fs/nfs/write.c | 380 ++++++++++++++++++++-------------------
include/linux/nfs_fs.h | 7 +-
include/linux/nfs_page.h | 79 +++++++-
11 files changed, 645 insertions(+), 384 deletions(-)
--
2.39.0
From: Trond Myklebust <[email protected]>
If the same page and data is being used for multiple requests,
then ignore that when the request indicates we're reading from the start
of the page.
Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/pagelist.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 317cedfa52bf..b4b3e80e64cd 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -920,6 +920,9 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
req = nfs_list_entry(head->next);
nfs_list_move_request(req, &hdr->pages);
+ if (req->wb_pgbase == 0)
+ last_page = NULL;
+
if (!last_page || last_page != req->wb_page) {
pageused++;
if (pageused > pagecount)
--
2.39.0