Skip to content

Commit a2ea9a9

Browse files
dhowellskuba-moo
dhowells
authored and
kuba-moo
committed
rxrpc: Use irq-disabling spinlocks between app and I/O thread
Where a spinlock is used by both the application thread and the I/O thread, use irq-disabling locking so that an interrupt taken on the app thread doesn't also slow down the I/O thread. Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: linux-afs@lists.infradead.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 08d55d7 commit a2ea9a9

File tree

14 files changed

+54
-60
lines changed

14 files changed

+54
-60
lines changed

‎net/rxrpc/af_rxrpc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,9 @@ void rxrpc_kernel_shutdown_call(struct socket *sock, struct rxrpc_call *call)
408408

409409
/* Make sure we're not going to call back into a kernel service */
410410
if (call->notify_rx) {
411-
spin_lock(&call->notify_lock);
411+
spin_lock_irq(&call->notify_lock);
412412
call->notify_rx = rxrpc_dummy_notify_rx;
413-
spin_unlock(&call->notify_lock);
413+
spin_unlock_irq(&call->notify_lock);
414414
}
415415
}
416416
mutex_unlock(&call->user_mutex);

‎net/rxrpc/ar-internal.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,6 @@ struct rxrpc_call {
700700
struct rxrpc_txqueue *send_queue; /* Queue that sendmsg is writing into */
701701

702702
/* Transmitted data tracking. */
703-
spinlock_t tx_lock; /* Transmit queue lock */
704703
struct rxrpc_txqueue *tx_queue; /* Start of transmission buffers */
705704
struct rxrpc_txqueue *tx_qtail; /* End of transmission buffers */
706705
rxrpc_seq_t tx_qbase; /* First slot in tx_queue */

‎net/rxrpc/call_accept.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ void rxrpc_discard_prealloc(struct rxrpc_sock *rx)
188188
/* Make sure that there aren't any incoming calls in progress before we
189189
* clear the preallocation buffers.
190190
*/
191-
spin_lock(&rx->incoming_lock);
192-
spin_unlock(&rx->incoming_lock);
191+
spin_lock_irq(&rx->incoming_lock);
192+
spin_unlock_irq(&rx->incoming_lock);
193193

194194
head = b->peer_backlog_head;
195195
tail = b->peer_backlog_tail;
@@ -343,7 +343,7 @@ bool rxrpc_new_incoming_call(struct rxrpc_local *local,
343343
if (sp->hdr.type != RXRPC_PACKET_TYPE_DATA)
344344
return rxrpc_protocol_error(skb, rxrpc_eproto_no_service_call);
345345

346-
read_lock(&local->services_lock);
346+
read_lock_irq(&local->services_lock);
347347

348348
/* Weed out packets to services we're not offering. Packets that would
349349
* begin a call are explicitly rejected and the rest are just
@@ -399,12 +399,12 @@ bool rxrpc_new_incoming_call(struct rxrpc_local *local,
399399
spin_unlock(&conn->state_lock);
400400

401401
spin_unlock(&rx->incoming_lock);
402-
read_unlock(&local->services_lock);
402+
read_unlock_irq(&local->services_lock);
403403

404404
if (hlist_unhashed(&call->error_link)) {
405-
spin_lock(&call->peer->lock);
405+
spin_lock_irq(&call->peer->lock);
406406
hlist_add_head(&call->error_link, &call->peer->error_targets);
407-
spin_unlock(&call->peer->lock);
407+
spin_unlock_irq(&call->peer->lock);
408408
}
409409

410410
_leave(" = %p{%d}", call, call->debug_id);
@@ -413,20 +413,20 @@ bool rxrpc_new_incoming_call(struct rxrpc_local *local,
413413
return true;
414414

415415
unsupported_service:
416-
read_unlock(&local->services_lock);
416+
read_unlock_irq(&local->services_lock);
417417
return rxrpc_direct_abort(skb, rxrpc_abort_service_not_offered,
418418
RX_INVALID_OPERATION, -EOPNOTSUPP);
419419
unsupported_security:
420-
read_unlock(&local->services_lock);
420+
read_unlock_irq(&local->services_lock);
421421
return rxrpc_direct_abort(skb, rxrpc_abort_service_not_offered,
422422
RX_INVALID_OPERATION, -EKEYREJECTED);
423423
no_call:
424424
spin_unlock(&rx->incoming_lock);
425-
read_unlock(&local->services_lock);
425+
read_unlock_irq(&local->services_lock);
426426
_leave(" = f [%u]", skb->mark);
427427
return false;
428428
discard:
429-
read_unlock(&local->services_lock);
429+
read_unlock_irq(&local->services_lock);
430430
return true;
431431
}
432432

‎net/rxrpc/call_object.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ void rxrpc_poke_call(struct rxrpc_call *call, enum rxrpc_call_poke_trace what)
4949
bool busy;
5050

5151
if (!test_bit(RXRPC_CALL_DISCONNECTED, &call->flags)) {
52-
spin_lock_bh(&local->lock);
52+
spin_lock_irq(&local->lock);
5353
busy = !list_empty(&call->attend_link);
5454
trace_rxrpc_poke_call(call, busy, what);
5555
if (!busy && !rxrpc_try_get_call(call, rxrpc_call_get_poke))
5656
busy = true;
5757
if (!busy) {
5858
list_add_tail(&call->attend_link, &local->call_attend_q);
5959
}
60-
spin_unlock_bh(&local->lock);
60+
spin_unlock_irq(&local->lock);
6161
if (!busy)
6262
rxrpc_wake_up_io_thread(local);
6363
}
@@ -151,7 +151,6 @@ struct rxrpc_call *rxrpc_alloc_call(struct rxrpc_sock *rx, gfp_t gfp,
151151
skb_queue_head_init(&call->rx_oos_queue);
152152
init_waitqueue_head(&call->waitq);
153153
spin_lock_init(&call->notify_lock);
154-
spin_lock_init(&call->tx_lock);
155154
refcount_set(&call->ref, 1);
156155
call->debug_id = debug_id;
157156
call->tx_total_len = -1;
@@ -302,9 +301,9 @@ static int rxrpc_connect_call(struct rxrpc_call *call, gfp_t gfp)
302301

303302
trace_rxrpc_client(NULL, -1, rxrpc_client_queue_new_call);
304303
rxrpc_get_call(call, rxrpc_call_get_io_thread);
305-
spin_lock(&local->client_call_lock);
304+
spin_lock_irq(&local->client_call_lock);
306305
list_add_tail(&call->wait_link, &local->new_client_calls);
307-
spin_unlock(&local->client_call_lock);
306+
spin_unlock_irq(&local->client_call_lock);
308307
rxrpc_wake_up_io_thread(local);
309308
return 0;
310309

@@ -434,7 +433,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,
434433

435434
/*
436435
* Set up an incoming call. call->conn points to the connection.
437-
* This is called in BH context and isn't allowed to fail.
436+
* This is called with interrupts disabled and isn't allowed to fail.
438437
*/
439438
void rxrpc_incoming_call(struct rxrpc_sock *rx,
440439
struct rxrpc_call *call,
@@ -576,7 +575,7 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)
576575
rxrpc_put_call_slot(call);
577576

578577
/* Make sure we don't get any more notifications */
579-
spin_lock(&rx->recvmsg_lock);
578+
spin_lock_irq(&rx->recvmsg_lock);
580579

581580
if (!list_empty(&call->recvmsg_link)) {
582581
_debug("unlinking once-pending call %p { e=%lx f=%lx }",
@@ -589,7 +588,7 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)
589588
call->recvmsg_link.next = NULL;
590589
call->recvmsg_link.prev = NULL;
591590

592-
spin_unlock(&rx->recvmsg_lock);
591+
spin_unlock_irq(&rx->recvmsg_lock);
593592
if (put)
594593
rxrpc_put_call(call, rxrpc_call_put_unnotify);
595594

‎net/rxrpc/conn_client.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,9 @@ void rxrpc_connect_client_calls(struct rxrpc_local *local)
510510
struct rxrpc_call *call;
511511
LIST_HEAD(new_client_calls);
512512

513-
spin_lock(&local->client_call_lock);
513+
spin_lock_irq(&local->client_call_lock);
514514
list_splice_tail_init(&local->new_client_calls, &new_client_calls);
515-
spin_unlock(&local->client_call_lock);
515+
spin_unlock_irq(&local->client_call_lock);
516516

517517
while ((call = list_first_entry_or_null(&new_client_calls,
518518
struct rxrpc_call, wait_link))) {
@@ -547,9 +547,9 @@ void rxrpc_expose_client_call(struct rxrpc_call *call)
547547
set_bit(RXRPC_CONN_DONT_REUSE, &conn->flags);
548548
trace_rxrpc_client(conn, channel, rxrpc_client_exposed);
549549

550-
spin_lock(&call->peer->lock);
550+
spin_lock_irq(&call->peer->lock);
551551
hlist_add_head(&call->error_link, &call->peer->error_targets);
552-
spin_unlock(&call->peer->lock);
552+
spin_unlock_irq(&call->peer->lock);
553553
}
554554
}
555555

@@ -590,9 +590,9 @@ void rxrpc_disconnect_client_call(struct rxrpc_bundle *bundle, struct rxrpc_call
590590
ASSERTCMP(call->call_id, ==, 0);
591591
ASSERT(!test_bit(RXRPC_CALL_EXPOSED, &call->flags));
592592
/* May still be on ->new_client_calls. */
593-
spin_lock(&local->client_call_lock);
593+
spin_lock_irq(&local->client_call_lock);
594594
list_del_init(&call->wait_link);
595-
spin_unlock(&local->client_call_lock);
595+
spin_unlock_irq(&local->client_call_lock);
596596
return;
597597
}
598598

‎net/rxrpc/conn_event.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static bool rxrpc_set_conn_aborted(struct rxrpc_connection *conn, struct sk_buff
2626
bool aborted = false;
2727

2828
if (conn->state != RXRPC_CONN_ABORTED) {
29-
spin_lock(&conn->state_lock);
29+
spin_lock_irq(&conn->state_lock);
3030
if (conn->state != RXRPC_CONN_ABORTED) {
3131
conn->abort_code = abort_code;
3232
conn->error = err;
@@ -37,7 +37,7 @@ static bool rxrpc_set_conn_aborted(struct rxrpc_connection *conn, struct sk_buff
3737
set_bit(RXRPC_CONN_EV_ABORT_CALLS, &conn->events);
3838
aborted = true;
3939
}
40-
spin_unlock(&conn->state_lock);
40+
spin_unlock_irq(&conn->state_lock);
4141
}
4242

4343
return aborted;
@@ -261,10 +261,10 @@ static int rxrpc_process_event(struct rxrpc_connection *conn,
261261
if (ret < 0)
262262
return ret;
263263

264-
spin_lock(&conn->state_lock);
264+
spin_lock_irq(&conn->state_lock);
265265
if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING)
266266
conn->state = RXRPC_CONN_SERVICE;
267-
spin_unlock(&conn->state_lock);
267+
spin_unlock_irq(&conn->state_lock);
268268

269269
if (conn->state == RXRPC_CONN_SERVICE) {
270270
/* Offload call state flipping to the I/O thread. As

‎net/rxrpc/conn_object.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ void rxrpc_poke_conn(struct rxrpc_connection *conn, enum rxrpc_conn_trace why)
3131
if (WARN_ON_ONCE(!local))
3232
return;
3333

34-
spin_lock_bh(&local->lock);
34+
spin_lock_irq(&local->lock);
3535
busy = !list_empty(&conn->attend_link);
3636
if (!busy) {
3737
rxrpc_get_connection(conn, why);
3838
list_add_tail(&conn->attend_link, &local->conn_attend_q);
3939
}
40-
spin_unlock_bh(&local->lock);
40+
spin_unlock_irq(&local->lock);
4141
rxrpc_wake_up_io_thread(local);
4242
}
4343

@@ -196,9 +196,9 @@ void rxrpc_disconnect_call(struct rxrpc_call *call)
196196
call->peer->cong_ssthresh = call->cong_ssthresh;
197197

198198
if (!hlist_unhashed(&call->error_link)) {
199-
spin_lock(&call->peer->lock);
199+
spin_lock_irq(&call->peer->lock);
200200
hlist_del_init(&call->error_link);
201-
spin_unlock(&call->peer->lock);
201+
spin_unlock_irq(&call->peer->lock);
202202
}
203203

204204
if (rxrpc_is_client_call(call)) {

‎net/rxrpc/input.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ static void rxrpc_input_queue_data(struct rxrpc_call *call, struct sk_buff *skb,
424424
struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
425425
bool last = sp->hdr.flags & RXRPC_LAST_PACKET;
426426

427-
__skb_queue_tail(&call->recvmsg_queue, skb);
427+
skb_queue_tail(&call->recvmsg_queue, skb);
428428
rxrpc_input_update_ack_window(call, window, wtop);
429429
trace_rxrpc_receive(call, last ? why + 1 : why, sp->hdr.serial, sp->hdr.seq);
430430
if (last)
@@ -501,7 +501,6 @@ static void rxrpc_input_data_one(struct rxrpc_call *call, struct sk_buff *skb,
501501

502502
rxrpc_get_skb(skb, rxrpc_skb_get_to_recvmsg);
503503

504-
spin_lock(&call->recvmsg_queue.lock);
505504
rxrpc_input_queue_data(call, skb, window, wtop, rxrpc_receive_queue);
506505
*_notify = true;
507506

@@ -523,8 +522,6 @@ static void rxrpc_input_data_one(struct rxrpc_call *call, struct sk_buff *skb,
523522
rxrpc_receive_queue_oos);
524523
}
525524

526-
spin_unlock(&call->recvmsg_queue.lock);
527-
528525
call->ackr_sack_base = sack;
529526
} else {
530527
unsigned int slot;

‎net/rxrpc/io_thread.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,9 @@ int rxrpc_io_thread(void *data)
500500
}
501501

502502
/* Deal with connections that want immediate attention. */
503-
spin_lock_bh(&local->lock);
503+
spin_lock_irq(&local->lock);
504504
list_splice_tail_init(&local->conn_attend_q, &conn_attend_q);
505-
spin_unlock_bh(&local->lock);
505+
spin_unlock_irq(&local->lock);
506506

507507
while ((conn = list_first_entry_or_null(&conn_attend_q,
508508
struct rxrpc_connection,
@@ -519,9 +519,9 @@ int rxrpc_io_thread(void *data)
519519
rxrpc_discard_expired_client_conns(local);
520520

521521
/* Deal with calls that want immediate attention. */
522-
spin_lock_bh(&local->lock);
522+
spin_lock_irq(&local->lock);
523523
list_splice_tail_init(&local->call_attend_q, &call_attend_q);
524-
spin_unlock_bh(&local->lock);
524+
spin_unlock_irq(&local->lock);
525525

526526
while ((call = list_first_entry_or_null(&call_attend_q,
527527
struct rxrpc_call,

‎net/rxrpc/peer_event.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,23 +213,23 @@ static void rxrpc_distribute_error(struct rxrpc_peer *peer, struct sk_buff *skb,
213213
struct rxrpc_call *call;
214214
HLIST_HEAD(error_targets);
215215

216-
spin_lock(&peer->lock);
216+
spin_lock_irq(&peer->lock);
217217
hlist_move_list(&peer->error_targets, &error_targets);
218218

219219
while (!hlist_empty(&error_targets)) {
220220
call = hlist_entry(error_targets.first,
221221
struct rxrpc_call, error_link);
222222
hlist_del_init(&call->error_link);
223-
spin_unlock(&peer->lock);
223+
spin_unlock_irq(&peer->lock);
224224

225225
rxrpc_see_call(call, rxrpc_call_see_distribute_error);
226226
rxrpc_set_call_completion(call, compl, 0, -err);
227227
rxrpc_input_call_event(call);
228228

229-
spin_lock(&peer->lock);
229+
spin_lock_irq(&peer->lock);
230230
}
231231

232-
spin_unlock(&peer->lock);
232+
spin_unlock_irq(&peer->lock);
233233
}
234234

235235
/*

0 commit comments

Comments
 (0)