This is a note to let you know that I've just added the patch titled
cifs: Introduce helpers for finding TCP connection
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cifs-introduce-helpers-for-finding-tcp-connection.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Jun 23 23:35:43 2023
From: Rishabh Bhatnagar <risbhat@xxxxxxxxxx>
Date: Fri, 23 Jun 2023 21:34:04 +0000
Subject: cifs: Introduce helpers for finding TCP connection
To: <gregkh@xxxxxxxxxxxxxxxxxxx>, <pc@xxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>, <linux-kernel@xxxxxxxxxxxxxxx>, <linux-cifs@xxxxxxxxxxxxxxx>, Aurelien Aptel <aaptel@xxxxxxxx>, Steve French <stfrench@xxxxxxxxxxxxx>, Rishabh Bhatnagar <risbhat@xxxxxxxxxx>
Message-ID: <20230623213406.5596-4-risbhat@xxxxxxxxxx>
From: "Paulo Alcantara (SUSE)" <pc@xxxxxx>
commit 345c1a4a9e09dc5842b7bbb6728a77910db69c52 upstream.
Add helpers for finding TCP connections that are good candidates for
being used by DFS refresh worker.
Signed-off-by: Paulo Alcantara (SUSE) <pc@xxxxxx>
Reviewed-by: Aurelien Aptel <aaptel@xxxxxxxx>
Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx>
Signed-off-by: Rishabh Bhatnagar <risbhat@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/cifs/dfs_cache.c | 44 +++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
--- a/fs/cifs/dfs_cache.c
+++ b/fs/cifs/dfs_cache.c
@@ -1305,6 +1305,30 @@ static char *get_dfs_root(const char *pa
return npath;
}
+static inline void put_tcp_server(struct TCP_Server_Info *server)
+{
+ cifs_put_tcp_session(server, 0);
+}
+
+static struct TCP_Server_Info *get_tcp_server(struct smb_vol *vol)
+{
+ struct TCP_Server_Info *server;
+
+ server = cifs_find_tcp_session(vol);
+ if (IS_ERR_OR_NULL(server))
+ return NULL;
+
+ spin_lock(&GlobalMid_Lock);
+ if (server->tcpStatus != CifsGood) {
+ spin_unlock(&GlobalMid_Lock);
+ put_tcp_server(server);
+ return NULL;
+ }
+ spin_unlock(&GlobalMid_Lock);
+
+ return server;
+}
+
/* Find root SMB session out of a DFS link path */
static struct cifs_ses *find_root_ses(struct vol_info *vi,
struct cifs_tcon *tcon,
@@ -1347,13 +1371,8 @@ static struct cifs_ses *find_root_ses(st
goto out;
}
- server = cifs_find_tcp_session(&vol);
- if (IS_ERR_OR_NULL(server)) {
- ses = ERR_PTR(-EHOSTDOWN);
- goto out;
- }
- if (server->tcpStatus != CifsGood) {
- cifs_put_tcp_session(server, 0);
+ server = get_tcp_server(&vol);
+ if (!server) {
ses = ERR_PTR(-EHOSTDOWN);
goto out;
}
@@ -1451,19 +1470,18 @@ static void refresh_cache_worker(struct
mutex_lock(&vol_lock);
list_for_each_entry(vi, &vol_list, list) {
- server = cifs_find_tcp_session(&vi->smb_vol);
- if (IS_ERR_OR_NULL(server))
+ server = get_tcp_server(&vi->smb_vol);
+ if (!server)
continue;
- if (server->tcpStatus != CifsGood)
- goto next;
+
get_tcons(server, &list);
list_for_each_entry_safe(tcon, ntcon, &list, ulist) {
refresh_tcon(vi, tcon);
list_del_init(&tcon->ulist);
cifs_put_tcon(tcon);
}
-next:
- cifs_put_tcp_session(server, 0);
+
+ put_tcp_server(server);
}
queue_delayed_work(dfscache_wq, &refresh_task, cache_ttl * HZ);
mutex_unlock(&vol_lock);
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-5.4/cifs-clean-up-dfs-referral-cache.patch
queue-5.4/cifs-merge-is_path_valid-into-get_normalized_path.patch
queue-5.4/cifs-introduce-helpers-for-finding-tcp-connection.patch
queue-5.4/cifs-get-rid-of-kstrdup_const-d-paths.patch
queue-5.4/cifs-fix-potential-deadlock-when-updating-vol-in-cifs_reconnect.patch
