aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/rxrpc.h86
-rw-r--r--include/trace/events/xdp.h1
2 files changed, 64 insertions, 23 deletions
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index ebe96796027a..36cb50c111a6 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -49,6 +49,7 @@ enum rxrpc_conn_trace {
49 rxrpc_conn_put_client, 49 rxrpc_conn_put_client,
50 rxrpc_conn_put_service, 50 rxrpc_conn_put_service,
51 rxrpc_conn_queued, 51 rxrpc_conn_queued,
52 rxrpc_conn_reap_service,
52 rxrpc_conn_seen, 53 rxrpc_conn_seen,
53}; 54};
54 55
@@ -138,10 +139,24 @@ enum rxrpc_rtt_rx_trace {
138 139
139enum rxrpc_timer_trace { 140enum rxrpc_timer_trace {
140 rxrpc_timer_begin, 141 rxrpc_timer_begin,
142 rxrpc_timer_exp_ack,
143 rxrpc_timer_exp_hard,
144 rxrpc_timer_exp_idle,
145 rxrpc_timer_exp_keepalive,
146 rxrpc_timer_exp_lost_ack,
147 rxrpc_timer_exp_normal,
148 rxrpc_timer_exp_ping,
149 rxrpc_timer_exp_resend,
141 rxrpc_timer_expired, 150 rxrpc_timer_expired,
142 rxrpc_timer_init_for_reply, 151 rxrpc_timer_init_for_reply,
143 rxrpc_timer_init_for_send_reply, 152 rxrpc_timer_init_for_send_reply,
153 rxrpc_timer_restart,
144 rxrpc_timer_set_for_ack, 154 rxrpc_timer_set_for_ack,
155 rxrpc_timer_set_for_hard,
156 rxrpc_timer_set_for_idle,
157 rxrpc_timer_set_for_keepalive,
158 rxrpc_timer_set_for_lost_ack,
159 rxrpc_timer_set_for_normal,
145 rxrpc_timer_set_for_ping, 160 rxrpc_timer_set_for_ping,
146 rxrpc_timer_set_for_resend, 161 rxrpc_timer_set_for_resend,
147 rxrpc_timer_set_for_send, 162 rxrpc_timer_set_for_send,
@@ -150,6 +165,7 @@ enum rxrpc_timer_trace {
150enum rxrpc_propose_ack_trace { 165enum rxrpc_propose_ack_trace {
151 rxrpc_propose_ack_client_tx_end, 166 rxrpc_propose_ack_client_tx_end,
152 rxrpc_propose_ack_input_data, 167 rxrpc_propose_ack_input_data,
168 rxrpc_propose_ack_ping_for_keepalive,
153 rxrpc_propose_ack_ping_for_lost_ack, 169 rxrpc_propose_ack_ping_for_lost_ack,
154 rxrpc_propose_ack_ping_for_lost_reply, 170 rxrpc_propose_ack_ping_for_lost_reply,
155 rxrpc_propose_ack_ping_for_params, 171 rxrpc_propose_ack_ping_for_params,
@@ -206,6 +222,7 @@ enum rxrpc_congest_change {
206 EM(rxrpc_conn_put_client, "PTc") \ 222 EM(rxrpc_conn_put_client, "PTc") \
207 EM(rxrpc_conn_put_service, "PTs") \ 223 EM(rxrpc_conn_put_service, "PTs") \
208 EM(rxrpc_conn_queued, "QUE") \ 224 EM(rxrpc_conn_queued, "QUE") \
225 EM(rxrpc_conn_reap_service, "RPs") \
209 E_(rxrpc_conn_seen, "SEE") 226 E_(rxrpc_conn_seen, "SEE")
210 227
211#define rxrpc_client_traces \ 228#define rxrpc_client_traces \
@@ -296,16 +313,31 @@ enum rxrpc_congest_change {
296#define rxrpc_timer_traces \ 313#define rxrpc_timer_traces \
297 EM(rxrpc_timer_begin, "Begin ") \ 314 EM(rxrpc_timer_begin, "Begin ") \
298 EM(rxrpc_timer_expired, "*EXPR*") \ 315 EM(rxrpc_timer_expired, "*EXPR*") \
316 EM(rxrpc_timer_exp_ack, "ExpAck") \
317 EM(rxrpc_timer_exp_hard, "ExpHrd") \
318 EM(rxrpc_timer_exp_idle, "ExpIdl") \
319 EM(rxrpc_timer_exp_keepalive, "ExpKA ") \
320 EM(rxrpc_timer_exp_lost_ack, "ExpLoA") \
321 EM(rxrpc_timer_exp_normal, "ExpNml") \
322 EM(rxrpc_timer_exp_ping, "ExpPng") \
323 EM(rxrpc_timer_exp_resend, "ExpRsn") \
299 EM(rxrpc_timer_init_for_reply, "IniRpl") \ 324 EM(rxrpc_timer_init_for_reply, "IniRpl") \
300 EM(rxrpc_timer_init_for_send_reply, "SndRpl") \ 325 EM(rxrpc_timer_init_for_send_reply, "SndRpl") \
326 EM(rxrpc_timer_restart, "Restrt") \
301 EM(rxrpc_timer_set_for_ack, "SetAck") \ 327 EM(rxrpc_timer_set_for_ack, "SetAck") \
328 EM(rxrpc_timer_set_for_hard, "SetHrd") \
329 EM(rxrpc_timer_set_for_idle, "SetIdl") \
330 EM(rxrpc_timer_set_for_keepalive, "KeepAl") \
331 EM(rxrpc_timer_set_for_lost_ack, "SetLoA") \
332 EM(rxrpc_timer_set_for_normal, "SetNml") \
302 EM(rxrpc_timer_set_for_ping, "SetPng") \ 333 EM(rxrpc_timer_set_for_ping, "SetPng") \
303 EM(rxrpc_timer_set_for_resend, "SetRTx") \ 334 EM(rxrpc_timer_set_for_resend, "SetRTx") \
304 E_(rxrpc_timer_set_for_send, "SetTx ") 335 E_(rxrpc_timer_set_for_send, "SetSnd")
305 336
306#define rxrpc_propose_ack_traces \ 337#define rxrpc_propose_ack_traces \
307 EM(rxrpc_propose_ack_client_tx_end, "ClTxEnd") \ 338 EM(rxrpc_propose_ack_client_tx_end, "ClTxEnd") \
308 EM(rxrpc_propose_ack_input_data, "DataIn ") \ 339 EM(rxrpc_propose_ack_input_data, "DataIn ") \
340 EM(rxrpc_propose_ack_ping_for_keepalive, "KeepAlv") \
309 EM(rxrpc_propose_ack_ping_for_lost_ack, "LostAck") \ 341 EM(rxrpc_propose_ack_ping_for_lost_ack, "LostAck") \
310 EM(rxrpc_propose_ack_ping_for_lost_reply, "LostRpl") \ 342 EM(rxrpc_propose_ack_ping_for_lost_reply, "LostRpl") \
311 EM(rxrpc_propose_ack_ping_for_params, "Params ") \ 343 EM(rxrpc_propose_ack_ping_for_params, "Params ") \
@@ -932,39 +964,47 @@ TRACE_EVENT(rxrpc_rtt_rx,
932 964
933TRACE_EVENT(rxrpc_timer, 965TRACE_EVENT(rxrpc_timer,
934 TP_PROTO(struct rxrpc_call *call, enum rxrpc_timer_trace why, 966 TP_PROTO(struct rxrpc_call *call, enum rxrpc_timer_trace why,
935 ktime_t now, unsigned long now_j), 967 unsigned long now),
936 968
937 TP_ARGS(call, why, now, now_j), 969 TP_ARGS(call, why, now),
938 970
939 TP_STRUCT__entry( 971 TP_STRUCT__entry(
940 __field(struct rxrpc_call *, call ) 972 __field(struct rxrpc_call *, call )
941 __field(enum rxrpc_timer_trace, why ) 973 __field(enum rxrpc_timer_trace, why )
942 __field_struct(ktime_t, now ) 974 __field(long, now )
943 __field_struct(ktime_t, expire_at ) 975 __field(long, ack_at )
944 __field_struct(ktime_t, ack_at ) 976 __field(long, ack_lost_at )
945 __field_struct(ktime_t, resend_at ) 977 __field(long, resend_at )
946 __field(unsigned long, now_j ) 978 __field(long, ping_at )
947 __field(unsigned long, timer ) 979 __field(long, expect_rx_by )
980 __field(long, expect_req_by )
981 __field(long, expect_term_by )
982 __field(long, timer )
948 ), 983 ),
949 984
950 TP_fast_assign( 985 TP_fast_assign(
951 __entry->call = call; 986 __entry->call = call;
952 __entry->why = why; 987 __entry->why = why;
953 __entry->now = now; 988 __entry->now = now;
954 __entry->expire_at = call->expire_at; 989 __entry->ack_at = call->ack_at;
955 __entry->ack_at = call->ack_at; 990 __entry->ack_lost_at = call->ack_lost_at;
956 __entry->resend_at = call->resend_at; 991 __entry->resend_at = call->resend_at;
957 __entry->now_j = now_j; 992 __entry->expect_rx_by = call->expect_rx_by;
958 __entry->timer = call->timer.expires; 993 __entry->expect_req_by = call->expect_req_by;
994 __entry->expect_term_by = call->expect_term_by;
995 __entry->timer = call->timer.expires;
959 ), 996 ),
960 997
961 TP_printk("c=%p %s x=%lld a=%lld r=%lld t=%ld", 998 TP_printk("c=%p %s a=%ld la=%ld r=%ld xr=%ld xq=%ld xt=%ld t=%ld",
962 __entry->call, 999 __entry->call,
963 __print_symbolic(__entry->why, rxrpc_timer_traces), 1000 __print_symbolic(__entry->why, rxrpc_timer_traces),
964 ktime_to_ns(ktime_sub(__entry->expire_at, __entry->now)), 1001 __entry->ack_at - __entry->now,
965 ktime_to_ns(ktime_sub(__entry->ack_at, __entry->now)), 1002 __entry->ack_lost_at - __entry->now,
966 ktime_to_ns(ktime_sub(__entry->resend_at, __entry->now)), 1003 __entry->resend_at - __entry->now,
967 __entry->timer - __entry->now_j) 1004 __entry->expect_rx_by - __entry->now,
1005 __entry->expect_req_by - __entry->now,
1006 __entry->expect_term_by - __entry->now,
1007 __entry->timer - __entry->now)
968 ); 1008 );
969 1009
970TRACE_EVENT(rxrpc_rx_lose, 1010TRACE_EVENT(rxrpc_rx_lose,
@@ -1080,7 +1120,7 @@ TRACE_EVENT(rxrpc_congest,
1080 memcpy(&__entry->sum, summary, sizeof(__entry->sum)); 1120 memcpy(&__entry->sum, summary, sizeof(__entry->sum));
1081 ), 1121 ),
1082 1122
1083 TP_printk("c=%p %08x %s %08x %s cw=%u ss=%u nr=%u,%u nw=%u,%u r=%u b=%u u=%u d=%u l=%x%s%s%s", 1123 TP_printk("c=%p r=%08x %s q=%08x %s cw=%u ss=%u nr=%u,%u nw=%u,%u r=%u b=%u u=%u d=%u l=%x%s%s%s",
1084 __entry->call, 1124 __entry->call,
1085 __entry->ack_serial, 1125 __entry->ack_serial,
1086 __print_symbolic(__entry->sum.ack_reason, rxrpc_ack_names), 1126 __print_symbolic(__entry->sum.ack_reason, rxrpc_ack_names),
diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h
index 4cd0f05d0113..8989a92c571a 100644
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
@@ -8,6 +8,7 @@
8#include <linux/netdevice.h> 8#include <linux/netdevice.h>
9#include <linux/filter.h> 9#include <linux/filter.h>
10#include <linux/tracepoint.h> 10#include <linux/tracepoint.h>
11#include <linux/bpf.h>
11 12
12#define __XDP_ACT_MAP(FN) \ 13#define __XDP_ACT_MAP(FN) \
13 FN(ABORTED) \ 14 FN(ABORTED) \
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-08 01:17:19 -0500