firewire: core: record card index in tracepoinrts events derived from async_outbound_...

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>

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 571fdff65c2bcfe7b7bd3f0d2f79496c8a2a1ce5..de75e758fd0721c4cb9c2f0ad9ee9a9cce7b4c37 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -174,8 +174,8 @@ static void transmit_complete_callback(struct fw_packet *packet,
        struct fw_transaction *t =
            container_of(packet, struct fw_transaction, packet);
 
-       trace_async_request_outbound_complete((uintptr_t)t, packet->generation, packet->speed,
-                                             status, packet->timestamp);
+       trace_async_request_outbound_complete((uintptr_t)t, card->index, packet->generation,
+                                             packet->speed, status, packet->timestamp);
 
        switch (status) {
        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);
 
-       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);
 
        // Decrease the reference count since not at in-flight.

diff --git a/include/trace/events/firewire.h b/include/trace/events/firewire.h
index d695a560673f7d3e8ba2785211cbdea1cc670b7c..ca6ea9bd1ebafe5e13eddd8b856604eec958eab1 100644 (file)
--- a/include/trace/events/firewire.h
+++ b/include/trace/events/firewire.h
@@ -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.
 DECLARE_EVENT_CLASS(async_outbound_complete_template,
-       TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
-       TP_ARGS(transaction, generation, scode, status, timestamp),
+       TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
+       TP_ARGS(transaction, card_index, generation, scode, status, timestamp),
        TP_STRUCT__entry(
                __field(u64, transaction)
+               __field(u8, card_index)
                __field(u8, generation)
                __field(u8, scode)
                __field(u8, status)
@@ -82,14 +83,16 @@ DECLARE_EVENT_CLASS(async_outbound_complete_template,
        ),
        TP_fast_assign(
                __entry->transaction = transaction;
+               __entry->card_index = card_index;
                __entry->generation = generation;
                __entry->scode = scode;
                __entry->status = status;
                __entry->timestamp = timestamp;
        ),
        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->card_index,
                __entry->generation,
                __entry->scode,
                __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,
-       TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
-       TP_ARGS(transaction, generation, scode, status, timestamp)
+       TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
+       TP_ARGS(transaction, card_index, generation, scode, status, timestamp)
 );
 
 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,
-       TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
-       TP_ARGS(transaction, generation, scode, status, timestamp)
+       TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
+       TP_ARGS(transaction, card_index, generation, scode, status, timestamp)
 );
 
 #undef ASYNC_HEADER_GET_DESTINATION