rxrpc: Increasing SACK size and moving away from softirq, part 5
Subsystems (4)
David Howells
maintainercover rxrpc: Increasing SACK size and moving away from softirq, part 5
Here's the fifth part of patches in the process of moving rxrpc from doing a lot of its stuff in softirq context to doing it in an I/O thread in process context and thereby making it easier to support a larger SACK table.
The full description is in the description for the first part[1] which is now upstream. The second and third parts are also upstream[2]. A subset of the original fourth part[3] got applied as a fix for a race[4].
The fifth part includes some cleanups:
(1) Miscellaneous trace header cleanups: fix a trace string, display the security index in rx_packet rather than displaying the type twice, remove some whitespace to make checkpatch happier and remove some excess tabulation.
(2) Convert ->recvmsg_lock to a spinlock as it's only ever locked exclusively.
(3) Make ->ackr_window and ->ackr_nr_unacked non-atomic as they're only used in the I/O thread.
(4) Don't use call->tx_lock to access ->tx_buffer as that is only accessed inside the I/O thread. sendmsg() loads onto ->tx_sendmsg and the I/O thread decants from that to the buffer.
(5) Remove local->defrag_sem as DATA packets are transmitted serially by the I/O thread.
(6) Remove the service connection bundle is it was only used for its channel_lock - which has now gone.
And some more significant changes:
(7) Add a debugging option to allow a delay to be injected into packet reception to help investigate the behaviour over longer links than just a few cm.
(8) Generate occasional PING ACKs to probe for RTT information during a receive heavy call.
(9) Simplify the SACK table maintenance and ACK generation. Now that both parts are done in the same thread, there's no possibility of a race and no need to try and be cunning to avoid taking a BH spinlock whilst copying the SACK table (which in the future will be up to 2K) and no need to rotate the copy to fit the ACK packet table.
(10) Use SKB_CONSUMED when freeing received DATA packets (stop dropwatch complaining).
The patches are tagged here:
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/rxrpc-next-20230131
And can be found on this branch:
http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=rxrpc-next
David
David Howells (13):
rxrpc: Fix trace string
rxrpc: Remove whitespace before ')' in trace header
rxrpc: Shrink the tabulation in the rxrpc trace header a bit
rxrpc: Convert call->recvmsg_lock to a spinlock
rxrpc: Allow a delay to be injected into packet reception
rxrpc: Generate extra pings for RTT during heavy-receive call
rxrpc: De-atomic call->ackr_window and call->ackr_nr_unacked
rxrpc: Simplify ACK handling
rxrpc: Don't lock call->tx_lock to access call->tx_buffer
rxrpc: Remove local->defrag_sem
rxrpc: Show consumed and freed packets as non-dropped in dropwatch
rxrpc: Change rx_packet tracepoint to display securityIndex not type
twice
rxrpc: Kill service bundle
include/trace/events/rxrpc.h | 480 +++++++++++++++++++---------------- net/rxrpc/Kconfig | 9 + net/rxrpc/af_rxrpc.c | 2 +- net/rxrpc/ar-internal.h | 15 +- net/rxrpc/call_accept.c | 2 +- net/rxrpc/call_event.c | 15 +- net/rxrpc/call_object.c | 7 +- net/rxrpc/conn_service.c | 7 - net/rxrpc/input.c | 60 ++--- net/rxrpc/io_thread.c | 48 +++- net/rxrpc/local_object.c | 7 +- net/rxrpc/misc.c | 7 + net/rxrpc/output.c | 69 ++--- net/rxrpc/proc.c | 4 +- net/rxrpc/recvmsg.c | 18 +- net/rxrpc/skbuff.c | 4 +- net/rxrpc/sysctl.c | 17 +- net/rxrpc/txbuf.c | 12 +- 18 files changed, 438 insertions(+), 345 deletions(-)
David Howells
maintainerPATCH 1/13 rxrpc: Fix trace string
Fix a trace string to indicate that it's discarding the local endpoint for a preallocated peer, not a preallocated connection.
--- include/trace/events/rxrpc.h | 2 +- net/rxrpc/call_accept.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/trace/events/rxrpc.h +1 -1
@@ -163,7 +163,7 @@ EM(rxrpc_local_put_for_use, "PUT for-use ") \ EM(rxrpc_local_put_kill_conn, "PUT conn-kil") \ EM(rxrpc_local_put_peer, "PUT peer ") \ - EM(rxrpc_local_put_prealloc_conn, "PUT conn-pre") \ + EM(rxrpc_local_put_prealloc_peer, "PUT peer-pre") \ EM(rxrpc_local_put_release_sock, "PUT rel-sock") \ EM(rxrpc_local_stop, "STOP ") \EM (rxrpc_local_stopped,"STOPPED " ) \
net/rxrpc/call_accept.c +1 -1
@@ -195,7 +195,7 @@ void rxrpc_discard_prealloc(struct rxrpc_sock *rx) tail = b->peer_backlog_tail;while (CIRC_CNT (head, tail, size) >0 ) {struct rxrpc_peer *peer = b->peer_backlog[tail]; -rxrpc_put_local (peer->local, rxrpc_local_put_prealloc_conn); +rxrpc_put_local (peer->local, rxrpc_local_put_prealloc_peer);kfree (peer); tail = (tail +1 ) & (size -1 ); }
David Howells
maintainerPATCH 2/13 rxrpc: Remove whitespace before ')' in trace header
In reply to David HowellsWork around checkpatch warnings in the rxrpc trace header by removing whitespace before ')' on lines defining the trace record struct.
--- include/trace/events/rxrpc.h | 426 +++++++++++++++++------------------ 1 file changed, 213 insertions(+), 213 deletions(-)
include/trace/events/rxrpc.h +213 -213
@@ -552,10 +552,10 @@ TRACE_EVENT(rxrpc_local, TP_ARGS(local_debug_id, op, ref, usage),TP_STRUCT__entry ( -__field (unsigned int ,local ) -__field (int, op ) -__field (int, ref ) -__field (int, usage ) +__field (unsigned int ,local ) +__field (int, op) +__field (int, ref) +__field (int, usage) ), TP_fast_assign(
@@ -578,9 +578,9 @@ TRACE_EVENT(rxrpc_peer, TP_ARGS(peer_debug_id, ref, why),TP_STRUCT__entry ( -__field (unsigned int ,peer ) -__field (int, ref ) - __field(enum rxrpc_peer_trace, why ) +__field (unsigned int ,peer ) +__field (int, ref) + __field(enum rxrpc_peer_trace, why) ), TP_fast_assign(
@@ -601,9 +601,9 @@ TRACE_EVENT(rxrpc_bundle, TP_ARGS(bundle_debug_id, ref, why),TP_STRUCT__entry ( -__field (unsigned int ,bundle ) -__field (int, ref ) -__field (int, why ) +__field (unsigned int ,bundle ) +__field (int, ref) +__field (int, why) ), TP_fast_assign(
@@ -624,9 +624,9 @@ TRACE_EVENT(rxrpc_conn, TP_ARGS(conn_debug_id, ref, why),TP_STRUCT__entry ( -__field (unsigned int ,conn ) -__field (int, ref ) -__field (int, why ) +__field (unsigned int ,conn ) +__field (int, ref) +__field (int, why) ), TP_fast_assign(
@@ -648,11 +648,11 @@ TRACE_EVENT(rxrpc_client, TP_ARGS(conn, channel, op),TP_STRUCT__entry ( -__field (unsigned int ,conn ) -__field (u32, cid ) -__field (int, channel ) -__field (int, usage ) - __field(enum rxrpc_client_trace, op ) +__field (unsigned int ,conn ) +__field (u32, cid) +__field (int, channel) +__field (int, usage) + __field(enum rxrpc_client_trace, op) ), TP_fast_assign(
@@ -678,10 +678,10 @@ TRACE_EVENT(rxrpc_call, TP_ARGS(call_debug_id, ref, aux, why),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (int, ref ) -__field (int, why ) - __field(unsigned long, aux ) +__field (unsigned int ,call ) +__field (int, ref) +__field (int, why) + __field(unsigned long, aux) ), TP_fast_assign(
@@ -705,10 +705,10 @@ TRACE_EVENT(rxrpc_skb, TP_ARGS(skb, usage, mod_count, why),TP_STRUCT__entry ( -__field (struct sk_buff *,skb ) -__field (int, usage ) -__field (int, mod_count ) - __field(enum rxrpc_skb_trace, why ) +__field (struct sk_buff *,skb ) +__field (int, usage) +__field (int, mod_count) + __field(enum rxrpc_skb_trace, why) ), TP_fast_assign(
@@ -731,7 +731,7 @@ TRACE_EVENT(rxrpc_rx_packet,TP_ARGS (sp),TP_STRUCT__entry ( -__field_struct (struct rxrpc_host_header ,hdr ) +__field_struct (struct rxrpc_host_header ,hdr ) ), TP_fast_assign(
@@ -753,8 +753,8 @@ TRACE_EVENT(rxrpc_rx_done,TP_ARGS (result, abort_code),TP_STRUCT__entry ( - __field(int, result ) -__field (int, abort_code ) + __field(int, result) +__field (int, abort_code) ), TP_fast_assign(
@@ -772,13 +772,13 @@ TRACE_EVENT(rxrpc_abort, TP_ARGS(call_nr, why, cid, call_id, seq, abort_code, error),TP_STRUCT__entry ( -__field (unsigned int ,call_nr ) - __field(enum rxrpc_abort_reason, why ) -__field (u32, cid ) -__field (u32, call_id ) -__field (rxrpc_seq_t, seq ) -__field (int, abort_code ) -__field (int, error ) +__field (unsigned int ,call_nr ) + __field(enum rxrpc_abort_reason, why) +__field (u32, cid) +__field (u32, call_id) +__field (rxrpc_seq_t, seq) +__field (int, abort_code) +__field (int, error) ), TP_fast_assign(
@@ -804,10 +804,10 @@ TRACE_EVENT(rxrpc_call_complete,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (enum rxrpc_call_completion ,compl ) -__field (int, error ) -__field (u32, abort_code ) + __field(unsigned int, call) +__field (enum rxrpc_call_completion ,compl ) +__field (int, error) +__field (u32, abort_code) ), TP_fast_assign(
@@ -830,13 +830,13 @@ TRACE_EVENT(rxrpc_txqueue, TP_ARGS(call, why),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_txqueue_trace, why ) -__field (rxrpc_seq_t, acks_hard_ack ) -__field (rxrpc_seq_t, tx_bottom ) -__field (rxrpc_seq_t, tx_top ) -__field (rxrpc_seq_t, tx_prepared ) -__field (int, tx_winsize ) +__field (unsigned int ,call ) + __field(enum rxrpc_txqueue_trace, why) +__field (rxrpc_seq_t, acks_hard_ack) +__field (rxrpc_seq_t, tx_bottom) +__field (rxrpc_seq_t, tx_top) +__field (rxrpc_seq_t, tx_prepared) +__field (int, tx_winsize) ), TP_fast_assign(
@@ -867,10 +867,10 @@ TRACE_EVENT(rxrpc_rx_data, TP_ARGS(call, seq, serial, flags),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq ) -__field (rxrpc_serial_t, serial ) -__field (u8, flags ) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (rxrpc_serial_t, serial) +__field (u8, flags) ), TP_fast_assign(
@@ -895,13 +895,13 @@ TRACE_EVENT(rxrpc_rx_ack, TP_ARGS(call, serial, ack_serial, first, prev, reason, n_acks),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial ) -__field (rxrpc_serial_t, ack_serial ) -__field (rxrpc_seq_t, first ) -__field (rxrpc_seq_t, prev ) -__field (u8, reason ) -__field (u8, n_acks ) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (rxrpc_serial_t, ack_serial) +__field (rxrpc_seq_t, first) +__field (rxrpc_seq_t, prev) +__field (u8, reason) +__field (u8, n_acks) ), TP_fast_assign(
@@ -931,9 +931,9 @@ TRACE_EVENT(rxrpc_rx_abort, TP_ARGS(call, serial, abort_code),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial ) -__field (u32, abort_code ) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (u32, abort_code) ), TP_fast_assign(
@@ -955,11 +955,11 @@ TRACE_EVENT(rxrpc_rx_challenge, TP_ARGS(conn, serial, version, nonce, min_level),TP_STRUCT__entry ( -__field (unsigned int ,conn ) -__field (rxrpc_serial_t, serial ) -__field (u32, version ) -__field (u32, nonce ) -__field (u32, min_level ) +__field (unsigned int ,conn ) +__field (rxrpc_serial_t, serial) +__field (u32, version) +__field (u32, nonce) +__field (u32, min_level) ), TP_fast_assign(
@@ -985,11 +985,11 @@ TRACE_EVENT(rxrpc_rx_response, TP_ARGS(conn, serial, version, kvno, ticket_len),TP_STRUCT__entry ( -__field (unsigned int ,conn ) -__field (rxrpc_serial_t, serial ) -__field (u32, version ) -__field (u32, kvno ) -__field (u32, ticket_len ) +__field (unsigned int ,conn ) +__field (rxrpc_serial_t, serial) +__field (u32, version) +__field (u32, kvno) +__field (u32, ticket_len) ), TP_fast_assign(
@@ -1015,10 +1015,10 @@ TRACE_EVENT(rxrpc_rx_rwind_change, TP_ARGS(call, serial, rwind, wake),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial ) -__field (u32, rwind ) -__field (bool, wake ) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (u32, rwind) +__field (bool, wake) ), TP_fast_assign(
@@ -1042,9 +1042,9 @@ TRACE_EVENT(rxrpc_tx_packet,TP_ARGS (call_id, whdr, where),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(enum rxrpc_tx_point, where ) - __field_struct(struct rxrpc_wire_header, whdr ) + __field(unsigned int, call) + __field(enum rxrpc_tx_point, where) + __field_struct(struct rxrpc_wire_header, whdr) ), TP_fast_assign(
@@ -1074,14 +1074,14 @@ TRACE_EVENT(rxrpc_tx_data, TP_ARGS(call, seq, serial, flags, retrans, lose),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq ) -__field (rxrpc_serial_t, serial ) -__field (u32, cid ) -__field (u32, call_id ) -__field (u8, flags ) -__field (bool, retrans ) -__field (bool, lose ) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (rxrpc_serial_t, serial) +__field (u32, cid) +__field (u32, call_id) +__field (u8, flags) +__field (bool, retrans) +__field (bool, lose) ), TP_fast_assign(
@@ -1114,12 +1114,12 @@ TRACE_EVENT(rxrpc_tx_ack, TP_ARGS(call, serial, ack_first, ack_serial, reason, n_acks),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial ) -__field (rxrpc_seq_t, ack_first ) -__field (rxrpc_serial_t, ack_serial ) -__field (u8, reason ) -__field (u8, n_acks ) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (rxrpc_seq_t, ack_first) +__field (rxrpc_serial_t, ack_serial) +__field (u8, reason) +__field (u8, n_acks) ), TP_fast_assign(
@@ -1147,11 +1147,11 @@ TRACE_EVENT(rxrpc_receive, TP_ARGS(call, why, serial, seq),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_receive_trace, why ) -__field (rxrpc_serial_t, serial ) -__field (rxrpc_seq_t, seq ) -__field (u64, window ) +__field (unsigned int ,call ) + __field(enum rxrpc_receive_trace, why) +__field (rxrpc_serial_t, serial) +__field (rxrpc_seq_t, seq) +__field (u64, window) ), TP_fast_assign(
@@ -1178,9 +1178,9 @@ TRACE_EVENT(rxrpc_recvmsg,TP_ARGS (call_debug_id, why, ret),TP_STRUCT__entry ( - __field(unsigned int, call ) - __field(enum rxrpc_recvmsg_trace, why ) -__field (int, ret ) + __field(unsigned int, call) + __field(enum rxrpc_recvmsg_trace, why) +__field (int, ret) ), TP_fast_assign(
@@ -1203,12 +1203,12 @@ TRACE_EVENT(rxrpc_recvdata, TP_ARGS(call, why, seq, offset, len, ret),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_recvmsg_trace, why ) -__field (rxrpc_seq_t, seq ) - __field(unsigned int, offset ) - __field(unsigned int, len ) -__field (int, ret ) +__field (unsigned int ,call ) + __field(enum rxrpc_recvmsg_trace, why) +__field (rxrpc_seq_t, seq) + __field(unsigned int, offset) + __field(unsigned int, len) +__field (int, ret) ), TP_fast_assign(
@@ -1236,10 +1236,10 @@ TRACE_EVENT(rxrpc_rtt_tx, TP_ARGS(call, why, slot, send_serial),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_rtt_tx_trace, why ) -__field (int, slot ) -__field (rxrpc_serial_t, send_serial ) +__field (unsigned int ,call ) + __field(enum rxrpc_rtt_tx_trace, why) +__field (int, slot) +__field (rxrpc_serial_t, send_serial) ), TP_fast_assign(
@@ -1265,13 +1265,13 @@ TRACE_EVENT(rxrpc_rtt_rx, TP_ARGS(call, why, slot, send_serial, resp_serial, rtt, rto),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_rtt_rx_trace, why ) -__field (int, slot ) -__field (rxrpc_serial_t, send_serial ) -__field (rxrpc_serial_t, resp_serial ) -__field (u32, rtt ) -__field (u32, rto ) +__field (unsigned int ,call ) + __field(enum rxrpc_rtt_rx_trace, why) +__field (int, slot) +__field (rxrpc_serial_t, send_serial) +__field (rxrpc_serial_t, resp_serial) +__field (u32, rtt) +__field (u32, rto) ), TP_fast_assign(
@@ -1301,17 +1301,17 @@ TRACE_EVENT(rxrpc_timer, TP_ARGS(call, why, now),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_timer_trace, why ) -__field (long, now ) -__field (long, ack_at ) -__field (long, ack_lost_at ) -__field (long, resend_at ) -__field (long, ping_at ) -__field (long, expect_rx_by ) -__field (long, expect_req_by ) -__field (long, expect_term_by ) -__field (long, timer ) +__field (unsigned int ,call ) + __field(enum rxrpc_timer_trace, why) +__field (long, now) +__field (long, ack_at) +__field (long, ack_lost_at) +__field (long, resend_at) +__field (long, ping_at) +__field (long, expect_rx_by) +__field (long, expect_req_by) +__field (long, expect_term_by) +__field (long, timer) ), TP_fast_assign(
@@ -1345,16 +1345,16 @@ TRACE_EVENT(rxrpc_timer_expired, TP_ARGS(call, now),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (long, now ) -__field (long, ack_at ) -__field (long, ack_lost_at ) -__field (long, resend_at ) -__field (long, ping_at ) -__field (long, expect_rx_by ) -__field (long, expect_req_by ) -__field (long, expect_term_by ) -__field (long, timer ) +__field (unsigned int ,call ) +__field (long, now) +__field (long, ack_at) +__field (long, ack_lost_at) +__field (long, resend_at) +__field (long, ping_at) +__field (long, expect_rx_by) +__field (long, expect_req_by) +__field (long, expect_term_by) +__field (long, timer) ), TP_fast_assign(
@@ -1386,7 +1386,7 @@ TRACE_EVENT(rxrpc_rx_lose,TP_ARGS (sp),TP_STRUCT__entry ( -__field_struct (struct rxrpc_host_header ,hdr ) +__field_struct (struct rxrpc_host_header ,hdr ) ), TP_fast_assign(
@@ -1409,10 +1409,10 @@ TRACE_EVENT(rxrpc_propose_ack, TP_ARGS(call, why, ack_reason, serial),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_propose_ack_trace, why ) -__field (rxrpc_serial_t, serial ) -__field (u8, ack_reason ) +__field (unsigned int ,call ) + __field(enum rxrpc_propose_ack_trace, why) +__field (rxrpc_serial_t, serial) +__field (u8, ack_reason) ), TP_fast_assign(
@@ -1436,10 +1436,10 @@ TRACE_EVENT(rxrpc_send_ack, TP_ARGS(call, why, ack_reason, serial),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_propose_ack_trace, why ) -__field (rxrpc_serial_t, serial ) -__field (u8, ack_reason ) +__field (unsigned int ,call ) + __field(enum rxrpc_propose_ack_trace, why) +__field (rxrpc_serial_t, serial) +__field (u8, ack_reason) ), TP_fast_assign(
@@ -1463,11 +1463,11 @@ TRACE_EVENT(rxrpc_drop_ack, TP_ARGS(call, why, ack_reason, serial, nobuf),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_propose_ack_trace, why ) -__field (rxrpc_serial_t, serial ) -__field (u8, ack_reason ) -__field (bool, nobuf ) +__field (unsigned int ,call ) + __field(enum rxrpc_propose_ack_trace, why) +__field (rxrpc_serial_t, serial) +__field (u8, ack_reason) +__field (bool, nobuf) ), TP_fast_assign(
@@ -1491,9 +1491,9 @@ TRACE_EVENT(rxrpc_retransmit, TP_ARGS(call, seq, expiry),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq ) -__field (s64, expiry ) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (s64, expiry) ), TP_fast_assign(
@@ -1515,13 +1515,13 @@ TRACE_EVENT(rxrpc_congest, TP_ARGS(call, summary, ack_serial, change),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_congest_change, change ) -__field (rxrpc_seq_t, hard_ack ) -__field (rxrpc_seq_t, top ) -__field (rxrpc_seq_t, lowest_nak ) -__field (rxrpc_serial_t, ack_serial ) - __field_struct(struct rxrpc_ack_summary, sum ) +__field (unsigned int ,call ) + __field(enum rxrpc_congest_change, change) +__field (rxrpc_seq_t, hard_ack) +__field (rxrpc_seq_t, top) +__field (rxrpc_seq_t, lowest_nak) +__field (rxrpc_serial_t, ack_serial) + __field_struct(struct rxrpc_ack_summary, sum) ), TP_fast_assign(
@@ -1559,14 +1559,14 @@ TRACE_EVENT(rxrpc_reset_cwnd, TP_ARGS(call, now),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_congest_mode, mode ) - __field(unsigned short, cwnd ) - __field(unsigned short, extra ) -__field (rxrpc_seq_t, hard_ack ) -__field (rxrpc_seq_t, prepared ) -__field (ktime_t, since_last_tx ) -__field (bool, has_data ) +__field (unsigned int ,call ) + __field(enum rxrpc_congest_mode, mode) + __field(unsigned short, cwnd) + __field(unsigned short, extra) +__field (rxrpc_seq_t, hard_ack) +__field (rxrpc_seq_t, prepared) +__field (ktime_t, since_last_tx) +__field (bool, has_data) ), TP_fast_assign(
@@ -1597,8 +1597,8 @@ TRACE_EVENT(rxrpc_disconnect_call,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (u32 ,abort_code ) + __field(unsigned int, call) +__field (u32 ,abort_code ) ), TP_fast_assign(
@@ -1617,8 +1617,8 @@ TRACE_EVENT(rxrpc_improper_term,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (u32 ,abort_code ) + __field(unsigned int, call) +__field (u32 ,abort_code ) ), TP_fast_assign(
@@ -1637,11 +1637,11 @@ TRACE_EVENT(rxrpc_connect_call,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call ) -__field (unsigned long ,user_call_ID ) -__field (u32, cid ) -__field (u32, call_id ) - __field_struct(struct sockaddr_rxrpc, srx ) + __field(unsigned int, call) +__field (unsigned long ,user_call_ID ) +__field (u32, cid) +__field (u32, call_id) + __field_struct(struct sockaddr_rxrpc, srx) ), TP_fast_assign(
@@ -1666,10 +1666,10 @@ TRACE_EVENT(rxrpc_resend, TP_ARGS(call, ack),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq ) -__field (rxrpc_seq_t, transmitted ) -__field (rxrpc_serial_t, ack_serial ) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (rxrpc_seq_t, transmitted) +__field (rxrpc_serial_t, ack_serial) ), TP_fast_assign(
@@ -1694,9 +1694,9 @@ TRACE_EVENT(rxrpc_rx_icmp,TP_ARGS (peer, ee, srx),TP_STRUCT__entry ( - __field(unsigned int, peer ) - __field_struct(struct sock_extended_err, ee ) - __field_struct(struct sockaddr_rxrpc, srx ) + __field(unsigned int, peer) + __field_struct(struct sock_extended_err, ee) + __field_struct(struct sockaddr_rxrpc, srx) ), TP_fast_assign(
@@ -1723,10 +1723,10 @@ TRACE_EVENT(rxrpc_tx_fail, TP_ARGS(debug_id, serial, ret, where),TP_STRUCT__entry ( -__field (unsigned int ,debug_id ) -__field (rxrpc_serial_t, serial ) -__field (int, ret ) - __field(enum rxrpc_tx_point, where ) +__field (unsigned int ,debug_id ) +__field (rxrpc_serial_t, serial) +__field (int, ret) + __field(enum rxrpc_tx_point, where) ), TP_fast_assign(
@@ -1749,13 +1749,13 @@ TRACE_EVENT(rxrpc_call_reset,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, debug_id ) -__field (u32 ,cid ) -__field (u32, call_id ) -__field (rxrpc_serial_t, call_serial ) -__field (rxrpc_serial_t, conn_serial ) -__field (rxrpc_seq_t, tx_seq ) -__field (rxrpc_seq_t, rx_seq ) + __field(unsigned int, debug_id) +__field (u32 ,cid ) +__field (u32, call_id) +__field (rxrpc_serial_t, call_serial) +__field (rxrpc_serial_t, conn_serial) +__field (rxrpc_seq_t, tx_seq) +__field (rxrpc_seq_t, rx_seq) ), TP_fast_assign(
@@ -1781,8 +1781,8 @@ TRACE_EVENT(rxrpc_notify_socket,TP_ARGS (debug_id, serial),TP_STRUCT__entry ( - __field(unsigned int, debug_id ) -__field (rxrpc_serial_t, serial ) + __field(unsigned int, debug_id) +__field (rxrpc_serial_t, serial) ), TP_fast_assign(
@@ -1804,8 +1804,8 @@ TRACE_EVENT(rxrpc_rx_discard_ack, prev_pkt, call_ackr_prev),TP_STRUCT__entry ( -__field (unsigned int ,debug_id ) -__field (rxrpc_serial_t, serial ) +__field (unsigned int ,debug_id ) +__field (rxrpc_serial_t, serial)__field (rxrpc_seq_t, first_soft_ack)__field (rxrpc_seq_t, call_ackr_first) __field(rxrpc_seq_t, prev_pkt)
@@ -1837,9 +1837,9 @@ TRACE_EVENT(rxrpc_req_ack, TP_ARGS(call_debug_id, seq, why),TP_STRUCT__entry ( -__field (unsigned int ,call_debug_id ) -__field (rxrpc_seq_t, seq ) - __field(enum rxrpc_req_ack_trace, why ) +__field (unsigned int ,call_debug_id ) +__field (rxrpc_seq_t, seq) + __field(enum rxrpc_req_ack_trace, why) ), TP_fast_assign(
@@ -1862,11 +1862,11 @@ TRACE_EVENT(rxrpc_txbuf, TP_ARGS(debug_id, call_debug_id, seq, ref, what),TP_STRUCT__entry ( -__field (unsigned int ,debug_id ) - __field(unsigned int, call_debug_id ) -__field (rxrpc_seq_t, seq ) -__field (int, ref ) - __field(enum rxrpc_txbuf_trace, what ) +__field (unsigned int ,debug_id ) + __field(unsigned int, call_debug_id) +__field (rxrpc_seq_t, seq) +__field (int, ref) + __field(enum rxrpc_txbuf_trace, what) ), TP_fast_assign(
@@ -1892,9 +1892,9 @@ TRACE_EVENT(rxrpc_poke_call, TP_ARGS(call, busy, what),TP_STRUCT__entry ( -__field (unsigned int ,call_debug_id ) -__field (bool, busy ) - __field(enum rxrpc_call_poke_trace, what ) +__field (unsigned int ,call_debug_id ) +__field (bool, busy) + __field(enum rxrpc_call_poke_trace, what) ), TP_fast_assign(
@@ -1915,7 +1915,7 @@ TRACE_EVENT(rxrpc_call_poked,TP_ARGS (call),TP_STRUCT__entry ( -__field (unsigned int ,call_debug_id ) +__field (unsigned int ,call_debug_id ) ), TP_fast_assign(
David Howells
maintainerPATCH 3/13 rxrpc: Shrink the tabulation in the rxrpc trace header a bit
In reply to David HowellsShrink the tabulation in the rxrpc trace header a bit to allow for fields with long type names that have been removed.
--- include/trace/events/rxrpc.h | 196 +++++++++++++++++------------------ 1 file changed, 98 insertions(+), 98 deletions(-)
include/trace/events/rxrpc.h +98 -98
@@ -678,10 +678,10 @@ TRACE_EVENT(rxrpc_call, TP_ARGS(call_debug_id, ref, aux, why),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (int, ref) -__field (int, why) - __field(unsigned long, aux) +__field (unsigned int ,call ) +__field (int, ref) +__field (int, why) + __field(unsigned long, aux) ), TP_fast_assign(
@@ -753,8 +753,8 @@ TRACE_EVENT(rxrpc_rx_done,TP_ARGS (result, abort_code),TP_STRUCT__entry ( - __field(int, result) -__field (int, abort_code) + __field(int, result) +__field (int, abort_code) ), TP_fast_assign(
@@ -867,10 +867,10 @@ TRACE_EVENT(rxrpc_rx_data, TP_ARGS(call, seq, serial, flags),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq) -__field (rxrpc_serial_t, serial) -__field (u8, flags) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (rxrpc_serial_t, serial) +__field (u8, flags) ), TP_fast_assign(
@@ -895,13 +895,13 @@ TRACE_EVENT(rxrpc_rx_ack, TP_ARGS(call, serial, ack_serial, first, prev, reason, n_acks),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial) -__field (rxrpc_serial_t, ack_serial) -__field (rxrpc_seq_t, first) -__field (rxrpc_seq_t, prev) -__field (u8, reason) -__field (u8, n_acks) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (rxrpc_serial_t, ack_serial) +__field (rxrpc_seq_t, first) +__field (rxrpc_seq_t, prev) +__field (u8, reason) +__field (u8, n_acks) ), TP_fast_assign(
@@ -931,9 +931,9 @@ TRACE_EVENT(rxrpc_rx_abort, TP_ARGS(call, serial, abort_code),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial) -__field (u32, abort_code) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (u32, abort_code) ), TP_fast_assign(
@@ -955,11 +955,11 @@ TRACE_EVENT(rxrpc_rx_challenge, TP_ARGS(conn, serial, version, nonce, min_level),TP_STRUCT__entry ( -__field (unsigned int ,conn ) -__field (rxrpc_serial_t, serial) -__field (u32, version) -__field (u32, nonce) -__field (u32, min_level) +__field (unsigned int ,conn ) +__field (rxrpc_serial_t, serial) +__field (u32, version) +__field (u32, nonce) +__field (u32, min_level) ), TP_fast_assign(
@@ -985,11 +985,11 @@ TRACE_EVENT(rxrpc_rx_response, TP_ARGS(conn, serial, version, kvno, ticket_len),TP_STRUCT__entry ( -__field (unsigned int ,conn ) -__field (rxrpc_serial_t, serial) -__field (u32, version) -__field (u32, kvno) -__field (u32, ticket_len) +__field (unsigned int ,conn ) +__field (rxrpc_serial_t, serial) +__field (u32, version) +__field (u32, kvno) +__field (u32, ticket_len) ), TP_fast_assign(
@@ -1015,10 +1015,10 @@ TRACE_EVENT(rxrpc_rx_rwind_change, TP_ARGS(call, serial, rwind, wake),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial) -__field (u32, rwind) -__field (bool, wake) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (u32, rwind) +__field (bool, wake) ), TP_fast_assign(
@@ -1074,14 +1074,14 @@ TRACE_EVENT(rxrpc_tx_data, TP_ARGS(call, seq, serial, flags, retrans, lose),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq) -__field (rxrpc_serial_t, serial) -__field (u32, cid) -__field (u32, call_id) -__field (u8, flags) -__field (bool, retrans) -__field (bool, lose) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (rxrpc_serial_t, serial) +__field (u32, cid) +__field (u32, call_id) +__field (u8, flags) +__field (bool, retrans) +__field (bool, lose) ), TP_fast_assign(
@@ -1114,12 +1114,12 @@ TRACE_EVENT(rxrpc_tx_ack, TP_ARGS(call, serial, ack_first, ack_serial, reason, n_acks),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_serial_t, serial) -__field (rxrpc_seq_t, ack_first) -__field (rxrpc_serial_t, ack_serial) -__field (u8, reason) -__field (u8, n_acks) +__field (unsigned int ,call ) +__field (rxrpc_serial_t, serial) +__field (rxrpc_seq_t, ack_first) +__field (rxrpc_serial_t, ack_serial) +__field (u8, reason) +__field (u8, n_acks) ), TP_fast_assign(
@@ -1301,17 +1301,17 @@ TRACE_EVENT(rxrpc_timer, TP_ARGS(call, why, now),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_timer_trace, why) -__field (long, now) -__field (long, ack_at) -__field (long, ack_lost_at) -__field (long, resend_at) -__field (long, ping_at) -__field (long, expect_rx_by) -__field (long, expect_req_by) -__field (long, expect_term_by) -__field (long, timer) +__field (unsigned int ,call ) + __field(enum rxrpc_timer_trace, why) +__field (long, now) +__field (long, ack_at) +__field (long, ack_lost_at) +__field (long, resend_at) +__field (long, ping_at) +__field (long, expect_rx_by) +__field (long, expect_req_by) +__field (long, expect_term_by) +__field (long, timer) ), TP_fast_assign(
@@ -1345,16 +1345,16 @@ TRACE_EVENT(rxrpc_timer_expired, TP_ARGS(call, now),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (long, now) -__field (long, ack_at) -__field (long, ack_lost_at) -__field (long, resend_at) -__field (long, ping_at) -__field (long, expect_rx_by) -__field (long, expect_req_by) -__field (long, expect_term_by) -__field (long, timer) +__field (unsigned int ,call ) +__field (long, now) +__field (long, ack_at) +__field (long, ack_lost_at) +__field (long, resend_at) +__field (long, ping_at) +__field (long, expect_rx_by) +__field (long, expect_req_by) +__field (long, expect_term_by) +__field (long, timer) ), TP_fast_assign(
@@ -1491,9 +1491,9 @@ TRACE_EVENT(rxrpc_retransmit, TP_ARGS(call, seq, expiry),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq) -__field (s64, expiry) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (s64, expiry) ), TP_fast_assign(
@@ -1559,14 +1559,14 @@ TRACE_EVENT(rxrpc_reset_cwnd, TP_ARGS(call, now),TP_STRUCT__entry ( -__field (unsigned int ,call ) - __field(enum rxrpc_congest_mode, mode) - __field(unsigned short, cwnd) - __field(unsigned short, extra) -__field (rxrpc_seq_t, hard_ack) -__field (rxrpc_seq_t, prepared) -__field (ktime_t, since_last_tx) -__field (bool, has_data) +__field (unsigned int ,call ) + __field(enum rxrpc_congest_mode, mode) + __field(unsigned short, cwnd) + __field(unsigned short, extra) +__field (rxrpc_seq_t, hard_ack) +__field (rxrpc_seq_t, prepared) +__field (ktime_t, since_last_tx) +__field (bool, has_data) ), TP_fast_assign(
@@ -1597,8 +1597,8 @@ TRACE_EVENT(rxrpc_disconnect_call,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call) -__field (u32 ,abort_code ) + __field(unsigned int, call) +__field (u32 ,abort_code ) ), TP_fast_assign(
@@ -1617,8 +1617,8 @@ TRACE_EVENT(rxrpc_improper_term,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, call) -__field (u32 ,abort_code ) + __field(unsigned int, call) +__field (u32 ,abort_code ) ), TP_fast_assign(
@@ -1666,10 +1666,10 @@ TRACE_EVENT(rxrpc_resend, TP_ARGS(call, ack),TP_STRUCT__entry ( -__field (unsigned int ,call ) -__field (rxrpc_seq_t, seq) -__field (rxrpc_seq_t, transmitted) -__field (rxrpc_serial_t, ack_serial) +__field (unsigned int ,call ) +__field (rxrpc_seq_t, seq) +__field (rxrpc_seq_t, transmitted) +__field (rxrpc_serial_t, ack_serial) ), TP_fast_assign(
@@ -1749,13 +1749,13 @@ TRACE_EVENT(rxrpc_call_reset,TP_ARGS (call),TP_STRUCT__entry ( - __field(unsigned int, debug_id) -__field (u32 ,cid ) -__field (u32, call_id) -__field (rxrpc_serial_t, call_serial) -__field (rxrpc_serial_t, conn_serial) -__field (rxrpc_seq_t, tx_seq) -__field (rxrpc_seq_t, rx_seq) + __field(unsigned int, debug_id) +__field (u32 ,cid ) +__field (u32, call_id) +__field (rxrpc_serial_t, call_serial) +__field (rxrpc_serial_t, conn_serial) +__field (rxrpc_seq_t, tx_seq) +__field (rxrpc_seq_t, rx_seq) ), TP_fast_assign(
@@ -1781,8 +1781,8 @@ TRACE_EVENT(rxrpc_notify_socket,TP_ARGS (debug_id, serial),TP_STRUCT__entry ( - __field(unsigned int, debug_id) -__field (rxrpc_serial_t, serial) + __field(unsigned int, debug_id) +__field (rxrpc_serial_t, serial) ), TP_fast_assign(
@@ -1915,7 +1915,7 @@ TRACE_EVENT(rxrpc_call_poked,TP_ARGS (call),TP_STRUCT__entry ( -__field (unsigned int ,call_debug_id ) +__field (unsigned int ,call_debug_id ) ), TP_fast_assign(
David Howells
maintainerPATCH 4/13 rxrpc: Convert call->recvmsg_lock to a spinlock
In reply to David HowellsConvert call->recvmsg_lock to a spinlock as it's only ever write-locked.
--- net/rxrpc/af_rxrpc.c | 2 +- net/rxrpc/ar-internal.h | 2 +- net/rxrpc/call_object.c | 4 ++-- net/rxrpc/recvmsg.c | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-)
net/rxrpc/af_rxrpc.c +1 -1
@@ -786,7 +786,7 @@ static int rxrpc_create(struct net *net, struct socket *sock, int protocol,INIT_LIST_HEAD (&rx->sock_calls);INIT_LIST_HEAD (&rx->to_be_accepted);INIT_LIST_HEAD (&rx->recvmsg_q); -rwlock_init (&rx->recvmsg_lock); +spin_lock_init (&rx->recvmsg_lock);rwlock_init (&rx->call_lock);memset (&rx->srx,0 ,sizeof (rx->srx));
net/rxrpc/ar-internal.h +1 -1
@@ -149,7 +149,7 @@ struct rxrpc_sock {struct list_head sock_calls;/* List of calls owned by this socket */ struct list_head to_be_accepted;/* calls awaiting acceptance */ struct list_head recvmsg_q;/* Calls awaiting recvmsg's attention */ -rwlock_t recvmsg_lock;/* Lock for recvmsg_q */ +spinlock_t recvmsg_lock;/* Lock for recvmsg_q */ struct key *key;/* security for this socket */ struct key *securities;/* list of server security descriptors */ struct rb_root calls;/* User ID -> call mapping */
net/rxrpc/call_object.c +2 -2
@@ -560,7 +560,7 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)rxrpc_put_call_slot (call);/* Make sure we don't get any more notifications */ -write_lock (&rx->recvmsg_lock); +spin_lock (&rx->recvmsg_lock);if (!list_empty (&call->recvmsg_link)) { _debug("unlinking once-pending call %p { e=%lx f=%lx }",
@@ -573,7 +573,7 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call) call->recvmsg_link.next =NULL ; call->recvmsg_link.prev =NULL ; -write_unlock (&rx->recvmsg_lock); +spin_unlock (&rx->recvmsg_lock);if (put)rxrpc_put_call (call, rxrpc_call_put_unnotify);
net/rxrpc/recvmsg.c +6 -6
@@ -40,12 +40,12 @@ void rxrpc_notify_socket(struct rxrpc_call *call) call->notify_rx (sk, call, call->user_call_ID);spin_unlock (&call->notify_lock); }else { -write_lock (&rx->recvmsg_lock); +spin_lock (&rx->recvmsg_lock);if (list_empty (&call->recvmsg_link)) {rxrpc_get_call (call, rxrpc_call_get_notify_socket);list_add_tail (&call->recvmsg_link, &rx->recvmsg_q); } -write_unlock (&rx->recvmsg_lock); +spin_unlock (&rx->recvmsg_lock);if (!sock_flag (sk,SOCK_DEAD )) {_debug ("call %ps" , sk->sk_data_ready);
@@ -335,14 +335,14 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,/* Find the next call and dequeue it if we're not just peeking. If we * do dequeue it, that comes with a ref that we will need to release. */ -write_lock (&rx->recvmsg_lock); +spin_lock (&rx->recvmsg_lock); l = rx->recvmsg_q.next; call = list_entry(l, struct rxrpc_call, recvmsg_link);if (!(flags &MSG_PEEK ))list_del_init (&call->recvmsg_link);else rxrpc_get_call (call, rxrpc_call_get_recvmsg); -write_unlock (&rx->recvmsg_lock); +spin_unlock (&rx->recvmsg_lock); call_debug_id = call->debug_id;trace_rxrpc_recvmsg (call_debug_id, rxrpc_recvmsg_dequeue,0 );
@@ -431,9 +431,9 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, error_requeue_call:if (!(flags &MSG_PEEK )) { -write_lock (&rx->recvmsg_lock); +spin_lock (&rx->recvmsg_lock);list_add (&call->recvmsg_link, &rx->recvmsg_q); -write_unlock (&rx->recvmsg_lock); +spin_unlock (&rx->recvmsg_lock);trace_rxrpc_recvmsg (call_debug_id, rxrpc_recvmsg_requeue,0 ); }else {rxrpc_put_call (call, rxrpc_call_put_recvmsg);
David Howells
maintainerPATCH 5/13 rxrpc: Allow a delay to be injected into packet reception
In reply to David HowellsIf CONFIG_AF_RXRPC_DEBUG_RX_DELAY=y, then a delay is injected between packets and errors being received and them being made available to the processing code, thereby allowing the RTT to be artificially increased.
--- net/rxrpc/Kconfig | 9 ++++++++ net/rxrpc/ar-internal.h | 6 +++++ net/rxrpc/io_thread.c | 48 +++++++++++++++++++++++++++++++++++++++- net/rxrpc/local_object.c | 6 +++++ net/rxrpc/misc.c | 7 ++++++ net/rxrpc/sysctl.c | 17 +++++++++++++- 6 files changed, 91 insertions(+), 2 deletions(-)
net/rxrpc/Kconfig +9 -0
@@ -36,6 +36,15 @@ config AF_RXRPC_INJECT_LOSS Say Y here to inject packet loss by discarding some received and some transmitted packets. +config AF_RXRPC_INJECT_RX_DELAY + bool "Inject delay into packet reception" + depends on SYSCTL + help + Say Y here to inject a delay into packet reception, allowing an + extended RTT time to be modelled. The delay can be configured using + /proc/sys/net/rxrpc/rxrpc_inject_rx_delay, setting a number of + milliseconds up to 0.5s (note that the granularity is actually in + jiffies). config AF_RXRPC_DEBUG bool "RxRPC dynamic debugging"
net/rxrpc/ar-internal.h +6 -0
@@ -285,6 +285,9 @@ struct rxrpc_local {struct completion io_thread_ready;/* Indication that the I/O thread started */ struct rxrpc_sock *service;/* Service(s) listening on this endpoint */ struct rw_semaphore defrag_sem;/* control re-enablement of IP DF bit */ +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY +struct sk_buff_head rx_delay_queue;/* Delay injection queue */ +#endif struct sk_buff_head rx_queue;/* Received packets */ struct list_head conn_attend_q;/* Conns requiring immediate attention */ struct list_head call_attend_q;/* Calls requiring immediate attention */
@@ -1109,6 +1112,9 @@ extern unsigned long rxrpc_idle_ack_delay;extern unsigned int rxrpc_rx_window_size;extern unsigned int rxrpc_rx_mtu;extern unsigned int rxrpc_rx_jumbo_max; +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY +extern unsigned long rxrpc_inject_rx_delay; +#endif /* * net_ns.c
net/rxrpc/io_thread.c +47 -1
78 lines not on this page · raw message
net/rxrpc/local_object.c +6 -0
@@ -110,6 +110,9 @@ static struct rxrpc_local *rxrpc_alloc_local(struct net *net,INIT_HLIST_NODE (&local->link);init_rwsem (&local->defrag_sem);init_completion (&local->io_thread_ready); +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY +skb_queue_head_init (&local->rx_delay_queue); +#endif skb_queue_head_init (&local->rx_queue);INIT_LIST_HEAD (&local->conn_attend_q);INIT_LIST_HEAD (&local->call_attend_q);
@@ -434,6 +437,9 @@ void rxrpc_destroy_local(struct rxrpc_local *local)/* At this point, there should be no more packets coming in to the * local endpoint. */ +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY +rxrpc_purge_queue (&local->rx_delay_queue); +#endif rxrpc_purge_queue (&local->rx_queue);rxrpc_purge_client_connections (local); }
net/rxrpc/misc.c +7 -0
@@ -53,3 +53,10 @@ unsigned int rxrpc_rx_mtu = 5692;* sender that we're willing to handle. */ unsigned int rxrpc_rx_jumbo_max =4 ; + +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY +/* +* The delay to inject into packet reception. +*/ +unsigned long rxrpc_inject_rx_delay; +#endif
net/rxrpc/sysctl.c +16 -1
@@ -17,6 +17,9 @@ static const unsigned int n_65535 = 65535;static const unsigned int n_max_acks =255 ;static const unsigned long one_jiffy =1 ;static const unsigned long max_jiffies =MAX_JIFFY_OFFSET ; +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY +static const unsigned long max_500 =500 ; +#endif /* * RxRPC operating parameters.
@@ -63,6 +66,19 @@ static struct ctl_table rxrpc_sysctl_table[] = { .extra2 = (void *)&max_jiffies, }, +/* Values used in milliseconds */ +#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY + { + .procname = "inject_rx_delay", + .data = &rxrpc_inject_rx_delay, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + .extra1 = (void *)SYSCTL_LONG_ZERO, + .extra2 = (void *)&max_500, + }, +#endif + /* Non-time values */ { .procname = "reap_client_conns",
@@ -109,7 +125,6 @@ static struct ctl_table rxrpc_sysctl_table[] = { .extra1 = (void *)SYSCTL_ONE, .extra2 = (void *)&four, }, - { } };
David Howells
maintainerPATCH 6/13 rxrpc: Generate extra pings for RTT during heavy-receive call
In reply to David HowellsWhen doing a call that has a single transmitted data packet and a massive amount of received data packets, we only ping for one RTT sample, which means we don't get a good reading on it.
Fix this by converting occasional IDLE ACKs into PING ACKs to elicit a response.
--- include/trace/events/rxrpc.h | 3 ++- net/rxrpc/call_event.c | 15 ++++++++++++--- net/rxrpc/output.c | 7 +++++-- 3 files changed, 19 insertions(+), 6 deletions(-)
include/trace/events/rxrpc.h +2 -1
@@ -360,11 +360,12 @@ EM(rxrpc_propose_ack_client_tx_end, "ClTxEnd") \ EM(rxrpc_propose_ack_input_data, "DataIn ") \ EM(rxrpc_propose_ack_input_data_hole, "DataInH") \ - EM(rxrpc_propose_ack_ping_for_check_life, "ChkLife") \ EM(rxrpc_propose_ack_ping_for_keepalive, "KeepAlv") \ EM(rxrpc_propose_ack_ping_for_lost_ack, "LostAck") \ EM(rxrpc_propose_ack_ping_for_lost_reply, "LostRpl") \ + EM(rxrpc_propose_ack_ping_for_old_rtt, "OldRtt ") \ EM(rxrpc_propose_ack_ping_for_params, "Params ") \ + EM(rxrpc_propose_ack_ping_for_rtt, "Rtt ") \ EM(rxrpc_propose_ack_processing_op, "ProcOp ") \ EM(rxrpc_propose_ack_respond_to_ack, "Rsp2Ack") \EM (rxrpc_propose_ack_respond_to_ping,"Rsp2Png" ) \
net/rxrpc/call_event.c +12 -3
@@ -498,9 +498,18 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, struct sk_buff *skb)rxrpc_send_ACK (call,RXRPC_ACK_IDLE ,0 , rxrpc_propose_ack_rx_idle); -if (atomic_read (&call->ackr_nr_unacked) >2 ) -rxrpc_send_ACK (call,RXRPC_ACK_IDLE ,0 , - rxrpc_propose_ack_input_data); +if (atomic_read (&call->ackr_nr_unacked) >2 ) { +if (call->peer->rtt_count <3 ) +rxrpc_send_ACK (call,RXRPC_ACK_PING ,0 , + rxrpc_propose_ack_ping_for_rtt); +else if (ktime_before (ktime_add_ms (call->peer->rtt_last_req,1000 ), +ktime_get_real ())) +rxrpc_send_ACK (call,RXRPC_ACK_PING ,0 , + rxrpc_propose_ack_ping_for_old_rtt); +else +rxrpc_send_ACK (call,RXRPC_ACK_IDLE ,0 , + rxrpc_propose_ack_input_data); + }/* Make sure the timer is restarted */ if (!__rxrpc_call_is_complete (call)) {
net/rxrpc/output.c +5 -2
@@ -253,12 +253,15 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb)iov_iter_kvec (&msg.msg_iter,WRITE , iov,1 , len); ret =do_udp_sendmsg (conn->local->socket, &msg, len); call->peer->last_tx_at =ktime_get_seconds (); -if (ret <0 ) +if (ret <0 ) {trace_rxrpc_tx_fail (call->debug_id, serial, ret, rxrpc_tx_point_call_ack); -else + }else {trace_rxrpc_tx_packet (call->debug_id, &txb->wire, rxrpc_tx_point_call_ack); +if (txb->wire.flags &RXRPC_REQUEST_ACK ) + call->peer->rtt_last_req =ktime_get_real (); + }rxrpc_tx_backoff (call, ret);if (!__rxrpc_call_is_complete (call)) {
David Howells
maintainerPATCH 7/13 rxrpc: De-atomic call->ackr_window and call->ackr_nr_unacked
In reply to David Howellscall->ackr_window doesn't need to be atomic as ACK generation and ACK transmission are now done in the same thread, so drop the atomic64 handling and split it into two separate members.
Similarly, call->ackr_nr_unacked doesn't need to be atomic now either.
--- include/trace/events/rxrpc.h | 10 ++++++---- net/rxrpc/ar-internal.h | 5 +++-- net/rxrpc/call_event.c | 2 +- net/rxrpc/call_object.c | 3 ++- net/rxrpc/input.c | 14 +++++++------- net/rxrpc/output.c | 13 +++++-------- net/rxrpc/proc.c | 4 +--- net/rxrpc/recvmsg.c | 6 +++--- 8 files changed, 28 insertions(+), 29 deletions(-)
include/trace/events/rxrpc.h +6 -4
@@ -1152,7 +1152,8 @@ TRACE_EVENT(rxrpc_receive, __field(enum rxrpc_receive_trace, why) __field(rxrpc_serial_t, serial) __field(rxrpc_seq_t, seq) - __field(u64, window) + __field(rxrpc_seq_t, window) + __field(rxrpc_seq_t, wtop) ), TP_fast_assign(
@@ -1160,7 +1161,8 @@ TRACE_EVENT(rxrpc_receive, __entry->why = why; __entry->serial = serial; __entry->seq = seq; - __entry->window =atomic64_read (&call->ackr_window); + __entry->window = call->ackr_window; + __entry->wtop = call->ackr_wtop; ), TP_printk("c=%08x %s r=%08x q=%08x w=%08x-%08x",
@@ -1168,8 +1170,8 @@ TRACE_EVENT(rxrpc_receive,__print_symbolic (__entry->why, rxrpc_receive_traces), __entry->serial, __entry->seq, -lower_32_bits (__entry->window), - upper_32_bits(__entry->window)) + __entry->window, + __entry->wtop) ); TRACE_EVENT(rxrpc_recvmsg,
net/rxrpc/ar-internal.h +3 -2
@@ -692,8 +692,9 @@ struct rxrpc_call {/* Receive-phase ACK management (ACKs we send). */ u8 ackr_reason;/* reason to ACK */ rxrpc_serial_t ackr_serial;/* serial of packet being ACK'd */ -atomic64_t ackr_window;/* Base (in LSW) and top (in MSW) of SACK window */ -atomic_t ackr_nr_unacked;/* Number of unacked packets */ +rxrpc_seq_t ackr_window;/* Base of SACK window */ +rxrpc_seq_t ackr_wtop;/* Base of SACK window */ +unsigned int ackr_nr_unacked;/* Number of unacked packets */ atomic_t ackr_nr_consumed;/* Number of packets needing hard ACK */ struct {#define RXRPC_SACK_SIZE 256
net/rxrpc/call_event.c +1 -1
@@ -498,7 +498,7 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, struct sk_buff *skb)rxrpc_send_ACK (call,RXRPC_ACK_IDLE ,0 , rxrpc_propose_ack_rx_idle); -if (atomic_read (&call->ackr_nr_unacked) >2 ) { +if (call->ackr_nr_unacked >2 ) {if (call->peer->rtt_count <3 )rxrpc_send_ACK (call,RXRPC_ACK_PING ,0 , rxrpc_propose_ack_ping_for_rtt);
net/rxrpc/call_object.c +2 -1
@@ -167,7 +167,8 @@ struct rxrpc_call *rxrpc_alloc_call(struct rxrpc_sock *rx, gfp_t gfp, call->tx_total_len =-1 ; call->next_rx_timo =20 *HZ ; call->next_req_timo =1 *HZ ; -atomic64_set (&call->ackr_window,0x100000001ULL ); + call->ackr_window =1 ; + call->ackr_wtop =1 ;memset (&call->sock_node,0xed ,sizeof (call->sock_node));
net/rxrpc/input.c +7 -7
@@ -338,7 +338,8 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial)static void rxrpc_input_update_ack_window (struct rxrpc_call *call,rxrpc_seq_t window,rxrpc_seq_t wtop) { -atomic64_set_release (&call->ackr_window, ((u64 )wtop) <<32 | window); + call->ackr_window = window; + call->ackr_wtop = wtop; }/*
@@ -367,9 +368,8 @@ static void rxrpc_input_data_one(struct rxrpc_call *call, struct sk_buff *skb,struct rxrpc_skb_priv *sp =rxrpc_skb (skb);struct sk_buff *oos;rxrpc_serial_t serial = sp->hdr.serial; -u64 win =atomic64_read (&call->ackr_window); -rxrpc_seq_t window =lower_32_bits (win); -rxrpc_seq_t wtop =upper_32_bits (win); +rxrpc_seq_t window = call->ackr_window; +rxrpc_seq_t wtop = call->ackr_wtop;rxrpc_seq_t wlimit = window + call->rx_winsize -1 ;rxrpc_seq_t seq = sp->hdr.seq;bool last = sp->hdr.flags &RXRPC_LAST_PACKET ;
@@ -419,7 +419,7 @@ static void rxrpc_input_data_one(struct rxrpc_call *call, struct sk_buff *skb,else if (!skb_queue_empty (&call->rx_oos_queue)) ack_reason =RXRPC_ACK_DELAY ;else -atomic_inc_return (&call->ackr_nr_unacked); + call->ackr_nr_unacked++; window++;if (after (window, wtop))
@@ -567,8 +567,8 @@ static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb)rxrpc_serial_t serial = sp->hdr.serial;rxrpc_seq_t seq0 = sp->hdr.seq; -_enter ("{%llx,%x},{%u,%x}" , -atomic64_read (&call->ackr_window), call->rx_highest_seq, +_enter ("{%x,%x,%x},{%u,%x}" , + call->ackr_window, call->ackr_wtop, call->rx_highest_seq, skb->len, seq0);if (__rxrpc_call_is_complete (call))
net/rxrpc/output.c +5 -8
@@ -86,20 +86,18 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn,unsigned int qsize;rxrpc_seq_t window, wtop, wrap_point, ix, first;int rsize; -u64 wtmp;u32 mtu, jmax;u8 *ackp = txb->acks;u8 sack_buffer[sizeof (call->ackr_sack_table)]__aligned(8) ; -atomic_set (&call->ackr_nr_unacked,0 ); + call->ackr_nr_unacked =0 ;atomic_set (&call->ackr_nr_consumed,0 );rxrpc_inc_stat (call->rxnet, stat_tx_ack_fill);/* Barrier against rxrpc_input_data(). */ retry: - wtmp =atomic64_read_acquire (&call->ackr_window); - window =lower_32_bits (wtmp); - wtop =upper_32_bits (wtmp); + window = call->ackr_window; + wtop = call->ackr_wtop; txb->ack.firstPacket =htonl (window); txb->ack.nAcks =0 ;
@@ -111,9 +109,8 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn,*/ memcpy (sack_buffer, call->ackr_sack_table,sizeof (sack_buffer)); wrap_point = window +RXRPC_SACK_SIZE -1 ; - wtmp =atomic64_read_acquire (&call->ackr_window); - window =lower_32_bits (wtmp); - wtop =upper_32_bits (wtmp); + window = call->ackr_window; + wtop = call->ackr_wtop;if (after (wtop, wrap_point)) {cond_resched (); goto retry;
net/rxrpc/proc.c +1 -3
@@ -55,7 +55,6 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)unsigned long timeout =0 ;rxrpc_seq_t acks_hard_ack;char lbuff[50 ], rbuff[50 ]; -u64 wtmp;if (v == &rxnet->calls) { seq_puts(seq,
@@ -83,7 +82,6 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) } acks_hard_ack =READ_ONCE (call->acks_hard_ack); - wtmp =atomic64_read_acquire (&call->ackr_window); seq_printf(seq, "UDP %-47.47s %-47.47s %4x %08x %08x %s %3u" " %-8.8s %08x %08x %08x %02x %08x %02x %08x %02x %06lx\n",
@@ -98,7 +96,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) call->abort_code, call->debug_id, acks_hard_ack,READ_ONCE (call->tx_top) - acks_hard_ack, -lower_32_bits (wtmp),upper_32_bits (wtmp) -lower_32_bits (wtmp), + call->ackr_window, call->ackr_wtop - call->ackr_window, call->rx_serial, call->cong_cwnd, timeout);
net/rxrpc/recvmsg.c +3 -3
@@ -95,7 +95,7 @@ static int rxrpc_recvmsg_term(struct rxrpc_call *call, struct msghdr *msg) }trace_rxrpc_recvdata (call, rxrpc_recvmsg_terminal, -lower_32_bits (atomic64_read (&call->ackr_window)) -1 , + call->ackr_window -1 , call->rx_pkt_offset, call->rx_pkt_len, ret);return ret; }
@@ -175,13 +175,13 @@ static int rxrpc_recvmsg_data(struct socket *sock, struct rxrpc_call *call, rx_pkt_len = call->rx_pkt_len;if (rxrpc_call_has_failed (call)) { - seq =lower_32_bits (atomic64_read (&call->ackr_window)) -1 ; + seq = call->ackr_window -1 ; ret = -EIO ; goto done; }if (test_bit (RXRPC_CALL_RECVMSG_READ_ALL , &call->flags)) { - seq =lower_32_bits (atomic64_read (&call->ackr_window)) -1 ; + seq = call->ackr_window -1 ; ret =1 ; goto done; }
David Howells
maintainerPATCH 8/13 rxrpc: Simplify ACK handling
In reply to David HowellsNow that general ACK transmission is done from the same thread as incoming DATA packet wrangling, there's no possibility that the SACK table will be being updated by the latter whilst the former is trying to copy it to an ACK.
This means that we can safely rotate the SACK table whilst updating it without having to take a lock, rather than keeping all the bits inside it in fixed place and copying and then rotating it in the transmitter.
Therefore, simplify SACK handing by keeping track of starting point in the ring and rotate slots down as we consume them.
--- include/trace/events/rxrpc.h | 36 ++++++++++++++++++++++++++++ net/rxrpc/ar-internal.h | 1 + net/rxrpc/input.c | 46 ++++++++++++++++++------------------ net/rxrpc/output.c | 46 ++++++++++-------------------------- 4 files changed, 73 insertions(+), 56 deletions(-)
include/trace/events/rxrpc.h +36 -0
@@ -422,6 +422,13 @@ EM(RXRPC_ACK_IDLE, "IDL") \ E_(RXRPC_ACK__INVALID, "-?-") +#define rxrpc_sack_traces \ + EM(rxrpc_sack_advance, "ADV") \ + EM(rxrpc_sack_fill, "FIL") \ + EM(rxrpc_sack_nack, "NAK") \ + EM(rxrpc_sack_none, "---") \ + E_(rxrpc_sack_oos, "OOS") +#define rxrpc_completions \ EM(RXRPC_CALL_SUCCEEDED, "Succeeded") \ EM(RXRPC_CALL_REMOTELY_ABORTED, "RemoteAbort") \
@@ -497,6 +504,7 @@ enum rxrpc_recvmsg_trace { rxrpc_recvmsg_traces } __mode(byte);enum rxrpc_req_ack_trace { rxrpc_req_ack_traces }__mode (byte );enum rxrpc_rtt_rx_trace { rxrpc_rtt_rx_traces }__mode (byte );enum rxrpc_rtt_tx_trace { rxrpc_rtt_tx_traces }__mode (byte ); +enum rxrpc_sack_trace { rxrpc_sack_traces }__mode (byte );enum rxrpc_skb_trace { rxrpc_skb_traces }__mode (byte );enum rxrpc_timer_trace { rxrpc_timer_traces }__mode (byte );enum rxrpc_tx_point { rxrpc_tx_points }__mode (byte );
@@ -531,6 +539,7 @@ rxrpc_recvmsg_traces; rxrpc_req_ack_traces; rxrpc_rtt_rx_traces; rxrpc_rtt_tx_traces; +rxrpc_sack_traces; rxrpc_skb_traces; rxrpc_timer_traces; rxrpc_tx_points;
@@ -1929,6 +1938,33 @@ TRACE_EVENT(rxrpc_call_poked, __entry->call_debug_id) ); +TRACE_EVENT (rxrpc_sack, + TP_PROTO(struct rxrpc_call *call, rxrpc_seq_t seq, + unsigned int sack, enum rxrpc_sack_trace what), + +TP_ARGS (call, seq, sack, what), + +TP_STRUCT__entry ( + __field(unsigned int, call_debug_id) + __field(rxrpc_seq_t, seq) + __field(unsigned int, sack) + __field(enum rxrpc_sack_trace, what) + ), + +TP_fast_assign ( + __entry->call_debug_id = call->debug_id; + __entry->seq = seq; + __entry->sack = sack; + __entry->what = what; + ), + +TP_printk ("c=%08x q=%08x %s k=%x" , + __entry->call_debug_id, + __entry->seq, +__print_symbolic (__entry->what, rxrpc_sack_traces), + __entry->sack) + ); +#undef EM#undef E_
net/rxrpc/ar-internal.h +1 -0
@@ -691,6 +691,7 @@ struct rxrpc_call {/* Receive-phase ACK management (ACKs we send). */ u8 ackr_reason;/* reason to ACK */ +u16 ackr_sack_base;/* Starting slot in SACK table ring */ rxrpc_serial_t ackr_serial;/* serial of packet being ACK'd */ rxrpc_seq_t ackr_window;/* Base of SACK window */ rxrpc_seq_t ackr_wtop;/* Base of SACK window */
net/rxrpc/input.c +23 -23
89 lines not on this page · raw message
net/rxrpc/output.c +13 -33
69 lines not on this page · raw message
David Howells
maintainerPATCH 9/13 rxrpc: Don't lock call->tx_lock to access call->tx_buffer
In reply to David Howellscall->tx_buffer is now only accessed within the I/O thread (->tx_sendmsg is the way sendmsg passes packets to the I/O thread) so there's no need to lock around it.
--- net/rxrpc/txbuf.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
net/rxrpc/txbuf.c +2 -10
@@ -110,12 +110,8 @@ void rxrpc_shrink_call_tx_buffer(struct rxrpc_call *call)_enter ("%x/%x/%x" , call->tx_bottom, call->acks_hard_ack, call->tx_top); -for (;;) { -spin_lock (&call->tx_lock); - txb =list_first_entry_or_null (&call->tx_buffer, - struct rxrpc_txbuf, call_link); -if (!txb) -break ; +while ((txb =list_first_entry_or_null (&call->tx_buffer, + struct rxrpc_txbuf, call_link))) { hard_ack =smp_load_acquire (&call->acks_hard_ack);if (before (hard_ack, txb->seq))break ;
@@ -128,15 +124,11 @@ void rxrpc_shrink_call_tx_buffer(struct rxrpc_call *call)trace_rxrpc_txqueue (call, rxrpc_txqueue_dequeue); -spin_unlock (&call->tx_lock); -rxrpc_put_txbuf (txb, rxrpc_txbuf_put_rotated);if (after (call->acks_hard_ack, call->tx_bottom +128 )) wake = true; } -spin_unlock (&call->tx_lock); -if (wake)wake_up (&call->waitq); }
David Howells
maintainerPATCH 10/13 rxrpc: Remove local->defrag_sem
In reply to David HowellsWe no longer need local->defrag_sem as all DATA packet transmission is now done from one thread, so remove it.
--- net/rxrpc/ar-internal.h | 1 - net/rxrpc/local_object.c | 1 - net/rxrpc/output.c | 7 ------- 3 files changed, 9 deletions(-)
net/rxrpc/ar-internal.h +0 -1
@@ -284,7 +284,6 @@ struct rxrpc_local {struct task_struct *io_thread;struct completion io_thread_ready;/* Indication that the I/O thread started */ struct rxrpc_sock *service;/* Service(s) listening on this endpoint */ -struct rw_semaphore defrag_sem;/* control re-enablement of IP DF bit */ #ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY struct sk_buff_head rx_delay_queue;/* Delay injection queue */ #endif
net/rxrpc/local_object.c +0 -1
@@ -108,7 +108,6 @@ static struct rxrpc_local *rxrpc_alloc_local(struct net *net, local->net = net; local->rxnet =rxrpc_net (net);INIT_HLIST_NODE (&local->link); -init_rwsem (&local->defrag_sem);init_completion (&local->io_thread_ready);#ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY skb_queue_head_init (&local->rx_delay_queue);
net/rxrpc/output.c +0 -7
@@ -409,8 +409,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb)if (txb->len >= call->peer->maxdata) goto send_fragmentable; -down_read (&conn->local->defrag_sem); - txb->last_sent =ktime_get_real ();if (txb->wire.flags &RXRPC_REQUEST_ACK ) rtt_slot =rxrpc_begin_rtt_probe (call, serial, rxrpc_rtt_tx_data);
@@ -425,7 +423,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) ret =do_udp_sendmsg (conn->local->socket, &msg, len); conn->peer->last_tx_at =ktime_get_seconds (); -up_read (&conn->local->defrag_sem);if (ret <0 ) {rxrpc_inc_stat (call->rxnet, stat_tx_data_send_fail);rxrpc_cancel_rtt_probe (call, serial, rtt_slot);
@@ -486,8 +483,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb)/* attempt to send this message with fragmentation enabled */ _debug ("send fragment" ); -down_write (&conn->local->defrag_sem); - txb->last_sent =ktime_get_real ();if (txb->wire.flags &RXRPC_REQUEST_ACK ) rtt_slot =rxrpc_begin_rtt_probe (call, serial, rxrpc_rtt_tx_data);
@@ -519,8 +514,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) rxrpc_tx_point_call_data_frag); }rxrpc_tx_backoff (call, ret); - -up_write (&conn->local->defrag_sem); goto done; }
David Howells
maintainerPATCH 11/13 rxrpc: Show consumed and freed packets as non-dropped in dropwatch
In reply to David HowellsSet a reason when freeing a packet that has been consumed such that dropwatch doesn't complain that it has been dropped.
--- net/rxrpc/skbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/rxrpc/skbuff.c +2 -2
@@ -63,7 +63,7 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace why)if (skb) {int n =atomic_dec_return (select_skb_count (skb));trace_rxrpc_skb (skb,refcount_read (&skb->users), n, why); -kfree_skb (skb); +kfree_skb_reason (skb,SKB_CONSUMED ); } }
@@ -78,6 +78,6 @@ void rxrpc_purge_queue(struct sk_buff_head *list)int n =atomic_dec_return (select_skb_count (skb));trace_rxrpc_skb (skb,refcount_read (&skb->users), n, rxrpc_skb_put_purge); -kfree_skb (skb); +kfree_skb_reason (skb,SKB_CONSUMED ); } }
Paolo Abeni
maintainerRe: [PATCH net-next 11/13] rxrpc: Show consumed and freed packets as non-dropped in dropwatch
Quoted 15 lines · David Howells
Set a reason when freeing a packet that has been consumed such that dropwatch doesn't complain that it has been dropped.
Signed-off-by David Howells <[email protected]>cc Marc Dionne <[email protected]>--- net/rxrpc/skbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)net/rxrpc/skbuff.c +0
-0
net/rxrpc/skbuff.c void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace why) · line 66
Quoted 5 lines
net/rxrpc/skbuff.c +1
-1@@ -63,7 +63,7 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace why)if (skb) {int n =atomic_dec_return (select_skb_count (skb));trace_rxrpc_skb (skb,refcount_read (&skb->users), n, why); -kfree_skb (skb); +kfree_skb_reason (skb,SKB_CONSUMED );
Just for the records, and not intending blocking this series, IMHO:
consume_skb(skb);
would probably be more straight-forward/clear.
Cheers,
Paolo
David Howells
maintainerPATCH 12/13 rxrpc: Change rx_packet tracepoint to display securityIndex not type twice
In reply to David HowellsChange the rx_packet tracepoint to display the securityIndex from the packet header instead of displaying the type in numeric form. There's no need for the latter, as the display of the type in symbolic form will fall back automatically to displaying the hex value if no symbol is available.
--- include/trace/events/rxrpc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/trace/events/rxrpc.h +2 -3
@@ -752,9 +752,8 @@ TRACE_EVENT(rxrpc_rx_packet, __entry->hdr.epoch, __entry->hdr.cid, __entry->hdr.callNumber, __entry->hdr.serviceId, __entry->hdr.serial, __entry->hdr.seq, - __entry->hdr.type, __entry->hdr.flags, - __entry->hdr.type <=15 ? - __print_symbolic(__entry->hdr.type, rxrpc_pkts) : "?UNK") + __entry->hdr.securityIndex, __entry->hdr.flags, + __print_symbolic(__entry->hdr.type, rxrpc_pkts)) ); TRACE_EVENT(rxrpc_rx_done,
David Howells
maintainerPATCH 13/13 rxrpc: Kill service bundle
In reply to David HowellsNow that the bundle->channel_lock has been eliminated, we don't need the dummy service bundle anymore. It's purpose was purely to provide the channel_lock for service connections.
--- net/rxrpc/conn_service.c | 7 ------- 1 file changed, 7 deletions(-)
net/rxrpc/conn_service.c +0 -7
@@ -8,11 +8,6 @@#include <linux/slab.h> #include "ar-internal.h" -static struct rxrpc_bundle rxrpc_service_dummy_bundle = { - .ref =REFCOUNT_INIT (1 ), - .debug_id =UINT_MAX , -}; -/* * Find a service connection under RCU conditions. *
@@ -132,8 +127,6 @@ struct rxrpc_connection *rxrpc_prealloc_service_connection(struct rxrpc_net *rxn*/ conn->state =RXRPC_CONN_SERVICE_PREALLOC ;refcount_set (&conn->ref,2 ); - conn->bundle =rxrpc_get_bundle (&rxrpc_service_dummy_bundle, - rxrpc_bundle_get_service_conn);atomic_inc (&rxnet->nr_conns);write_lock (&rxnet->conn_lock);
This series was applied to netdev/net-next.git (master) by David Howells <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David Howells <[email protected]>:
Quoted 10 lines · On Tue, 31 Jan 2023 17:12:14 +0000 you wrote:
Here's the fifth part of patches in the process of moving rxrpc from doing a lot of its stuff in softirq context to doing it in an I/O thread in process context and thereby making it easier to support a larger SACK table.
The full description is in the description for the first part[1] which is now upstream. The second and third parts are also upstream[2]. A subset of the original fourth part[3] got applied as a fix for a race[4].
[...]
Here is the summary with links:
- [net-next,01/13] rxrpc: Fix trace string
https://git.kernel.org/netdev/net-next/c/8395406b3495 - [net-next,02/13] rxrpc: Remove whitespace before ')' in trace header https://git.kernel.org/netdev/net-next/c/371e68ba0306 - [net-next,03/13] rxrpc: Shrink the tabulation in the rxrpc trace header a bit https://git.kernel.org/netdev/net-next/c/828bebc80a03 - [net-next,04/13] rxrpc: Convert call->recvmsg_lock to a spinlock https://git.kernel.org/netdev/net-next/c/223f59016fa2 - [net-next,05/13] rxrpc: Allow a delay to be injected into packet reception https://git.kernel.org/netdev/net-next/c/af094824f20b - [net-next,06/13] rxrpc: Generate extra pings for RTT during heavy-receive call https://git.kernel.org/netdev/net-next/c/84e28aa513af - [net-next,07/13] rxrpc: De-atomic call->ackr_window and call->ackr_nr_unacked https://git.kernel.org/netdev/net-next/c/5bbf953382be - [net-next,08/13] rxrpc: Simplify ACK handling https://git.kernel.org/netdev/net-next/c/f21e93485bcb - [net-next,09/13] rxrpc: Don't lock call->tx_lock to access call->tx_buffer https://git.kernel.org/netdev/net-next/c/b30d61f4b128 - [net-next,10/13] rxrpc: Remove local->defrag_sem https://git.kernel.org/netdev/net-next/c/e7f40f4a701b - [net-next,11/13] rxrpc: Show consumed and freed packets as non-dropped in dropwatch https://git.kernel.org/netdev/net-next/c/f20fe3ff82b3 - [net-next,12/13] rxrpc: Change rx_packet tracepoint to display securityIndex not type twice https://git.kernel.org/netdev/net-next/c/83836eb4df75 - [net-next,13/13] rxrpc: Kill service bundle https://git.kernel.org/netdev/net-next/c/550130a0ce30
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html