This patchset converts NFS with fscache non-direct READ IO paths to use the netfs API with a non-invasive approach. The existing NFS pgio layer does not need extensive changes, and is the best way so far I've found to address Trond's concerns about modifying the IO path [1] as well as only enabling netfs when fscache is configured and enabled [2]. I have not attempted performance comparisions to address Chuck Lever's concern [3] because we are not converting the non-fscache enabled NFS IO paths to netfs. The main patch to be reviewed is patch #3 which converts nfs_read_folio and nfs_readahead. The patchset is based on 6.0-rc3 and has been pushed to github at: https://github.com/DaveWysochanskiRH/kernel/commits/nfs-fscache-netfs https://github.com/DaveWysochanskiRH/kernel/commit/152f43e3de2cce4e331593bd425c638a4a430a7c Changes since v5 ================ Patch1: Add Jeff Layton's reviewed-by (from v3 posting) Patch2: Add Jeff Layton's reviewed-by (from v5 posting) Patch3: Make netfs->transferred atomic64_t, drop spinlock (Jeff Layton) Patch3: Various cleanups - rename nfs_netfs_read_initiate to nfs_netfs_initiate_read - rename nfs_fscache_read_folio to nfs_netfs_read_folio - rename nfs_fscache_readahead to nfs_netfs_readahead - rename nfs_netfs_read_done nfs_netfs_readpage_done - move unlock_page inside nfs_netfs_readpage_release - use netfs_inode() helper in more places Testing ======= The patches are fairly stable as evidenced with xfstests generic with various servers, both with and without fscache enabled: hammerspace(pNFS flexfiles): NFS4.1,NFS4.2 NetApp(pNFS filelayout): NFS3,NFS4.0,NFS4.1 RHEL8: NFS3,NFS4.1,NFS4.2 No major issues outstanding. The known issues are as follows: 1. Unit test setting rsize < readahead does not properly read from fscache but re-reads data from the NFS server * This will be fixed with another linux-cachefs [4] patch to resolve "Stop read optimisation when folio removed from pagecache" * Daire Byrne also verified the patch fixes his issue as well 2. "Cache volume key already in use" after xfstest runs * xfstests (hammerspace with vers=4.2,fsc) shows the following on the console after some tests: "NFS: Cache volume key already in use (nfs,4.1,2,c50,cfe0100a,3,,,8000,100000,100000,bb8,ea60,7530,ea60,1)" * This may be fixed with another patch [5] that is in progress 3. generic/127 triggers "Subreq overread" warning * Intermittent, hard to reproduce * Seen with NFSv3 and RHEL8 server [ 4196.864176] run fstests generic/127 at 2022-08-31 17:29:38 [ 5608.997945] ------------[ cut here ]------------ [ 5609.000476] Subreq overread: R1c85d[0] 73728 > 70073 - 0 Outstanding work ================ Note that the existing NFS fscache stats ("fsc:" line in /proc/self/mountstats) as well as trace events still need removed. I've left these out of this patchset for now as removing them are benign and can come later (the stats will all be 0, and trace events are no longer used). The existing NFS fscache stat counts no longer apply since the new API is not page based - they are not meaningful or possible to obtain, and there are new fscache stats in /proc/fs/fscache/stats. A similar situation exists with the NFS trace events - netfs and fscache have plenty of trace events so the NFS specific ones probably are not needed. References ========== [1] https://lore.kernel.org/linux-nfs/9cfd5bc3cfc6abc2d3316b0387222e708d67f595.camel@xxxxxxxxxxxxxxx/ [2] https://lore.kernel.org/linux-nfs/da9200f1bded9b8b078a7aef227fd6b92eb028fb.camel@xxxxxxxxxxxxxxx/ [3] https://marc.info/?l=linux-nfs&m=160597917525083&w=4 [4] https://www.mail-archive.com/linux-cachefs@xxxxxxxxxx/msg03043.html [5] https://marc.info/?l=linux-nfs&m=165962662200679&w=4 Dave Wysochanski (3): NFS: Rename readpage_async_filler to nfs_pageio_add_page NFS: Configure support for netfs when NFS fscache is configured NFS: Convert buffered read paths to use netfs when fscache is enabled fs/nfs/Kconfig | 1 + fs/nfs/delegation.c | 2 +- fs/nfs/dir.c | 2 +- fs/nfs/fscache.c | 251 +++++++++++++++++++++++---------------- fs/nfs/fscache.h | 101 ++++++++++------ fs/nfs/inode.c | 8 +- fs/nfs/internal.h | 11 +- fs/nfs/pagelist.c | 12 ++ fs/nfs/pnfs.c | 12 +- fs/nfs/read.c | 111 +++++++++-------- fs/nfs/write.c | 2 +- include/linux/nfs_fs.h | 34 ++++-- include/linux/nfs_page.h | 3 + include/linux/nfs_xdr.h | 3 + 14 files changed, 335 insertions(+), 218 deletions(-) -- 2.31.1
