scsi: core: Improve the code for showing commands in debugfs

Some but not all command information is cleared by scsi_end_request().
As an example, if scsi_show_rq() is called after a SCSI command has been
allocated and before SCMD_INITIALIZED is set, .cmnd holds the CDB
of a previous command. Showing that information in debugfs is confusing.
Hence this patch that restricts the information shown in debugfs to
valid information.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240325224755.1477910-3-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_debugfs.c b/drivers/scsi/scsi_debugfs.c
index d4eaca7cc95266340fd907922890e36d0d49efad..eb52e39f37c926c38cd53b9fb1dd9dfe4499d024 100644 (file)
--- a/drivers/scsi/scsi_debugfs.c
+++ b/drivers/scsi/scsi_debugfs.c
@@ -56,16 +56,20 @@ void scsi_show_rq(struct seq_file *m, struct request *rq)
        struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq);
        int alloc_ms = jiffies_to_msecs(jiffies - cmd->jiffies_at_alloc);
        int timeout_ms = jiffies_to_msecs(rq->timeout);
-       const char *list_info = scsi_cmd_list_info(cmd);
        char buf[80] = "(?)";
 
-       __scsi_format_command(buf, sizeof(buf), cmd->cmnd, cmd->cmd_len);
-       seq_printf(m, ", .cmd=%s, .retries=%d, .allowed=%d, .result = %#x, %s%s.flags=",
-                  buf, cmd->retries, cmd->allowed, cmd->result,
-                  list_info ? : "", list_info ? ", " : "");
+       if (cmd->flags & SCMD_INITIALIZED) {
+               const char *list_info = scsi_cmd_list_info(cmd);
+
+               __scsi_format_command(buf, sizeof(buf), cmd->cmnd, cmd->cmd_len);
+               seq_printf(m, ", .cmd=%s, .retries=%d, .allowed=%d, .result = %#x%s%s",
+                          buf, cmd->retries, cmd->allowed, cmd->result,
+                          list_info ? ", " : "", list_info ? : "");
+               seq_printf(m, ", .timeout=%d.%03d, allocated %d.%03d s ago",
+                          timeout_ms / 1000, timeout_ms % 1000,
+                          alloc_ms / 1000, alloc_ms % 1000);
+       }
+       seq_printf(m, ", .flags=");
        scsi_flags_show(m, cmd->flags, scsi_cmd_flags,
                        ARRAY_SIZE(scsi_cmd_flags));
-       seq_printf(m, ", .timeout=%d.%03d, allocated %d.%03d s ago",
-                  timeout_ms / 1000, timeout_ms % 1000,
-                  alloc_ms / 1000, alloc_ms % 1000);
 }