Commit 61e4a866 authored by David Howells's avatar David Howells Committed by Jakub Kicinski
Browse files

rxrpc: Fix two connection reaping bugs 



Fix two connection reaping bugs:

 (1) rxrpc_connection_expiry is in units of seconds, so
     rxrpc_disconnect_call() needs to multiply it by HZ when adding it to
     jiffies.

 (2) rxrpc_client_conn_reap_timeout() should set RXRPC_CLIENT_REAP_TIMER if
     local->kill_all_client_conns is clear, not if it is set (in which case
     we don't need the timer).  Without this, old client connections don't
     get cleaned up until the local endpoint is cleaned up.

Fixes: 5040011d ("rxrpc: Make the local endpoint hold a ref on a connected call")
Fixes: 0d6bf319 ("rxrpc: Move the client conn cache management to the I/O thread")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Link: https://lore.kernel.org/r/783911.1698364174@warthog.procyon.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 74da7792

net/rxrpc/conn_object.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ void rxrpc_disconnect_call(struct rxrpc_call *call) 
		conn->idle_timestamp = jiffies;

		if (atomic_dec_and_test(&conn->active))

			rxrpc_set_service_reap_timer(conn->rxnet,

						     jiffies + rxrpc_connection_expiry);

						     jiffies + rxrpc_connection_expiry * HZ);

	}



	rxrpc_put_call(call, rxrpc_call_put_io_thread);

net/rxrpc/local_object.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void rxrpc_client_conn_reap_timeout(struct timer_list *timer) 
	struct rxrpc_local *local =

		container_of(timer, struct rxrpc_local, client_conn_reap_timer);



	if (local->kill_all_client_conns &&

	if (!local->kill_all_client_conns &&

	    test_and_set_bit(RXRPC_CLIENT_CONN_REAP_TIMER, &local->client_conn_flags))

		rxrpc_wake_up_io_thread(local);

}