]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
afs: Fix fileserver rotation getting stuck
authorDavid Howells <dhowells@redhat.com>
Fri, 3 May 2024 14:22:32 +0000 (15:22 +0100)
committerChristian Brauner <brauner@kernel.org>
Fri, 10 May 2024 06:49:17 +0000 (08:49 +0200)
Fix the fileserver rotation code in a couple of ways:

 (1) op->server_states is an array, not a pointer to a single record, so
     fix the places that access it to index it.

 (2) In the places that go through an address list to work out which one
     has the best priority, fix the loops to skip known failed addresses.

Without this, the rotation algorithm may get stuck on addresses that are
inaccessible or don't respond.

This can be triggered manually by finding a server that advertises a
non-routable address and giving it a higher priority, eg.:

        echo "add udp 192.168.0.0/16 3000" >/proc/fs/afs/addr_prefs

if the server, say, includes the address 192.168.7.7 in its address list,
and then attempting to access a volume on that server.

Fixes: 495f2ae9e355 ("afs: Fix fileserver rotation")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Link: https://lore.kernel.org/r/4005300.1712309731@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/998836.1714746152@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/afs/rotate.c

index ed04bd1eeae89793219aacd1ada6efb61aa6ba03..ed09d4d4c2112189bfa724d577769e5ae8f15bdd 100644 (file)
@@ -541,11 +541,13 @@ pick_server:
                    test_bit(AFS_SE_EXCLUDED, &se->flags) ||
                    !test_bit(AFS_SERVER_FL_RESPONDING, &s->flags))
                        continue;
-               es = op->server_states->endpoint_state;
+               es = op->server_states[i].endpoint_state;
                sal = es->addresses;
 
                afs_get_address_preferences_rcu(op->net, sal);
                for (j = 0; j < sal->nr_addrs; j++) {
+                       if (es->failed_set & (1 << j))
+                               continue;
                        if (!sal->addrs[j].peer)
                                continue;
                        if (sal->addrs[j].prio > best_prio) {
@@ -605,6 +607,8 @@ iterate_address:
        best_prio = -1;
        addr_index = 0;
        for (i = 0; i < alist->nr_addrs; i++) {
+               if (!(set & (1 << i)))
+                       continue;
                if (alist->addrs[i].prio > best_prio) {
                        addr_index = i;
                        best_prio = alist->addrs[i].prio;
@@ -674,7 +678,7 @@ no_more_servers:
        for (i = 0; i < op->server_list->nr_servers; i++) {
                struct afs_endpoint_state *estate;
 
-               estate = op->server_states->endpoint_state;
+               estate = op->server_states[i].endpoint_state;
                error = READ_ONCE(estate->error);
                if (error < 0)
                        afs_op_accumulate_error(op, error, estate->abort_code);