Skip to contentSkip to conversation

scsi: ufs: Include major and minor number in command tracing output

PATCH In review Bart Van Assche 2 participants 4 messages May 31, 2023 – Jun 2, 2023

Subsystems (3)
lore
Share & tools
lore

Bart Van Assche

author reviewer
#0 lore raw

PATCH 1/1 scsi: ufs: Include major and minor number in command tracing output

UFS devices are typically configured with multiple logical units. The device name, e.g. 13200000.ufs, does not include logical unit information. Hence this patch that replaces the device name with the disk major and minor number in the tracing output, e.g. 8,0, just like the block layer tracing information.

---
 drivers/ufs/core/ufshcd.c  |  4 ++--
 include/trace/events/ufs.h | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/ufs/core/ufshcd.c +2 -2
index 1f7a4ec211ff..6c84ad9c91d0 100644
@@ -450,8 +450,8 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
 	} else {
 		doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 	}
-	trace_ufshcd_command(dev_name(hba->dev), str_t, tag,
-			doorbell, hwq_id, transfer_len, intr, lba, opcode, group_id);
+	trace_ufshcd_command(cmd->device, str_t, tag, doorbell, hwq_id,
+			     transfer_len, intr, lba, opcode, group_id);
 }
 
 static void ufshcd_print_clk_freqs(struct ufs_hba *hba)
include/trace/events/ufs.h +10 -6
index 992517ac3292..c66259eb766b 100644
@@ -267,15 +267,15 @@ DEFINE_EVENT(ufshcd_template, ufshcd_wl_runtime_resume,
 	     TP_ARGS(dev_name, err, usecs, dev_state, link_state));
 
 TRACE_EVENT(ufshcd_command,
-	TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t,
+	TP_PROTO(struct scsi_device *sdev, enum ufs_trace_str_t str_t,
 		 unsigned int tag, u32 doorbell, u32 hwq_id, int transfer_len,
 		 u32 intr, u64 lba, u8 opcode, u8 group_id),
 
-	TP_ARGS(dev_name, str_t, tag, doorbell, hwq_id, transfer_len,
+	TP_ARGS(sdev, str_t, tag, doorbell, hwq_id, transfer_len,
 			intr, lba, opcode, group_id),
 
 	TP_STRUCT__entry(
-		__string(dev_name, dev_name)
+		__field(dev_t, dev)
 		__field(enum ufs_trace_str_t, str_t)
 		__field(unsigned int, tag)
 		__field(u32, doorbell)
@@ -288,7 +288,10 @@ TRACE_EVENT(ufshcd_command,
 	),
 
 	TP_fast_assign(
-		__assign_str(dev_name, dev_name);
+		/* 'disk' is cleared by sd_remove(). */
+		struct gendisk *disk = sdev->request_queue->disk;
+
+		__entry->dev = disk ? disk_devt(disk) : 0;
 		__entry->str_t = str_t;
 		__entry->tag = tag;
 		__entry->doorbell = doorbell;
@@ -301,8 +304,9 @@ TRACE_EVENT(ufshcd_command,
 	),
 
 	TP_printk(
-		"%s: %s: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x (%s), group_id: 0x%x, hwq_id: %d",
-		show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name),
+		"%s: %d,%d: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x (%s), group_id: 0x%x, hwq_id: %d",
+		show_ufs_cmd_trace_str(__entry->str_t),
+		MAJOR(__entry->dev), MINOR(__entry->dev),
 		__entry->tag, __entry->doorbell, __entry->transfer_len, __entry->intr,
 		__entry->lba, (u32)__entry->opcode, str_opcode(__entry->opcode),
 		(u32)__entry->group_id, __entry->hwq_id
#1 lore raw
Quoted 5 lines · Bart Van Assche

UFS devices are typically configured with multiple logical units. The device name, e.g. 13200000.ufs, does not include logical unit information. Hence this patch that replaces the device name with the disk major and minor number in the tracing output, e.g. 8,0, just like the block layer tracing information.

Please also drop the never used group_id value while you're at it.

author reviewer
#2 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 5 lines · Bart Van Assche

UFS devices are typically configured with multiple logical units. The device name, e.g. 13200000.ufs, does not include logical unit information. Hence this patch that replaces the device name with the disk major and minor number in the tracing output, e.g. 8,0, just like the block layer tracing information.

Please also drop the never used group_id value while you're at it.

Hi Christoph,

I will look into removing the GROUP ID information from the UFS tracing output. Do you agree with adding the GROUP ID information in the SCSI tracing output after data temperature support has been added in the block layer and SCSI core? As you probably know the T10 committee recently approved Ralph Weber's Constrained Streams proposal.

Thanks,

Bart.

#3 lore raw
Quoted 5 lines · Bart Van Assche

I will look into removing the GROUP ID information from the UFS tracing output. Do you agree with adding the GROUP ID information in the SCSI tracing output after data temperature support has been added in the block layer and SCSI core? As you probably know the T10 committee recently approved Ralph Weber's Constrained Streams proposal.

Yes. It might take a while for that with the speed of the committee..