Skip to content

Commit 794092c

Browse files
author
Trond Myklebust
committed
NFS: Do uncached readdir when we're seeking a cookie in an empty page cache
If the directory is changing, causing the page cache to get invalidated while we are listing the contents, then the NFS client is currently forced to read in the entire directory contents from scratch, because it needs to perform a linear search for the readdir cookie. While this is not an issue for small directories, it does not scale to directories with millions of entries. In order to be able to deal with large directories that are changing, add a heuristic to ensure that if the page cache is empty, and we are searching for a cookie that is not the zero cookie, we just default to performing uncached readdir. Signed-off-by: Trond Myklebust <[email protected]> Reviewed-by: Benjamin Coddington <[email protected]> Tested-by: Benjamin Coddington <[email protected]> Tested-by: Dave Wysochanski <[email protected]>
1 parent 35df59d commit 794092c

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

fs/nfs/dir.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,11 +937,28 @@ static int find_and_lock_cache_page(struct nfs_readdir_descriptor *desc)
937937
return res;
938938
}
939939

940+
static bool nfs_readdir_dont_search_cache(struct nfs_readdir_descriptor *desc)
941+
{
942+
struct address_space *mapping = desc->file->f_mapping;
943+
struct inode *dir = file_inode(desc->file);
944+
unsigned int dtsize = NFS_SERVER(dir)->dtsize;
945+
loff_t size = i_size_read(dir);
946+
947+
/*
948+
* Default to uncached readdir if the page cache is empty, and
949+
* we're looking for a non-zero cookie in a large directory.
950+
*/
951+
return desc->dir_cookie != 0 && mapping->nrpages == 0 && size > dtsize;
952+
}
953+
940954
/* Search for desc->dir_cookie from the beginning of the page cache */
941955
static int readdir_search_pagecache(struct nfs_readdir_descriptor *desc)
942956
{
943957
int res;
944958

959+
if (nfs_readdir_dont_search_cache(desc))
960+
return -EBADCOOKIE;
961+
945962
do {
946963
if (desc->page_index == 0) {
947964
desc->current_index = 0;

0 commit comments

Comments
 (0)