Skip to content

Commit 624a853

Browse files
committed
firewire: core: add tracepoints events for asynchronous outbound response
In a view of core transaction service, the asynchronous outbound response consists of two stages; initiation and completion. This commit adds a pair of events for the asynchronous outbound response. The following example is for asynchronous write quadlet request as IEC 61883-1 FCP response to node 0xffc1. async_response_outbound_initiate: \ transaction=0xffff89fa08cf16c0 generation=4 scode=2 dst_id=0xffc1 \ tlabel=25 tcode=2 src_id=0xffc0 rcode=0 \ header={0xffc16420,0xffc00000,0x0,0x0} data={} async_response_outbound_complete: \ transaction=0xffff89fa08cf16c0 generation=4 scode=2 status=1 \ timestamp=0x0000 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Sakamoto <[email protected]>
1 parent 2c945b1 commit 624a853

File tree

2 files changed

+40
-7
lines changed

2 files changed

+40
-7
lines changed

drivers/firewire/core-transaction.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,9 @@ static void free_response_callback(struct fw_packet *packet,
668668
{
669669
struct fw_request *request = container_of(packet, struct fw_request, response);
670670

671+
trace_async_response_outbound_complete((uintptr_t)request, packet->generation,
672+
packet->speed, status, packet->timestamp);
673+
671674
// Decrease the reference count since not at in-flight.
672675
fw_request_put(request);
673676

@@ -850,24 +853,30 @@ static struct fw_request *allocate_request(struct fw_card *card,
850853
void fw_send_response(struct fw_card *card,
851854
struct fw_request *request, int rcode)
852855
{
856+
u32 *data = NULL;
857+
unsigned int data_length = 0;
858+
853859
/* unified transaction or broadcast transaction: don't respond */
854860
if (request->ack != ACK_PENDING ||
855861
HEADER_DESTINATION_IS_BROADCAST(request->request_header)) {
856862
fw_request_put(request);
857863
return;
858864
}
859865

860-
if (rcode == RCODE_COMPLETE)
861-
fw_fill_response(&request->response, request->request_header,
862-
rcode, request->data,
863-
fw_get_response_length(request));
864-
else
865-
fw_fill_response(&request->response, request->request_header,
866-
rcode, NULL, 0);
866+
if (rcode == RCODE_COMPLETE) {
867+
data = request->data;
868+
data_length = fw_get_response_length(request);
869+
}
870+
871+
fw_fill_response(&request->response, request->request_header, rcode, data, data_length);
867872

868873
// Increase the reference count so that the object is kept during in-flight.
869874
fw_request_get(request);
870875

876+
trace_async_response_outbound_initiate((uintptr_t)request, request->response.generation,
877+
request->response.speed, request->response.header,
878+
data, data ? data_length / 4 : 0);
879+
871880
card->driver->send_response(card, &request->response);
872881
}
873882
EXPORT_SYMBOL(fw_send_response);

include/trace/events/firewire.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,30 @@ DEFINE_EVENT_PRINT(async_inbound_template, async_request_inbound,
174174
)
175175
);
176176

177+
DEFINE_EVENT_PRINT(async_outbound_initiate_template, async_response_outbound_initiate,
178+
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),
179+
TP_ARGS(transaction, generation, scode, header, data, data_count),
180+
TP_printk(
181+
"transaction=0x%llx generation=%u scode=%u dst_id=0x%04x tlabel=%u tcode=%u src_id=0x%04x rcode=%u header=%s data=%s",
182+
__entry->transaction,
183+
__entry->generation,
184+
__entry->scode,
185+
ASYNC_HEADER_GET_DESTINATION(__entry->header),
186+
ASYNC_HEADER_GET_TLABEL(__entry->header),
187+
ASYNC_HEADER_GET_TCODE(__entry->header),
188+
ASYNC_HEADER_GET_SOURCE(__entry->header),
189+
ASYNC_HEADER_GET_RCODE(__entry->header),
190+
__print_array(__entry->header, ASYNC_HEADER_QUADLET_COUNT, QUADLET_SIZE),
191+
__print_array(__get_dynamic_array(data),
192+
__get_dynamic_array_len(data) / QUADLET_SIZE, QUADLET_SIZE)
193+
)
194+
);
195+
196+
DEFINE_EVENT(async_outbound_complete_template, async_response_outbound_complete,
197+
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
198+
TP_ARGS(transaction, generation, scode, status, timestamp)
199+
);
200+
177201
#undef ASYNC_HEADER_GET_DESTINATION
178202
#undef ASYNC_HEADER_GET_TLABEL
179203
#undef ASYNC_HEADER_GET_TCODE

0 commit comments

Comments
 (0)