summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-09-17 10:49:13 +0100
committerDavid Howells <dhowells@redhat.com>2016-09-17 11:24:03 +0100
commita3868bfc8d5b0f36c784deab644ee1d2b0e6974b (patch)
tree097f6a0fc63e8e939087f05f6ac2365c244a214b
parent182f50562490e5861afaa7a2e42dcc0dd9dcfcca (diff)
downloadop-kernel-dev-a3868bfc8d5b0f36c784deab644ee1d2b0e6974b.zip
op-kernel-dev-a3868bfc8d5b0f36c784deab644ee1d2b0e6974b.tar.gz
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>
-rw-r--r--include/trace/events/rxrpc.h5
-rw-r--r--net/rxrpc/ar-internal.h6
2 files changed, 6 insertions, 5 deletions
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index ea3b10e..0a30c67 100644
--- 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 e78c40b..0f6fafa 100644
--- 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
*/
OpenPOWER on IntegriCloud