rxrpc: Print the packet type name in the Rx packet trace

Print a symbolic packet type name for each valid received packet in the
trace output, not just a number.

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

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index ea3b10ed91a894b17b01885e199509516ab04a89..0a30c673509cca2ea8670f99f04a99c02d53c057 100644 (file)
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -93,11 +93,12 @@ TRACE_EVENT(rxrpc_rx_packet,
                    memcpy(&__entry->hdr, &sp->hdr, sizeof(__entry->hdr));
                           ),
 
-           TP_printk("%08x:%08x:%08x:%04x %08x %08x %02x %02x",
+           TP_printk("%08x:%08x:%08x:%04x %08x %08x %02x %02x %s",
                      __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, __entry->hdr.flags,
+                     __entry->hdr.type <= 15 ? rxrpc_pkts[__entry->hdr.type] : "?UNK")
            );
 
 TRACE_EVENT(rxrpc_rx_done,

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index e78c40b37db554e3bb9712be92c1255426dd8590..0f6fafa2c271efeea7d76bec3781bba80201ce61 100644 (file)
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -551,6 +551,9 @@ enum rxrpc_call_trace {
 
 extern const char rxrpc_call_traces[rxrpc_call__nr_trace][4];
 
+extern const char *const rxrpc_pkts[];
+extern const char *rxrpc_acks(u8 reason);
+
 #include <trace/events/rxrpc.h>
 
 /*
@@ -851,11 +854,8 @@ extern unsigned int rxrpc_rx_mtu;
 extern unsigned int rxrpc_rx_jumbo_max;
 extern unsigned int rxrpc_resend_timeout;
 
-extern const char *const rxrpc_pkts[];
 extern const s8 rxrpc_ack_priority[];
 
-extern const char *rxrpc_acks(u8 reason);
-
 /*
  * output.c
  */