rxrpc: Trace received aborts

Add a tracepoint (rxrpc_rx_abort) to record received aborts.

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

2 files changed, 27 insertions, 1 deletions

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index 626af97863e8..85e0148c88a8 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -683,6 +683,30 @@ TRACE_EVENT(rxrpc_rx_ack,
                       __entry->n_acks)
             );
 
+TRACE_EVENT(rxrpc_rx_abort,
+            TP_PROTO(struct rxrpc_call *call, rxrpc_serial_t serial,
+                     u32 abort_code),
+
+            TP_ARGS(call, serial, abort_code),
+
+            TP_STRUCT__entry(
+                    __field(struct rxrpc_call *,        call            )
+                    __field(rxrpc_serial_t,             serial          )
+                    __field(u32,                        abort_code      )
+                             ),
+
+            TP_fast_assign(
+                    __entry->call = call;
+                    __entry->serial = serial;
+                    __entry->abort_code = abort_code;
+                           ),
+
+            TP_printk("c=%p ABORT %08x ac=%d",
+                      __entry->call,
+                      __entry->serial,
+                      __entry->abort_code)
+            );
+
 TRACE_EVENT(rxrpc_tx_data,
             TP_PROTO(struct rxrpc_call *call, rxrpc_seq_t seq,
                      rxrpc_serial_t serial, u8 flags, bool retrans, bool lose),
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 3685dbe05a8f..241e989597f2 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -877,7 +877,7 @@ static void rxrpc_input_ackall(struct rxrpc_call *call, struct sk_buff *skb)
 }
 
 /*
- * Process an ABORT packet.
+ * Process an ABORT packet directed at a call.
  */
 static void rxrpc_input_abort(struct rxrpc_call *call, struct sk_buff *skb)
 {
@@ -892,6 +892,8 @@ static void rxrpc_input_abort(struct rxrpc_call *call, struct sk_buff *skb)
                           &wtmp, sizeof(wtmp)) >= 0)
                 abort_code = ntohl(wtmp);
 
+        trace_rxrpc_rx_abort(call, sp->hdr.serial, abort_code);
+
         _proto("Rx ABORT %%%u { %x }", sp->hdr.serial, abort_code);
 
         if (rxrpc_set_call_completion(call, RXRPC_CALL_REMOTELY_ABORTED,