Author: mav
Date: Tue Jun 9 02:01:39 2020
New Revision: 361952
URL: https://svnweb.freebsd.org/changeset/base/361952
Log:
MFC r361625: Report STATUS_QUEUED/SENT in `ctladm dumpooa` output.
Modified:
stable/12/sys/cam/ctl/ctl.c
stable/12/sys/cam/ctl/ctl_ioctl.h
stable/12/usr.sbin/ctladm/ctladm.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/cam/ctl/ctl.c
==============================================================================
--- stable/12/sys/cam/ctl/ctl.c Tue Jun 9 02:01:09 2020 (r361951)
+++ stable/12/sys/cam/ctl/ctl.c Tue Jun 9 02:01:39 2020 (r361952)
@@ -2431,6 +2431,12 @@ ctl_ioctl_fill_ooa(struct ctl_lun *lun, uint32_t *cur_
if (io->io_hdr.flags & CTL_FLAG_DMA_QUEUED)
entry->cmd_flags |= CTL_OOACMD_FLAG_DMA_QUEUED;
+
+ if (io->io_hdr.flags & CTL_FLAG_STATUS_QUEUED)
+ entry->cmd_flags |= CTL_OOACMD_FLAG_STATUS_QUEUED;
+
+ if (io->io_hdr.flags & CTL_FLAG_STATUS_SENT)
+ entry->cmd_flags |= CTL_OOACMD_FLAG_STATUS_SENT;
}
mtx_unlock(&lun->lun_lock);
}
Modified: stable/12/sys/cam/ctl/ctl_ioctl.h
==============================================================================
--- stable/12/sys/cam/ctl/ctl_ioctl.h Tue Jun 9 02:01:09 2020
(r361951)
+++ stable/12/sys/cam/ctl/ctl_ioctl.h Tue Jun 9 02:01:39 2020
(r361952)
@@ -247,7 +247,9 @@ typedef enum {
CTL_OOACMD_FLAG_BLOCKED = 0x02,
CTL_OOACMD_FLAG_ABORT = 0x04,
CTL_OOACMD_FLAG_RTR = 0x08,
- CTL_OOACMD_FLAG_DMA_QUEUED = 0x10
+ CTL_OOACMD_FLAG_DMA_QUEUED = 0x10,
+ CTL_OOACMD_FLAG_STATUS_QUEUED = 0x20,
+ CTL_OOACMD_FLAG_STATUS_SENT = 0x40
} ctl_ooa_cmd_flags;
struct ctl_ooa_entry {
Modified: stable/12/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/12/usr.sbin/ctladm/ctladm.c Tue Jun 9 02:01:09 2020
(r361951)
+++ stable/12/usr.sbin/ctladm/ctladm.c Tue Jun 9 02:01:39 2020
(r361952)
@@ -336,17 +336,20 @@ retry:
if (ts.tv_nsec > 0)
cmd_latency += ts.tv_nsec / 1000000;
- fprintf(stdout, "LUN %jd tag 0x%04x%s%s%s%s%s: %s. CDB: %s "
+ fprintf(stdout, "LUN %jd tag 0x%04x%s%s%s%s%s%s%s: %s. CDB: %s "
"(%0.0Lf ms)\n",
(intmax_t)entry->lun_num, entry->tag_num,
(entry->cmd_flags & CTL_OOACMD_FLAG_BLOCKED) ?
" BLOCKED" : "",
- (entry->cmd_flags & CTL_OOACMD_FLAG_DMA) ? " DMA" : "",
+ (entry->cmd_flags & CTL_OOACMD_FLAG_RTR) ? " RTR" :"",
(entry->cmd_flags & CTL_OOACMD_FLAG_DMA_QUEUED) ?
" DMAQUEUED" : "",
+ (entry->cmd_flags & CTL_OOACMD_FLAG_DMA) ? " DMA" : "",
+ (entry->cmd_flags & CTL_OOACMD_FLAG_STATUS_QUEUED) ?
+ " STATUSQUEUED" : "",
+ (entry->cmd_flags & CTL_OOACMD_FLAG_STATUS_SENT) ? "
STATUS" : "",
(entry->cmd_flags & CTL_OOACMD_FLAG_ABORT) ?
" ABORT" : "",
- (entry->cmd_flags & CTL_OOACMD_FLAG_RTR) ? " RTR" :"",
scsi_op_desc(entry->cdb[0], NULL),
scsi_cdb_string(entry->cdb, cdb_str, sizeof(cdb_str)),
cmd_latency);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
