cifs: reset iface weights when we cannot find a candidate

[ Upstream commit 9d5eff7821f6d70f7d1b4d8a60680fba4de868a7 ]

We now do a weighted selection of server interfaces when allocating
new channels. The weights are decided based on the speed advertised.
The fulfilled weight for an interface is a counter that is used to
track the interface selection. It should be reset back to zero once
all interfaces fulfilling their weight.

In cifs_chan_update_iface, this reset logic was missing. As a result
when the server interface list changes, the client may not be able
to find a new candidate for other channels after all interfaces have
been fulfilled.

Fixes: a6d8fb54a515 ("cifs: distribute channels across interfaces based on speed")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
[ Kept both int rc and int retry variables ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
index 883d1cb1fc8b0c1c4435cfb9fa0b4bc4476b9f7d..6764d72ab5a586e23e2b7f4b1c29434be3ab8c04 100644 (file)
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -292,6 +292,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
        struct cifs_server_iface *last_iface = NULL;
        struct sockaddr_storage ss;
        int rc = 0;
+       int retry = 0;
 
        spin_lock(&ses->chan_lock);
        chan_index = cifs_ses_get_chan_index(ses, server);
@@ -320,6 +321,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
                return 0;
        }
 
+try_again:
        last_iface = list_last_entry(&ses->iface_list, struct cifs_server_iface,
                                     iface_head);
        iface_min_speed = last_iface->speed;
@@ -358,6 +360,13 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
 
        if (list_entry_is_head(iface, &ses->iface_list, iface_head)) {
                rc = 1;
+               list_for_each_entry(iface, &ses->iface_list, iface_head)
+                       iface->weight_fulfilled = 0;
+
+               /* see if it can be satisfied in second attempt */
+               if (!retry++)
+                       goto try_again;
+
                iface = NULL;
                cifs_dbg(FYI, "unable to find a suitable iface\n");
        }