mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-24 05:01:03 +02:00
rxrpc: Fix handling of enums-to-string translation in tracing
Fix the way enum values are translated into strings in AF_RXRPC tracepoints. The problem with just doing a lookup in a normal flat array of strings or chars is that external tracing infrastructure can't find it. Rather, TRACE_DEFINE_ENUM must be used. Also sort the enums and string tables to make it easier to keep them in order so that a future patch to __print_symbolic() can be optimised to try a direct lookup into the table first before iterating over it. A couple of _proto() macro calls are removed because they refered to tables that got moved to the tracing infrastructure. The relevant data can be found by way of tracing. Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells
151
net/rxrpc/misc.c
151
net/rxrpc/misc.c
@@ -77,12 +77,6 @@ unsigned int rxrpc_rx_jumbo_max = 4;
|
||||
*/
|
||||
unsigned int rxrpc_resend_timeout = 4 * 1000;
|
||||
|
||||
const char *const rxrpc_pkts[] = {
|
||||
"?00",
|
||||
"DATA", "ACK", "BUSY", "ABORT", "ACKALL", "CHALL", "RESP", "DEBUG",
|
||||
"?09", "?10", "?11", "?12", "VERSION", "?14", "?15"
|
||||
};
|
||||
|
||||
const s8 rxrpc_ack_priority[] = {
|
||||
[0] = 0,
|
||||
[RXRPC_ACK_DELAY] = 1,
|
||||
@@ -94,148 +88,3 @@ const s8 rxrpc_ack_priority[] = {
|
||||
[RXRPC_ACK_NOSPACE] = 7,
|
||||
[RXRPC_ACK_PING_RESPONSE] = 8,
|
||||
};
|
||||
|
||||
const char rxrpc_ack_names[RXRPC_ACK__INVALID + 1][4] = {
|
||||
"---", "REQ", "DUP", "OOS", "WIN", "MEM", "PNG", "PNR", "DLY",
|
||||
"IDL", "-?-"
|
||||
};
|
||||
|
||||
const char rxrpc_skb_traces[rxrpc_skb__nr_trace][7] = {
|
||||
[rxrpc_skb_rx_cleaned] = "Rx CLN",
|
||||
[rxrpc_skb_rx_freed] = "Rx FRE",
|
||||
[rxrpc_skb_rx_got] = "Rx GOT",
|
||||
[rxrpc_skb_rx_lost] = "Rx *L*",
|
||||
[rxrpc_skb_rx_received] = "Rx RCV",
|
||||
[rxrpc_skb_rx_purged] = "Rx PUR",
|
||||
[rxrpc_skb_rx_rotated] = "Rx ROT",
|
||||
[rxrpc_skb_rx_seen] = "Rx SEE",
|
||||
[rxrpc_skb_tx_cleaned] = "Tx CLN",
|
||||
[rxrpc_skb_tx_freed] = "Tx FRE",
|
||||
[rxrpc_skb_tx_got] = "Tx GOT",
|
||||
[rxrpc_skb_tx_new] = "Tx NEW",
|
||||
[rxrpc_skb_tx_rotated] = "Tx ROT",
|
||||
[rxrpc_skb_tx_seen] = "Tx SEE",
|
||||
};
|
||||
|
||||
const char rxrpc_conn_traces[rxrpc_conn__nr_trace][4] = {
|
||||
[rxrpc_conn_new_client] = "NWc",
|
||||
[rxrpc_conn_new_service] = "NWs",
|
||||
[rxrpc_conn_queued] = "QUE",
|
||||
[rxrpc_conn_seen] = "SEE",
|
||||
[rxrpc_conn_got] = "GOT",
|
||||
[rxrpc_conn_put_client] = "PTc",
|
||||
[rxrpc_conn_put_service] = "PTs",
|
||||
};
|
||||
|
||||
const char rxrpc_client_traces[rxrpc_client__nr_trace][7] = {
|
||||
[rxrpc_client_activate_chans] = "Activa",
|
||||
[rxrpc_client_alloc] = "Alloc ",
|
||||
[rxrpc_client_chan_activate] = "ChActv",
|
||||
[rxrpc_client_chan_disconnect] = "ChDisc",
|
||||
[rxrpc_client_chan_pass] = "ChPass",
|
||||
[rxrpc_client_chan_unstarted] = "ChUnst",
|
||||
[rxrpc_client_cleanup] = "Clean ",
|
||||
[rxrpc_client_count] = "Count ",
|
||||
[rxrpc_client_discard] = "Discar",
|
||||
[rxrpc_client_duplicate] = "Duplic",
|
||||
[rxrpc_client_exposed] = "Expose",
|
||||
[rxrpc_client_replace] = "Replac",
|
||||
[rxrpc_client_to_active] = "->Actv",
|
||||
[rxrpc_client_to_culled] = "->Cull",
|
||||
[rxrpc_client_to_idle] = "->Idle",
|
||||
[rxrpc_client_to_inactive] = "->Inac",
|
||||
[rxrpc_client_to_waiting] = "->Wait",
|
||||
[rxrpc_client_uncount] = "Uncoun",
|
||||
};
|
||||
|
||||
const char rxrpc_transmit_traces[rxrpc_transmit__nr_trace][4] = {
|
||||
[rxrpc_transmit_wait] = "WAI",
|
||||
[rxrpc_transmit_queue] = "QUE",
|
||||
[rxrpc_transmit_queue_last] = "QLS",
|
||||
[rxrpc_transmit_rotate] = "ROT",
|
||||
[rxrpc_transmit_rotate_last] = "RLS",
|
||||
[rxrpc_transmit_await_reply] = "AWR",
|
||||
[rxrpc_transmit_end] = "END",
|
||||
};
|
||||
|
||||
const char rxrpc_receive_traces[rxrpc_receive__nr_trace][4] = {
|
||||
[rxrpc_receive_incoming] = "INC",
|
||||
[rxrpc_receive_queue] = "QUE",
|
||||
[rxrpc_receive_queue_last] = "QLS",
|
||||
[rxrpc_receive_front] = "FRN",
|
||||
[rxrpc_receive_rotate] = "ROT",
|
||||
[rxrpc_receive_end] = "END",
|
||||
};
|
||||
|
||||
const char rxrpc_recvmsg_traces[rxrpc_recvmsg__nr_trace][5] = {
|
||||
[rxrpc_recvmsg_enter] = "ENTR",
|
||||
[rxrpc_recvmsg_wait] = "WAIT",
|
||||
[rxrpc_recvmsg_dequeue] = "DEQU",
|
||||
[rxrpc_recvmsg_hole] = "HOLE",
|
||||
[rxrpc_recvmsg_next] = "NEXT",
|
||||
[rxrpc_recvmsg_cont] = "CONT",
|
||||
[rxrpc_recvmsg_full] = "FULL",
|
||||
[rxrpc_recvmsg_data_return] = "DATA",
|
||||
[rxrpc_recvmsg_terminal] = "TERM",
|
||||
[rxrpc_recvmsg_to_be_accepted] = "TBAC",
|
||||
[rxrpc_recvmsg_return] = "RETN",
|
||||
};
|
||||
|
||||
const char rxrpc_rtt_tx_traces[rxrpc_rtt_tx__nr_trace][5] = {
|
||||
[rxrpc_rtt_tx_ping] = "PING",
|
||||
[rxrpc_rtt_tx_data] = "DATA",
|
||||
};
|
||||
|
||||
const char rxrpc_rtt_rx_traces[rxrpc_rtt_rx__nr_trace][5] = {
|
||||
[rxrpc_rtt_rx_ping_response] = "PONG",
|
||||
[rxrpc_rtt_rx_requested_ack] = "RACK",
|
||||
};
|
||||
|
||||
const char rxrpc_timer_traces[rxrpc_timer__nr_trace][8] = {
|
||||
[rxrpc_timer_begin] = "Begin ",
|
||||
[rxrpc_timer_expired] = "*EXPR*",
|
||||
[rxrpc_timer_init_for_reply] = "IniRpl",
|
||||
[rxrpc_timer_init_for_send_reply] = "SndRpl",
|
||||
[rxrpc_timer_set_for_ack] = "SetAck",
|
||||
[rxrpc_timer_set_for_ping] = "SetPng",
|
||||
[rxrpc_timer_set_for_send] = "SetTx ",
|
||||
[rxrpc_timer_set_for_resend] = "SetRTx",
|
||||
};
|
||||
|
||||
const char rxrpc_propose_ack_traces[rxrpc_propose_ack__nr_trace][8] = {
|
||||
[rxrpc_propose_ack_client_tx_end] = "ClTxEnd",
|
||||
[rxrpc_propose_ack_input_data] = "DataIn ",
|
||||
[rxrpc_propose_ack_ping_for_lost_ack] = "LostAck",
|
||||
[rxrpc_propose_ack_ping_for_lost_reply] = "LostRpl",
|
||||
[rxrpc_propose_ack_ping_for_params] = "Params ",
|
||||
[rxrpc_propose_ack_processing_op] = "ProcOp ",
|
||||
[rxrpc_propose_ack_respond_to_ack] = "Rsp2Ack",
|
||||
[rxrpc_propose_ack_respond_to_ping] = "Rsp2Png",
|
||||
[rxrpc_propose_ack_retry_tx] = "RetryTx",
|
||||
[rxrpc_propose_ack_rotate_rx] = "RxAck ",
|
||||
[rxrpc_propose_ack_terminal_ack] = "ClTerm ",
|
||||
};
|
||||
|
||||
const char *const rxrpc_propose_ack_outcomes[rxrpc_propose_ack__nr_outcomes] = {
|
||||
[rxrpc_propose_ack_use] = "",
|
||||
[rxrpc_propose_ack_update] = " Update",
|
||||
[rxrpc_propose_ack_subsume] = " Subsume",
|
||||
};
|
||||
|
||||
const char rxrpc_congest_modes[NR__RXRPC_CONGEST_MODES][10] = {
|
||||
[RXRPC_CALL_SLOW_START] = "SlowStart",
|
||||
[RXRPC_CALL_CONGEST_AVOIDANCE] = "CongAvoid",
|
||||
[RXRPC_CALL_PACKET_LOSS] = "PktLoss ",
|
||||
[RXRPC_CALL_FAST_RETRANSMIT] = "FastReTx ",
|
||||
};
|
||||
|
||||
const char rxrpc_congest_changes[rxrpc_congest__nr_change][9] = {
|
||||
[rxrpc_cong_begin_retransmission] = " Retrans",
|
||||
[rxrpc_cong_cleared_nacks] = " Cleared",
|
||||
[rxrpc_cong_new_low_nack] = " NewLowN",
|
||||
[rxrpc_cong_no_change] = "",
|
||||
[rxrpc_cong_progress] = " Progres",
|
||||
[rxrpc_cong_retransmit_again] = " ReTxAgn",
|
||||
[rxrpc_cong_rtt_window_end] = " RttWinE",
|
||||
[rxrpc_cong_saw_nack] = " SawNack",
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user