From owner-svn-src-stable-12@freebsd.org Tue Jun 9 02:01:40 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC6F9343849; Tue, 9 Jun 2020 02:01:40 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49gtdw4d7Kz4CmZ; Tue, 9 Jun 2020 02:01:40 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 99EBCE238; Tue, 9 Jun 2020 02:01:40 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05921e7B059509; Tue, 9 Jun 2020 02:01:40 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05921eKX059507; Tue, 9 Jun 2020 02:01:40 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202006090201.05921eKX059507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 9 Jun 2020 02:01:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r361952 - in stable/12: sys/cam/ctl usr.sbin/ctladm X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: in stable/12: sys/cam/ctl usr.sbin/ctladm X-SVN-Commit-Revision: 361952 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 02:01:40 -0000 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);