rxrpc: Add a tracepoint to log ACK transmission

Add a tracepoint to log information about ACK transmission.

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

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index 2b19f3fa51744793defc4da4d2cc09a67b9bbe51..d545d692ae22f60f5b2c610606411c5f4a6fb6bc 100644 (file)
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -260,6 +260,36 @@ TRACE_EVENT(rxrpc_rx_ack,
                      __entry->n_acks)
            );
 
+TRACE_EVENT(rxrpc_tx_ack,
+           TP_PROTO(struct rxrpc_call *call, rxrpc_seq_t first,
+                    rxrpc_serial_t serial, u8 reason, u8 n_acks),
+
+           TP_ARGS(call, first, serial, reason, n_acks),
+
+           TP_STRUCT__entry(
+                   __field(struct rxrpc_call *,        call            )
+                   __field(rxrpc_seq_t,                first           )
+                   __field(rxrpc_serial_t,             serial          )
+                   __field(u8,                         reason          )
+                   __field(u8,                         n_acks          )
+                            ),
+
+           TP_fast_assign(
+                   __entry->call = call;
+                   __entry->first = first;
+                   __entry->serial = serial;
+                   __entry->reason = reason;
+                   __entry->n_acks = n_acks;
+                          ),
+
+           TP_printk("c=%p %s f=%08x r=%08x n=%u",
+                     __entry->call,
+                     rxrpc_acks(__entry->reason),
+                     __entry->first,
+                     __entry->serial,
+                     __entry->n_acks)
+           );
+
 #endif /* _TRACE_RXRPC_H */
 
 /* This part must be outside protection */

diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
index a43f4c94a88da75484644bb7688b05cd19b0385e..9b19c51831aa1054b59dd8109bd53cad470a72b0 100644 (file)
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@ -98,6 +98,9 @@ static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,
                pkt.info.rwind          = htonl(rxrpc_rx_window_size);
                pkt.info.jumbo_max      = htonl(rxrpc_rx_jumbo_max);
                len += sizeof(pkt.ack) + sizeof(pkt.info);
+
+               trace_rxrpc_tx_ack(NULL, chan->last_seq, 0,
+                                  RXRPC_ACK_DUPLICATE, 0);
                break;
        }
 

diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 0b21ed859de7c71a9b829afd9fd5b640dc7960e9..2c9daeadce87ad2ff60fe8cf0e9ab130e6b5abe3 100644 (file)
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -38,12 +38,14 @@ struct rxrpc_pkt_buffer {
 static size_t rxrpc_fill_out_ack(struct rxrpc_call *call,
                                 struct rxrpc_pkt_buffer *pkt)
 {
+       rxrpc_serial_t serial;
        rxrpc_seq_t hard_ack, top, seq;
        int ix;
        u32 mtu, jmax;
        u8 *ackp = pkt->acks;
 
        /* Barrier against rxrpc_input_data(). */
+       serial = call->ackr_serial;
        hard_ack = READ_ONCE(call->rx_hard_ack);
        top = smp_load_acquire(&call->rx_top);
 
@@ -51,7 +53,7 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_call *call,
        pkt->ack.maxSkew        = htons(call->ackr_skew);
        pkt->ack.firstPacket    = htonl(hard_ack + 1);
        pkt->ack.previousPacket = htonl(call->ackr_prev_seq);
-       pkt->ack.serial         = htonl(call->ackr_serial);
+       pkt->ack.serial         = htonl(serial);
        pkt->ack.reason         = call->ackr_reason;
        pkt->ack.nAcks          = top - hard_ack;
 
@@ -75,6 +77,9 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_call *call,
        pkt->ackinfo.rwind      = htonl(call->rx_winsize);
        pkt->ackinfo.jumbo_max  = htonl(jmax);
 
+       trace_rxrpc_tx_ack(call, hard_ack + 1, serial, call->ackr_reason,
+                          top - hard_ack);
+
        *ackp++ = 0;
        *ackp++ = 0;
        *ackp++ = 0;