smb: improve directory cache reuse for readdir operations

commit 72dd7961a4bb4fa1fc456169a61dd12e68e50645 upstream.

Currently, cached directory contents were not reused across subsequent
'ls' operations because the cache validity check relied on comparing
the ctx pointer, which changes with each readdir invocation. As a
result, the cached dir entries was not marked as valid and the cache was
not utilized for subsequent 'ls' operations.

This change uses the file pointer, which remains consistent across all
readdir calls for a given directory instance, to associate and validate
the cache. As a result, cached directory contents can now be
correctly reused, improving performance for repeated directory listings.

Performance gains with local windows SMB server:

Without the patch and default actimeo=1:
 1000 directory enumeration operations on dir with 10k files took 135.0s

With this patch and actimeo=0:
 1000 directory enumeration operations on dir with 10k files took just 5.1s

Signed-off-by: Bharath SM <bharathsm@microsoft.com>
Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Cc: stable@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/smb/client/cached_dir.h b/fs/smb/client/cached_dir.h
index 2f4e764c9ca9a2b16cb670ded5959a140b798790..dad31f0b7ffb7f7e89a2b2f37cd0a9fd28dd975c 100644 (file)
--- a/fs/smb/client/cached_dir.h
+++ b/fs/smb/client/cached_dir.h
@@ -21,10 +21,10 @@ struct cached_dirent {
 struct cached_dirents {
        bool is_valid:1;
        bool is_failed:1;
-       struct dir_context *ctx; /*
-                                 * Only used to make sure we only take entries
-                                 * from a single context. Never dereferenced.
-                                 */
+       struct file *file; /*
+                           * Used to associate the cache with a single
+                           * open file instance.
+                           */
        struct mutex de_mutex;
        int pos;                 /* Expected ctx->pos */
        struct list_head entries;

diff --git a/fs/smb/client/readdir.c b/fs/smb/client/readdir.c
index 402ac06ae9b6f9ac2574d14bc6dba7ec12a7ecf4..20955d595e6a5aa1bd4d89cbfc047c792f7b99c4 100644 (file)
--- a/fs/smb/client/readdir.c
+++ b/fs/smb/client/readdir.c
@@ -882,9 +882,9 @@ static bool emit_cached_dirents(struct cached_dirents *cde,
 }
 
 static void update_cached_dirents_count(struct cached_dirents *cde,
-                                       struct dir_context *ctx)
+                                       struct file *file)
 {
-       if (cde->ctx != ctx)
+       if (cde->file != file)
                return;
        if (cde->is_valid || cde->is_failed)
                return;
@@ -893,9 +893,9 @@ static void update_cached_dirents_count(struct cached_dirents *cde,
 }
 
 static void finished_cached_dirents_count(struct cached_dirents *cde,
-                                       struct dir_context *ctx)
+                                       struct dir_context *ctx, struct file *file)
 {
-       if (cde->ctx != ctx)
+       if (cde->file != file)
                return;
        if (cde->is_valid || cde->is_failed)
                return;
@@ -908,11 +908,12 @@ static void finished_cached_dirents_count(struct cached_dirents *cde,
 static void add_cached_dirent(struct cached_dirents *cde,
                              struct dir_context *ctx,
                              const char *name, int namelen,
-                             struct cifs_fattr *fattr)
+                             struct cifs_fattr *fattr,
+                                 struct file *file)
 {
        struct cached_dirent *de;
 
-       if (cde->ctx != ctx)
+       if (cde->file != file)
                return;
        if (cde->is_valid || cde->is_failed)
                return;
@@ -942,7 +943,8 @@ static void add_cached_dirent(struct cached_dirents *cde,
 static bool cifs_dir_emit(struct dir_context *ctx,
                          const char *name, int namelen,
                          struct cifs_fattr *fattr,
-                         struct cached_fid *cfid)
+                         struct cached_fid *cfid,
+                         struct file *file)
 {
        bool rc;
        ino_t ino = cifs_uniqueid_to_ino_t(fattr->cf_uniqueid);
@@ -954,7 +956,7 @@ static bool cifs_dir_emit(struct dir_context *ctx,
        if (cfid) {
                mutex_lock(&cfid->dirents.de_mutex);
                add_cached_dirent(&cfid->dirents, ctx, name, namelen,
-                                 fattr);
+                                 fattr, file);
                mutex_unlock(&cfid->dirents.de_mutex);
        }
 
@@ -1054,7 +1056,7 @@ static int cifs_filldir(char *find_entry, struct file *file,
        cifs_prime_dcache(file_dentry(file), &name, &fattr);
 
        return !cifs_dir_emit(ctx, name.name, name.len,
-                             &fattr, cfid);
+                             &fattr, cfid, file);
 }
 
 
@@ -1105,8 +1107,8 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
         * we need to initialize scanning and storing the
         * directory content.
         */
-       if (ctx->pos == 0 && cfid->dirents.ctx == NULL) {
-               cfid->dirents.ctx = ctx;
+       if (ctx->pos == 0 && cfid->dirents.file == NULL) {
+               cfid->dirents.file = file;
                cfid->dirents.pos = 2;
        }
        /*
@@ -1174,7 +1176,7 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
        } else {
                if (cfid) {
                        mutex_lock(&cfid->dirents.de_mutex);
-                       finished_cached_dirents_count(&cfid->dirents, ctx);
+                       finished_cached_dirents_count(&cfid->dirents, ctx, file);
                        mutex_unlock(&cfid->dirents.de_mutex);
                }
                cifs_dbg(FYI, "Could not find entry\n");
@@ -1215,7 +1217,7 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
                ctx->pos++;
                if (cfid) {
                        mutex_lock(&cfid->dirents.de_mutex);
-                       update_cached_dirents_count(&cfid->dirents, ctx);
+                       update_cached_dirents_count(&cfid->dirents, file);
                        mutex_unlock(&cfid->dirents.de_mutex);
                }