Skip to content

Readdir enhancements

[email protected] linux-nfs 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest22 patches 13 repliesIn review
  2. v421 patches 10 repliesSuperseded
  3. v216 patches 7 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v112 patches7 repliesSuperseded

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22NFS: Remove unnecessary inode locking in nfs_llseek_dir()fs/nfs/dir.c+4 -50 replies
2/22NFS: Remove unnecessary inode lock in nfs_fsync_dir()fs/nfs/dir.c+1 -50 replies
3/22NFSv4.2: condition READDIR's mask for security label based on LSM statefs/nfs/nfs4proc.c+8 -20 replies
4/22NFS: Ensure contents of struct nfs_open_dir_context are consistentfs/nfs/dir.c+43 -290 replies
5/22NFS: Clean up readdir struct nfs_cache_arrayfs/nfs/dir.c+49 -170 replies
6/22NFS: Clean up nfs_readdir_page_filler()fs/nfs/dir.c+18 -210 replies
7/22NFS: Clean up directory array handlingfs/nfs/dir.c+77 -610 replies
8/22NFS: Don't discard readdir resultsfs/nfs/dir.c+42 -40 replies
9/22NFS: Remove unnecessary kmap in nfs_readdir_xdr_to_array()fs/nfs/dir.c+3 -70 replies
10/22NFS: Replace kmap() with kmap_atomic() in nfs_readdir_search_array()fs/nfs/dir.c+2 -20 replies
11/22NFS: Simplify struct nfs_cache_array_entryfs/nfs/dir.c+25 -210 replies
12/22NFS: Support larger readdir buffersfs/nfs/client.c fs/nfs/dir.c fs/nfs/internal.h+21 -220 replies
13/22NFS: More readdir cleanupsfs/nfs/dir.c include/linux/nfs_fs.h+11 -150 replies
14/22NFS: nfs_do_filldir() does not return a valuefs/nfs/dir.c+7 -140 replies
15/22NFS: Reduce readdir stack usagefs/nfs/dir.c+33 -250 replies
16/22NFS: Cleanup to remove nfs_readdir_descriptor_t typedeffs/nfs/dir.c+13 -170 replies
17/22NFS: Allow the NFS generic code to pass in a verifier to readdirfs/nfs/dir.c fs/nfs/nfs3proc.c fs/nfs/nfs4proc.c +2 more+76 -530 replies
18/22NFS: Handle NFS4ERR_NOT_SAME and NFSERR_BADCOOKIE from readdir callsfs/nfs/dir.c fs/nfs/nfs4proc.c+18 -80 replies
19/22NFS: Improve handling of directory verifiersfs/nfs/dir.c fs/nfs/inode.c include/linux/nfs_fs.h+30 -200 replies
20/22NFS: Optimisations for monotonically increasing readdir cookiesfs/nfs/dir.c+22 -10 replies
21/22NFS: Reduce number of RPC calls when doing uncached readdirfs/nfs/dir.c+69 -360 replies
22/22NFS: Do uncached readdir when we're seeking a cookie in an empty page cachefs/nfs/dir.c+17 -00 replies

Reviews trailers per patch

19 of 22 patches have a Reviewed-by or Acked-by.

PatchBenjamin Coddington
1/22
2/22
3/22
4/22R-b T-b
5/22R-b T-b
6/22R-b T-b
7/22R-b T-b
8/22R-b T-b
9/22R-b T-b
10/22R-b T-b
11/22R-b T-b
12/22R-b T-b
13/22R-b T-b
14/22R-b T-b
15/22R-b T-b
16/22R-b T-b
17/22R-b T-b
18/22R-b T-b
19/22R-b T-b
20/22R-b T-b
21/22R-b
22/22R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 00/22] Readdir enhancements

From: Trond Myklebust <[email protected]>

The following patch series performs a number of cleanups on the readdir code.
It also adds support for 1MB readdir RPC calls on-the-wire, and modifies the caching code to ensure that we cache the entire contents of that 1MB call (instead of discarding the data that doesn't fit into a single page).
For filesystems that use ordered readdir cookie schemes (e.g. XFS), it optimises searching for cookies in the client's page cache by skipping over pages that contain cookie values that are not in the range we are searching for.
Finally, it improves scalability when dealing with very large directories by turning off caching when those directories are changing, so as to avoid the need for a linear search on the client of the entire directory when looking for the first entry pointed to by the current file descriptor offset.

v2: Fix the handling of the NFSv3/v4 directory verifier.
v3: Optimise searching when the readdir cookies are seen to be ordered.
v4: Optimise performance for large directories that are changing.
Add in llseek dependency patches.
v5: Integrate Olga's patch for the READDIR security label handling.
Record more entries in the uncached readdir case. Bump the max number of pages to 512, but allocate them on demand in case the readdir RPC call returns fewer entries.

Olga Kornievskaia (1):
NFSv4.2: condition READDIR's mask for security label based on LSM
state

Trond Myklebust (21):
NFS: Remove unnecessary inode locking in nfs_llseek_dir()
NFS: Remove unnecessary inode lock in nfs_fsync_dir()
NFS: Ensure contents of struct nfs_open_dir_context are consistent
NFS: Clean up readdir struct nfs_cache_array
NFS: Clean up nfs_readdir_page_filler()
NFS: Clean up directory array handling
NFS: Don't discard readdir results
NFS: Remove unnecessary kmap in nfs_readdir_xdr_to_array()
NFS: Replace kmap() with kmap_atomic() in nfs_readdir_search_array()
NFS: Simplify struct nfs_cache_array_entry
NFS: Support larger readdir buffers
NFS: More readdir cleanups
NFS: nfs_do_filldir() does not return a value
NFS: Reduce readdir stack usage
NFS: Cleanup to remove nfs_readdir_descriptor_t typedef
NFS: Allow the NFS generic code to pass in a verifier to readdir
NFS: Handle NFS4ERR_NOT_SAME and NFSERR_BADCOOKIE from readdir calls
NFS: Improve handling of directory verifiers
NFS: Optimisations for monotonically increasing readdir cookies
NFS: Reduce number of RPC calls when doing uncached readdir
NFS: Do uncached readdir when we're seeking a cookie in an empty page
cache

 fs/nfs/client.c         |   4 +-
 fs/nfs/dir.c            | 734 +++++++++++++++++++++++++---------------
 fs/nfs/inode.c          |   7 -
 fs/nfs/internal.h       |   6 -
 fs/nfs/nfs3proc.c       |  35 +-
 fs/nfs/nfs4proc.c       |  48 +--
 fs/nfs/proc.c           |  18 +-
 include/linux/nfs_fs.h  |   9 +-
 include/linux/nfs_xdr.h |  17 +-
 9 files changed, 541 insertions(+), 337 deletions(-)
Signature · 1 line
2.28.0