OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firewire: core: record card index in tracepoinrts events derived from async_outbound_complete_template 

The asynchronous transaction is initiated on one of 1394 OHCI controller,
however the existing tracepoints events has the lack of data about it.

This commit adds card_index member into event structure to store the index
of host controller in use, and prints it.

Link: https://lore.kernel.org/r/20240613131440.431766-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
This commit is contained in:
Takashi Sakamoto 2024-06-13 22:14:33 +09:00
parent e789523fe2
commit e7da16abf0
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firewire/core-transaction.c
View File

@ -174,8 +174,8 @@ static void transmit_complete_callback(struct fw_packet *packet,
struct fw_transaction *t = struct fw_transaction *t =
container_of(packet, struct fw_transaction, packet); container_of(packet, struct fw_transaction, packet);
trace_async_request_outbound_complete((uintptr_t)t, packet->generation, packet->speed, trace_async_request_outbound_complete((uintptr_t)t, card->index, packet->generation,
status, packet->timestamp); packet->speed, status, packet->timestamp);
switch (status) { switch (status) {
case ACK_COMPLETE: case ACK_COMPLETE:
@ -674,7 +674,7 @@ static void free_response_callback(struct fw_packet *packet,
{ {
struct fw_request *request = container_of(packet, struct fw_request, response); struct fw_request *request = container_of(packet, struct fw_request, response);
trace_async_response_outbound_complete((uintptr_t)request, packet->generation, trace_async_response_outbound_complete((uintptr_t)request, card->index, packet->generation,
packet->speed, status, packet->timestamp); packet->speed, status, packet->timestamp);
// Decrease the reference count since not at in-flight. // Decrease the reference count since not at in-flight.

17
include/trace/events/firewire.h
View File

@ -71,10 +71,11 @@ DECLARE_EVENT_CLASS(async_outbound_initiate_template,
// The value of status is one of ack codes and rcodes specific to Linux FireWire subsystem. // The value of status is one of ack codes and rcodes specific to Linux FireWire subsystem.
DECLARE_EVENT_CLASS(async_outbound_complete_template, DECLARE_EVENT_CLASS(async_outbound_complete_template,
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp), TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
TP_ARGS(transaction, generation, scode, status, timestamp), TP_ARGS(transaction, card_index, generation, scode, status, timestamp),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(u64, transaction) __field(u64, transaction)
__field(u8, card_index)
__field(u8, generation) __field(u8, generation)
__field(u8, scode) __field(u8, scode)
__field(u8, status) __field(u8, status)
@ -82,14 +83,16 @@ DECLARE_EVENT_CLASS(async_outbound_complete_template,
), ),
TP_fast_assign( TP_fast_assign(
__entry->transaction = transaction; __entry->transaction = transaction;
__entry->card_index = card_index;
__entry->generation = generation; __entry->generation = generation;
__entry->scode = scode; __entry->scode = scode;
__entry->status = status; __entry->status = status;
__entry->timestamp = timestamp; __entry->timestamp = timestamp;
), ),
TP_printk( TP_printk(
"transaction=0x%llx generation=%u scode=%u status=%u timestamp=0x%04x", "transaction=0x%llx card_index=%u generation=%u scode=%u status=%u timestamp=0x%04x",
__entry->transaction, __entry->transaction,
__entry->card_index,
__entry->generation, __entry->generation,
__entry->scode, __entry->scode,
__entry->status, __entry->status,
@ -144,8 +147,8 @@ DEFINE_EVENT(async_outbound_initiate_template, async_request_outbound_initiate,
); );
DEFINE_EVENT(async_outbound_complete_template, async_request_outbound_complete, DEFINE_EVENT(async_outbound_complete_template, async_request_outbound_complete,
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp), TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
TP_ARGS(transaction, generation, scode, status, timestamp) TP_ARGS(transaction, card_index, generation, scode, status, timestamp)
); );
DEFINE_EVENT(async_inbound_template, async_response_inbound, DEFINE_EVENT(async_inbound_template, async_response_inbound,
@ -194,8 +197,8 @@ DEFINE_EVENT_PRINT(async_outbound_initiate_template, async_response_outbound_ini
); );
DEFINE_EVENT(async_outbound_complete_template, async_response_outbound_complete, DEFINE_EVENT(async_outbound_complete_template, async_response_outbound_complete,
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp), TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
TP_ARGS(transaction, generation, scode, status, timestamp) TP_ARGS(transaction, card_index, generation, scode, status, timestamp)
); );
#undef ASYNC_HEADER_GET_DESTINATION #undef ASYNC_HEADER_GET_DESTINATION