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

afs: Fix ignored callbacks over ipv4 



When searching for a matching peer, all addresses need to be searched,
not just the ipv6 ones in the fs_addresses6 list.

Given that the lists no longer contain addresses, there is little
reason to splitting things between separate lists, so unify them
into a single list.

When processing an incoming callback from an ipv4 address, this would
lead to a failure to set call->server, resulting in the callback being
ignored and the client seeing stale contents.

Fixes: 72904d7b ("rxrpc, afs: Allow afs to pin rxrpc_peer objects")
Reported-by: default avatarMarkus Suvanto <markus.suvanto@gmail.com>
Link: https://lists.infradead.org/pipermail/linux-afs/2024-February/008035.html


Signed-off-by: default avatarMarc Dionne <marc.dionne@auristor.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lists.infradead.org/pipermail/linux-afs/2024-February/008037.html # v1
Link: https://lists.infradead.org/pipermail/linux-afs/2024-February/008066.html # v2
Link: https://lore.kernel.org/r/20240219143906.138346-2-dhowells@redhat.com


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

fs/afs/internal.h

+2 −4
Original line number Diff line number Diff line
@@ -321,8 +321,7 @@ struct afs_net { 
	struct list_head	fs_probe_slow;	/* List of afs_server to probe at 5m intervals */

	struct hlist_head	fs_proc;	/* procfs servers list */



	struct hlist_head	fs_addresses4;	/* afs_server (by lowest IPv4 addr) */

	struct hlist_head	fs_addresses6;	/* afs_server (by lowest IPv6 addr) */

	struct hlist_head	fs_addresses;	/* afs_server (by lowest IPv6 addr) */

	seqlock_t		fs_addr_lock;	/* For fs_addresses[46] */



	struct work_struct	fs_manager;
@@ -561,8 +560,7 @@ struct afs_server { 
	struct afs_server __rcu	*uuid_next;	/* Next server with same UUID */

	struct afs_server	*uuid_prev;	/* Previous server with same UUID */

	struct list_head	probe_link;	/* Link in net->fs_probe_list */

	struct hlist_node	addr4_link;	/* Link in net->fs_addresses4 */

	struct hlist_node	addr6_link;	/* Link in net->fs_addresses6 */

	struct hlist_node	addr_link;	/* Link in net->fs_addresses6 */

	struct hlist_node	proc_link;	/* Link in net->fs_proc */

	struct list_head	volumes;	/* RCU list of afs_server_entry objects */

	struct afs_server	*gc_next;	/* Next server in manager's list */

fs/afs/main.c

+1 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ static int __net_init afs_net_init(struct net *net_ns) 
	INIT_LIST_HEAD(&net->fs_probe_slow);

	INIT_HLIST_HEAD(&net->fs_proc);



	INIT_HLIST_HEAD(&net->fs_addresses4);

	INIT_HLIST_HEAD(&net->fs_addresses6);

	INIT_HLIST_HEAD(&net->fs_addresses);

	seqlock_init(&net->fs_addr_lock);



	INIT_WORK(&net->fs_manager, afs_manage_servers);

fs/afs/server.c

+5 −9
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct afs_server *afs_find_server(struct afs_net *net, const struct rxrpc_peer 
		seq++; /* 2 on the 1st/lockless path, otherwise odd */

		read_seqbegin_or_lock(&net->fs_addr_lock, &seq);



		hlist_for_each_entry_rcu(server, &net->fs_addresses6, addr6_link) {

		hlist_for_each_entry_rcu(server, &net->fs_addresses, addr_link) {

			estate = rcu_dereference(server->endpoint_state);

			alist = estate->addresses;

			for (i = 0; i < alist->nr_addrs; i++)
@@ -177,10 +177,8 @@ static struct afs_server *afs_install_server(struct afs_cell *cell, 
	 * bit, but anything we might want to do gets messy and memory

	 * intensive.

	 */

	if (alist->nr_ipv4 > 0)

		hlist_add_head_rcu(&server->addr4_link, &net->fs_addresses4);

	if (alist->nr_addrs > alist->nr_ipv4)

		hlist_add_head_rcu(&server->addr6_link, &net->fs_addresses6);

	if (alist->nr_addrs > 0)

		hlist_add_head_rcu(&server->addr_link, &net->fs_addresses);



	write_sequnlock(&net->fs_addr_lock);
@@ -511,10 +509,8 @@ static void afs_gc_servers(struct afs_net *net, struct afs_server *gc_list) 


			list_del(&server->probe_link);

			hlist_del_rcu(&server->proc_link);

			if (!hlist_unhashed(&server->addr4_link))

				hlist_del_rcu(&server->addr4_link);

			if (!hlist_unhashed(&server->addr6_link))

				hlist_del_rcu(&server->addr6_link);

			if (!hlist_unhashed(&server->addr_link))

				hlist_del_rcu(&server->addr_link);

		}

		write_sequnlock(&net->fs_lock);