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

rxrpc: Disable IRQ, not BH, to take the lock for ->attend_link 



Use spin_lock_irq(), not spin_lock_bh() to take the lock when accessing the
->attend_link() to stop a delay in the I/O thread due to an interrupt being
taken in the app thread whilst that holds the lock and vice versa.

Fixes: a2ea9a90 ("rxrpc: Use irq-disabling spinlocks between app and 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://patch.msgid.link/2870146.1734037095@warthog.procyon.org.uk


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

net/rxrpc/io_thread.c

+4 −4
Original line number Diff line number Diff line
@@ -508,9 +508,9 @@ int rxrpc_io_thread(void *data) 
		while ((conn = list_first_entry_or_null(&conn_attend_q,

							struct rxrpc_connection,

							attend_link))) {

			spin_lock_bh(&local->lock);

			spin_lock_irq(&local->lock);

			list_del_init(&conn->attend_link);

			spin_unlock_bh(&local->lock);

			spin_unlock_irq(&local->lock);

			rxrpc_input_conn_event(conn, NULL);

			rxrpc_put_connection(conn, rxrpc_conn_put_poke);

		}
@@ -527,9 +527,9 @@ int rxrpc_io_thread(void *data) 
		while ((call = list_first_entry_or_null(&call_attend_q,

							struct rxrpc_call,

							attend_link))) {

			spin_lock_bh(&local->lock);

			spin_lock_irq(&local->lock);

			list_del_init(&call->attend_link);

			spin_unlock_bh(&local->lock);

			spin_unlock_irq(&local->lock);

			trace_rxrpc_call_poked(call);

			rxrpc_input_call_event(call);

			rxrpc_put_call(call, rxrpc_call_put_poke);