summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/trace/events/rxrpc.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index 8ba8d76e856a..0383e5e9a0f3 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -280,11 +280,12 @@ TRACE_EVENT(rxrpc_tx_data,
__entry->lose = lose;
),
- TP_printk("c=%p DATA %08x q=%08x fl=%02x%s",
+ TP_printk("c=%p DATA %08x q=%08x fl=%02x%s%s",
__entry->call,
__entry->serial,
__entry->seq,
__entry->flags,
+ __entry->retrans ? " *RETRANS*" : "",
__entry->lose ? " *LOSE*" : "")
);
@@ -452,17 +453,18 @@ TRACE_EVENT(rxrpc_rtt_rx,
TRACE_EVENT(rxrpc_timer,
TP_PROTO(struct rxrpc_call *call, enum rxrpc_timer_trace why,
- unsigned long now),
+ ktime_t now, unsigned long now_j),
- TP_ARGS(call, why, now),
+ TP_ARGS(call, why, now, now_j),
TP_STRUCT__entry(
__field(struct rxrpc_call *, call )
__field(enum rxrpc_timer_trace, why )
- __field(unsigned long, now )
- __field(unsigned long, expire_at )
- __field(unsigned long, ack_at )
- __field(unsigned long, resend_at )
+ __field_struct(ktime_t, now )
+ __field_struct(ktime_t, expire_at )
+ __field_struct(ktime_t, ack_at )
+ __field_struct(ktime_t, resend_at )
+ __field(unsigned long, now_j )
__field(unsigned long, timer )
),
@@ -473,17 +475,17 @@ TRACE_EVENT(rxrpc_timer,
__entry->expire_at = call->expire_at;
__entry->ack_at = call->ack_at;
__entry->resend_at = call->resend_at;
+ __entry->now_j = now_j;
__entry->timer = call->timer.expires;
),
- TP_printk("c=%p %s now=%lx x=%ld a=%ld r=%ld t=%ld",
+ TP_printk("c=%p %s x=%lld a=%lld r=%lld t=%ld",
__entry->call,
rxrpc_timer_traces[__entry->why],
- __entry->now,
- __entry->expire_at - __entry->now,
- __entry->ack_at - __entry->now,
- __entry->resend_at - __entry->now,
- __entry->timer - __entry->now)
+ ktime_to_ns(ktime_sub(__entry->expire_at, __entry->now)),
+ ktime_to_ns(ktime_sub(__entry->ack_at, __entry->now)),
+ ktime_to_ns(ktime_sub(__entry->resend_at, __entry->now)),
+ __entry->timer - __entry->now_j)
);
TRACE_EVENT(rxrpc_rx_lose,