aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net/rxrpc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2024-12-12 20:58:15 +0000
committerJakub Kicinski <kuba@kernel.org>2024-12-16 18:06:23 -0800
commitd920270a6dbf756384b125ce39c17666a7c0c9f4 (patch)
treed665996e202c068ef784ed6c5cb221ef5dcadb2f /net/rxrpc
parentMerge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux (diff)
downloadwireguard-linux-d920270a6dbf756384b125ce39c17666a7c0c9f4.tar.xz
wireguard-linux-d920270a6dbf756384b125ce39c17666a7c0c9f4.zip
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: a2ea9a907260 ("rxrpc: Use irq-disabling spinlocks between app and I/O thread") Signed-off-by: David 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: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/rxrpc')
-rw-r--r--net/rxrpc/io_thread.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/rxrpc/io_thread.c b/net/rxrpc/io_thread.c
index 2925c7fc82cf..64f8d77b8731 100644
--- a/net/rxrpc/io_thread.c
+++ b/net/rxrpc/io_thread.c
@@ -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);