Skip to content

Commit 9d2c232

Browse files
Kassey Limartinkpetersen
authored andcommitted
scsi: trace: Show rtn in string for scsi_dispatch_cmd_error()
By default the scsi_dispatch_cmd_error() return value is displayed in decimal: kworker/3:1H-183 [003] .... 51.035474: scsi_dispatch_cmd_error: host_no=0 channel=0 id=0 lun=4 data_sgl=1 prot_sgl=0 prot_op=SCSI_PROT_NORMAL cmnd=(READ_10 lba=3907214 txlen=1 protect=0 raw=28 00 00 3b 9e 8e 00 00 01 00) rtn=4181 However, these numbers are not particularly helpful wrt. debugging errors. Especially since the kernel code consistently uses the following defines in hexadecimal: SCSI_MLQUEUE_HOST_BUSY 0x1055 SCSI_MLQUEUE_DEVICE_BUSY 0x1056 SCSI_MLQUEUE_EH_RETRY 0x1057 SCSI_MLQUEUE_TARGET_BUSY 0x1058 Switch to using the string form of these values in the trace output: dd-1059 [007] ..... 31.689529: scsi_dispatch_cmd_error: host_no=0 channel=0 id=0 lun=4 data_sgl=65 prot_sgl=0 prot_op=SCSI_PROT_NORMAL driver_tag=23 scheduler_tag=117 cmnd=(READ_10 lba=0 txlen=128 protect=0 raw=28 00 00 00 00 00 00 00 80 00) rtn=SCSI_MLQUEUE_DEVICE_BUSY Signed-off-by: Kassey Li <quic_yingangl@quicinc.com> Link: https://lore.kernel.org/r/20250521011711.1983625-1-quic_yingangl@quicinc.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent ae7795a commit 9d2c232

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

include/trace/events/scsi.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,14 @@ TRACE_EVENT(scsi_dispatch_cmd_start,
200200
__print_hex(__get_dynamic_array(cmnd), __entry->cmd_len))
201201
);
202202

203+
#define scsi_rtn_name(result) { result, #result }
204+
#define show_rtn_name(val) \
205+
__print_symbolic(val, \
206+
scsi_rtn_name(SCSI_MLQUEUE_HOST_BUSY), \
207+
scsi_rtn_name(SCSI_MLQUEUE_DEVICE_BUSY), \
208+
scsi_rtn_name(SCSI_MLQUEUE_EH_RETRY), \
209+
scsi_rtn_name(SCSI_MLQUEUE_TARGET_BUSY))
210+
203211
TRACE_EVENT(scsi_dispatch_cmd_error,
204212

205213
TP_PROTO(struct scsi_cmnd *cmd, int rtn),
@@ -240,14 +248,15 @@ TRACE_EVENT(scsi_dispatch_cmd_error,
240248

241249
TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
242250
" prot_op=%s driver_tag=%d scheduler_tag=%d cmnd=(%s %s raw=%s)" \
243-
" rtn=%d",
251+
" rtn=%s",
244252
__entry->host_no, __entry->channel, __entry->id,
245253
__entry->lun, __entry->data_sglen, __entry->prot_sglen,
246254
show_prot_op_name(__entry->prot_op), __entry->driver_tag,
247255
__entry->scheduler_tag, show_opcode_name(__entry->opcode),
248256
__parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
249257
__print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
250-
__entry->rtn)
258+
show_rtn_name(__entry->rtn)
259+
)
251260
);
252261

253262
DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,

0 commit comments

Comments
 (0)