rxrpc: Show some more information through /proc files

Show the four current call IDs in /proc/net/rxrpc/conns.

Show the current packet Rx serial number in /proc/net/rxrpc/calls.

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

diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c
index bc6f27c8869d14151da41093a7a8691665a26137..163d05df339d0738e3551dc746eb77816b3754cc 100644 (file)
--- a/net/rxrpc/proc.c
+++ b/net/rxrpc/proc.c
@@ -72,7 +72,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
                         "Proto Local                                          "
                         " Remote                                         "
                         " SvID ConnID   CallID   End Use State    Abort   "
-                        " UserID           TxSeq    TW RxSeq    RW RxTimo\n");
+                        " UserID           TxSeq    TW RxSeq    RW RxSerial RxTimo\n");
                return 0;
        }
 
@@ -105,7 +105,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
        rx_hard_ack = READ_ONCE(call->rx_hard_ack);
        seq_printf(seq,
                   "UDP   %-47.47s %-47.47s %4x %08x %08x %s %3u"
-                  " %-8.8s %08x %lx %08x %02x %08x %02x %06lx\n",
+                  " %-8.8s %08x %lx %08x %02x %08x %02x %08x %06lx\n",
                   lbuff,
                   rbuff,
                   call->service_id,
@@ -118,6 +118,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
                   call->user_call_ID,
                   tx_hard_ack, READ_ONCE(call->tx_top) - tx_hard_ack,
                   rx_hard_ack, READ_ONCE(call->rx_top) - rx_hard_ack,
+                  call->rx_serial,
                   timeout);
 
        return 0;
@@ -187,7 +188,7 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
 print:
        seq_printf(seq,
                   "UDP   %-47.47s %-47.47s %4x %08x %s %3u"
-                  " %s %08x %08x %08x\n",
+                  " %s %08x %08x %08x %08x %08x %08x %08x\n",
                   lbuff,
                   rbuff,
                   conn->service_id,
@@ -197,7 +198,11 @@ print:
                   rxrpc_conn_states[conn->state],
                   key_serial(conn->params.key),
                   atomic_read(&conn->serial),
-                  conn->hi_serial);
+                  conn->hi_serial,
+                  conn->channels[0].call_id,
+                  conn->channels[1].call_id,
+                  conn->channels[2].call_id,
+                  conn->channels[3].call_id);
 
        return 0;
 }