rxrpc: Record statistics about ACK types

Record statistics about the different types of ACKs that have been
transmitted and received and the number of ACKs that have been filled out
and transmitted or that have been skipped.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index ed406a5..8ed707a 100644 (file)
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -101,6 +101,12 @@ struct rxrpc_net {
        atomic_t                stat_rx_data;
        atomic_t                stat_rx_data_reqack;
        atomic_t                stat_rx_data_jumbo;
+
+       atomic_t                stat_tx_ack_fill;
+       atomic_t                stat_tx_ack_send;
+       atomic_t                stat_tx_ack_skip;
+       atomic_t                stat_tx_acks[256];
+       atomic_t                stat_rx_acks[256];
 };
 
 /*

diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index c5b3ae1..70f70a0 100644 (file)
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -50,6 +50,8 @@ static void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
        unsigned long expiry = rxrpc_soft_ack_delay;
        s8 prior = rxrpc_ack_priority[ack_reason];
 
+       rxrpc_inc_stat(call->rxnet, stat_tx_acks[ack_reason]);
+
        /* Pings are handled specially because we don't want to accidentally
         * lose a ping response by subsuming it into a ping.
         */

diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index e7586d5..7810b7d 100644 (file)
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -888,6 +888,7 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb)
        trace_rxrpc_rx_ack(call, ack_serial, acked_serial,
                           first_soft_ack, prev_pkt,
                           summary.ack_reason, nr_acks);
+       rxrpc_inc_stat(call->rxnet, stat_rx_acks[buf.ack.reason]);
 
        switch (buf.ack.reason) {
        case RXRPC_ACK_PING_RESPONSE:

diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 8fddad2..f350d39 100644 (file)
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -83,8 +83,12 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn,
        tmp = atomic_xchg(&call->ackr_nr_unacked, 0);
        tmp |= atomic_xchg(&call->ackr_nr_consumed, 0);
        if (!tmp && (reason == RXRPC_ACK_DELAY ||
-                    reason == RXRPC_ACK_IDLE))
+                    reason == RXRPC_ACK_IDLE)) {
+               rxrpc_inc_stat(call->rxnet, stat_tx_ack_skip);
                return 0;
+       }
+
+       rxrpc_inc_stat(call->rxnet, stat_tx_ack_fill);
 
        /* Barrier against rxrpc_input_data(). */
        serial = call->ackr_serial;
@@ -253,6 +257,7 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, bool ping,
        if (ping)
                rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_ping);
 
+       rxrpc_inc_stat(call->rxnet, stat_tx_ack_send);
        ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 2, len);
        conn->params.peer->last_tx_at = ktime_get_seconds();
        if (ret < 0)

diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c
index 1027444..488c403 100644 (file)
--- a/net/rxrpc/proc.c
+++ b/net/rxrpc/proc.c
@@ -419,6 +419,33 @@ int rxrpc_stats_show(struct seq_file *seq, void *v)
                   atomic_read(&rxnet->stat_rx_data_reqack),
                   atomic_read(&rxnet->stat_rx_data_jumbo));
        seq_printf(seq,
+                  "Ack      : fill=%u send=%u skip=%u\n",
+                  atomic_read(&rxnet->stat_tx_ack_fill),
+                  atomic_read(&rxnet->stat_tx_ack_send),
+                  atomic_read(&rxnet->stat_tx_ack_skip));
+       seq_printf(seq,
+                  "Ack-Tx   : req=%u dup=%u oos=%u exw=%u nos=%u png=%u prs=%u dly=%u idl=%u\n",
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_REQUESTED]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_DUPLICATE]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_OUT_OF_SEQUENCE]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_EXCEEDS_WINDOW]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_NOSPACE]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_PING]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_PING_RESPONSE]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_DELAY]),
+                  atomic_read(&rxnet->stat_tx_acks[RXRPC_ACK_IDLE]));
+       seq_printf(seq,
+                  "Ack-Rx   : req=%u dup=%u oos=%u exw=%u nos=%u png=%u prs=%u dly=%u idl=%u\n",
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_REQUESTED]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_DUPLICATE]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_OUT_OF_SEQUENCE]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_EXCEEDS_WINDOW]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_NOSPACE]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_PING]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_PING_RESPONSE]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_DELAY]),
+                  atomic_read(&rxnet->stat_rx_acks[RXRPC_ACK_IDLE]));
+       seq_printf(seq,
                   "Buffers  : txb=%u rxb=%u\n",
                   atomic_read(&rxrpc_n_tx_skbs),
                   atomic_read(&rxrpc_n_rx_skbs));
@@ -443,5 +470,11 @@ int rxrpc_stats_clear(struct file *file, char *buf, size_t size)
        atomic_set(&rxnet->stat_rx_data, 0);
        atomic_set(&rxnet->stat_rx_data_reqack, 0);
        atomic_set(&rxnet->stat_rx_data_jumbo, 0);
+
+       atomic_set(&rxnet->stat_tx_ack_fill, 0);
+       atomic_set(&rxnet->stat_tx_ack_send, 0);
+       atomic_set(&rxnet->stat_tx_ack_skip, 0);
+       memset(&rxnet->stat_tx_acks, 0, sizeof(rxnet->stat_tx_acks));
+       memset(&rxnet->stat_rx_acks, 0, sizeof(rxnet->stat_rx_acks));
        return size;
 }