rxrpc: Make Tx loss-injection go through normal return and adjust tracing

In rxrpc_send_data_packet() make the loss-injection path return through the
same code as the transmission path so that the RTT determination is
initiated and any future timer shuffling will be done, despite the packet
having been binned.

Whilst we're at it:

 (1) Add to the tx_data tracepoint an indication of whether or not we're
     retransmitting a data packet.

 (2) When we're deciding whether or not to request an ACK, rather than
     checking if we're in fast-retransmit mode check instead if we're
     retransmitting.

 (3) Don't invoke the lose_skb tracepoint when losing a Tx packet as we're
     not altering the sk_buff refcount nor are we just seeing it after
     getting it off the Tx list.

 (4) The rxrpc_skb_tx_lost note is then no longer used so remove it.

 (5) rxrpc_lose_skb() no longer needs to deal with rxrpc_skb_tx_lost.

Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index ada12d00118c..8ba8d76e856a 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -258,15 +258,16 @@ TRACE_EVENT(rxrpc_rx_ack,
 
 TRACE_EVENT(rxrpc_tx_data,
             TP_PROTO(struct rxrpc_call *call, rxrpc_seq_t seq,
-                     rxrpc_serial_t serial, u8 flags, bool lose),
+                     rxrpc_serial_t serial, u8 flags, bool retrans, bool lose),
 
-            TP_ARGS(call, seq, serial, flags, lose),
+            TP_ARGS(call, seq, serial, flags, retrans, lose),
 
             TP_STRUCT__entry(
                     __field(struct rxrpc_call *,        call            )
                     __field(rxrpc_seq_t,                seq             )
                     __field(rxrpc_serial_t,             serial          )
                     __field(u8,                         flags           )
+                    __field(bool,                       retrans         )
                     __field(bool,                       lose            )
                              ),
 
@@ -275,6 +276,7 @@ TRACE_EVENT(rxrpc_tx_data,
                     __entry->seq = seq;
                     __entry->serial = serial;
                     __entry->flags = flags;
+                    __entry->retrans = retrans;
                     __entry->lose = lose;
                            ),