|
3 | 3 | #include <linux/seq_file.h>
|
4 | 4 | #include <scsi/scsi_cmnd.h>
|
5 | 5 | #include <scsi/scsi_dbg.h>
|
| 6 | +#include <scsi/scsi_host.h> |
6 | 7 | #include "scsi_debugfs.h"
|
7 | 8 |
|
8 | 9 | #define SCSI_CMD_FLAG_NAME(name)[const_ilog2(SCMD_##name)] = #name
|
@@ -33,14 +34,33 @@ static int scsi_flags_show(struct seq_file *m, const unsigned long flags,
|
33 | 34 |
|
34 | 35 | void scsi_show_rq(struct seq_file *m, struct request *rq)
|
35 | 36 | {
|
36 |
| - struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq); |
| 37 | + struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq), *cmd2; |
| 38 | + struct Scsi_Host *shost = cmd->device->host; |
37 | 39 | int alloc_ms = jiffies_to_msecs(jiffies - cmd->jiffies_at_alloc);
|
38 | 40 | int timeout_ms = jiffies_to_msecs(rq->timeout);
|
| 41 | + const char *list_info = NULL; |
39 | 42 | char buf[80] = "(?)";
|
40 | 43 |
|
| 44 | + spin_lock_irq(shost->host_lock); |
| 45 | + list_for_each_entry(cmd2, &shost->eh_abort_list, eh_entry) { |
| 46 | + if (cmd == cmd2) { |
| 47 | + list_info = "on eh_abort_list"; |
| 48 | + goto unlock; |
| 49 | + } |
| 50 | + } |
| 51 | + list_for_each_entry(cmd2, &shost->eh_cmd_q, eh_entry) { |
| 52 | + if (cmd == cmd2) { |
| 53 | + list_info = "on eh_cmd_q"; |
| 54 | + goto unlock; |
| 55 | + } |
| 56 | + } |
| 57 | +unlock: |
| 58 | + spin_unlock_irq(shost->host_lock); |
| 59 | + |
41 | 60 | __scsi_format_command(buf, sizeof(buf), cmd->cmnd, cmd->cmd_len);
|
42 |
| - seq_printf(m, ", .cmd=%s, .retries=%d, .result = %#x, .flags=", buf, |
43 |
| - cmd->retries, cmd->result); |
| 61 | + seq_printf(m, ", .cmd=%s, .retries=%d, .allowed=%d, .result = %#x, %s%s.flags=", |
| 62 | + buf, cmd->retries, cmd->allowed, cmd->result, |
| 63 | + list_info ? : "", list_info ? ", " : ""); |
44 | 64 | scsi_flags_show(m, cmd->flags, scsi_cmd_flags,
|
45 | 65 | ARRAY_SIZE(scsi_cmd_flags));
|
46 | 66 | seq_printf(m, ", .timeout=%d.%03d, allocated %d.%03d s ago",
|
|
0 commit comments