Commit 64e02b64 authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

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

firewire: core: record card index in tracepoinrts events derived from async_outbound_initiate_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-3-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent e7da16ab

drivers/firewire/core-transaction.c

+6 −4
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ void __fw_send_request(struct fw_card *card, struct fw_transaction *t, int tcode 


	spin_unlock_irqrestore(&card->lock, flags);



	trace_async_request_outbound_initiate((uintptr_t)t, generation, speed, t->packet.header, payload,

	trace_async_request_outbound_initiate((uintptr_t)t, card->index, generation, speed,

					      t->packet.header, payload,

					      tcode_is_read_request(tcode) ? 0 : length / 4);



	card->driver->send_request(card, &t->packet);
@@ -879,9 +880,10 @@ void fw_send_response(struct fw_card *card, 
	// Increase the reference count so that the object is kept during in-flight.

	fw_request_get(request);



	trace_async_response_outbound_initiate((uintptr_t)request, request->response.generation,

					       request->response.speed, request->response.header,

					       data, data ? data_length / 4 : 0);

	trace_async_response_outbound_initiate((uintptr_t)request, card->index,

					       request->response.generation, request->response.speed,

					       request->response.header, data,

					       data ? data_length / 4 : 0);



	card->driver->send_response(card, &request->response);

}

include/trace/events/firewire.h

+12 −8
Original line number Diff line number Diff line
@@ -36,10 +36,11 @@ 
#define QUADLET_SIZE	4



DECLARE_EVENT_CLASS(async_outbound_initiate_template,

	TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),

	TP_ARGS(transaction, generation, scode, header, data, data_count),

	TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),

	TP_ARGS(transaction, card_index, generation, scode, header, data, data_count),

	TP_STRUCT__entry(

		__field(u64, transaction)

		__field(u8, card_index)

		__field(u8, generation)

		__field(u8, scode)

		__array(u32, header, ASYNC_HEADER_QUADLET_COUNT)
@@ -47,6 +48,7 @@ DECLARE_EVENT_CLASS(async_outbound_initiate_template, 
	),

	TP_fast_assign(

		__entry->transaction = transaction;

		__entry->card_index = card_index;

		__entry->generation = generation;

		__entry->scode = scode;

		memcpy(__entry->header, header, QUADLET_SIZE * ASYNC_HEADER_QUADLET_COUNT);
@@ -54,8 +56,9 @@ DECLARE_EVENT_CLASS(async_outbound_initiate_template, 
	),

	// This format is for the request subaction.

	TP_printk(

		"transaction=0x%llx generation=%u scode=%u dst_id=0x%04x tlabel=%u tcode=%u src_id=0x%04x offset=0x%012llx header=%s data=%s",

		"transaction=0x%llx card_index=%u generation=%u scode=%u dst_id=0x%04x tlabel=%u tcode=%u src_id=0x%04x offset=0x%012llx header=%s data=%s",

		__entry->transaction,

		__entry->card_index,

		__entry->generation,

		__entry->scode,

		ASYNC_HEADER_GET_DESTINATION(__entry->header),
@@ -142,8 +145,8 @@ DECLARE_EVENT_CLASS(async_inbound_template, 
);



DEFINE_EVENT(async_outbound_initiate_template, async_request_outbound_initiate,

	TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),

	TP_ARGS(transaction, generation, scode, header, data, data_count)

	TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),

	TP_ARGS(transaction, card_index, generation, scode, header, data, data_count)

);



DEFINE_EVENT(async_outbound_complete_template, async_request_outbound_complete,
@@ -178,11 +181,12 @@ DEFINE_EVENT_PRINT(async_inbound_template, async_request_inbound, 
);



DEFINE_EVENT_PRINT(async_outbound_initiate_template, async_response_outbound_initiate,

	TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),

	TP_ARGS(transaction, generation, scode, header, data, data_count),

	TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, const u32 *header, const u32 *data, unsigned int data_count),

	TP_ARGS(transaction, card_index, generation, scode, header, data, data_count),

	TP_printk(

		"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",

		"transaction=0x%llx card_index=%u generation=%u scode=%u dst_id=0x%04x tlabel=%u tcode=%u src_id=0x%04x rcode=%u header=%s data=%s",

		__entry->transaction,

		__entry->card_index,

		__entry->generation,

		__entry->scode,

		ASYNC_HEADER_GET_DESTINATION(__entry->header),