Unverified Commit f94d5420 authored by Marc Dionne's avatar Marc Dionne Committed by Christian Brauner
Browse files

afs: Fix possible infinite loop with unresponsive servers 



A return code of 0 from afs_wait_for_one_fs_probe is an indication
that the endpoint state attached to the operation is stale and has
been superseded.  In that case the iteration needs to be restarted
so that the newer probe result state gets used.

Failure to do so can result in an tight infinite loop around the
iterate_address label, where all addresses are thought to be responsive
and have been tried, with nothing to refresh the endpoint state.

Fixes: 495f2ae9 ("afs: Fix fileserver rotation")
Reported-by: default avatarMarkus Suvanto <markus.suvanto@gmail.com>
Link: https://lists.infradead.org/pipermail/linux-afs/2024-July/008628.html


cc: linux-afs@lists.infradead.org
Signed-off-by: default avatarMarc Dionne <marc.dionne@auristor.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20240906134019.131553-1-marc.dionne@auristor.com/
Link: https://lore.kernel.org/r/20240923150756.902363-6-dhowells@redhat.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 8a460677

fs/afs/fs_probe.c

+2 −2
Original line number Diff line number Diff line
@@ -506,10 +506,10 @@ int afs_wait_for_one_fs_probe(struct afs_server *server, struct afs_endpoint_sta 
	finish_wait(&server->probe_wq, &wait);



dont_wait:

	if (estate->responsive_set & ~exclude)

		return 1;

	if (test_bit(AFS_ESTATE_SUPERSEDED, &estate->flags))

		return 0;

	if (estate->responsive_set & ~exclude)

		return 1;

	if (is_intr && signal_pending(current))

		return -ERESTARTSYS;

	if (timo == 0)

fs/afs/rotate.c

+8 −3
Original line number Diff line number Diff line
@@ -632,8 +632,10 @@ bool afs_select_fileserver(struct afs_operation *op) 
wait_for_more_probe_results:

	error = afs_wait_for_one_fs_probe(op->server, op->estate, op->addr_tried,

					  !(op->flags & AFS_OPERATION_UNINTR));

	if (!error)

	if (error == 1)

		goto iterate_address;

	if (!error)

		goto restart_from_beginning;



	/* We've now had a failure to respond on all of a server's addresses -

	 * immediately probe them again and consider retrying the server.
@@ -644,10 +646,13 @@ bool afs_select_fileserver(struct afs_operation *op) 
		error = afs_wait_for_one_fs_probe(op->server, op->estate, op->addr_tried,

						  !(op->flags & AFS_OPERATION_UNINTR));

		switch (error) {

		case 0:

		case 1:

			op->flags &= ~AFS_OPERATION_RETRY_SERVER;

			trace_afs_rotate(op, afs_rotate_trace_retry_server, 0);

			trace_afs_rotate(op, afs_rotate_trace_retry_server, 1);

			goto retry_server;

		case 0:

			trace_afs_rotate(op, afs_rotate_trace_retry_server, 0);

			goto restart_from_beginning;

		case -ERESTARTSYS:

			afs_op_set_error(op, error);

			goto failed;