scsi: ufs: Include major and minor number in UFS command tracing output
Subsystems (3)
Bart Van Assche
reviewerPATCH 1/1 scsi: ufs: Include major and minor number in UFS command tracing output
The logical unit information is missing from the UFS command tracing output. Although the device name is logged, e.g. 13200000.ufs, this name 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.
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/ufs/core/ufshcd.c | 2 +- include/trace/events/ufs.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -448,7 +448,7 @@ 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, +trace_ufshcd_command (cmd->device, str_t, tag, doorbell, hwq_id, transfer_len, intr, lba, opcode, group_id); }
include/trace/events/ufs.h +7 -6
@@ -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,7 @@ TRACE_EVENT(ufshcd_command, ),TP_fast_assign ( - __assign_str(dev_name, dev_name); + __entry->dev = disk_devt(sdev->request_queue->disk); __entry->str_t = str_t; __entry->tag = tag; __entry->doorbell = doorbell;
@@ -301,8 +301,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
Acked-by Bean Huo <[email protected]>
include/trace/events/ufs.h TRACE_EVENT(ufshcd_command, · line 291
Quoted 3 lines · Bart Van Assche
include/trace/events/ufs.h +1
-1TP_fast_assign ( - __assign_str(dev_name, dev_name); + __entry->dev = disk_devt(sdev->request_queue->disk);
sdev->request_queue->disk can be NULL and no LLDD has any business looking at it, as it is owned by the ULD (if one is actually bound).