From owner-svn-src-all@freebsd.org Sat Mar 11 18:46:47 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A631CD06B51; Sat, 11 Mar 2017 18:46:47 +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 mx1.freebsd.org (Postfix) with ESMTPS id 5DA5B1614; Sat, 11 Mar 2017 18:46:47 +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 v2BIkk1s098690; Sat, 11 Mar 2017 18:46:46 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2BIkksX098689; Sat, 11 Mar 2017 18:46:46 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703111846.v2BIkksX098689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sat, 11 Mar 2017 18:46:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315084 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Mar 2017 18:46:47 -0000 Author: mav Date: Sat Mar 11 18:46:46 2017 New Revision: 315084 URL: https://svnweb.freebsd.org/changeset/base/315084 Log: Increase device openings to tagged maximum. Some SIMs report much less untagged device openings then tagged ones. Target mode devices are not handled by regular probing routines, and so there is nothing to increase queue size for them to the SIM's maximum. To fix that resize the queue explicitly on ctl periph registration. This radically improves performance of mpt(4) in target mode. Also fetch and report device queue statistics in `ctladm dumpstructs`, since regular way of `camcontrol tags` is not usable in target mode. MFC after: 2 weeks Modified: head/sys/cam/ctl/scsi_ctl.c Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Sat Mar 11 18:40:39 2017 (r315083) +++ head/sys/cam/ctl/scsi_ctl.c Sat Mar 11 18:46:46 2017 (r315084) @@ -468,6 +468,16 @@ ctlferegister(struct cam_periph *periph, softc->periph = periph; periph->softc = softc; + /* Increase device openings to maximum for the SIM. */ + if (bus_softc->sim->max_tagged_dev_openings > + bus_softc->sim->max_dev_openings) { + cam_release_devq(periph->path, + /*relsim_flags*/RELSIM_ADJUST_OPENINGS, + /*openings*/bus_softc->sim->max_tagged_dev_openings, + /*timeout*/0, + /*getcount_only*/1); + } + xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NONE); ccb.ccb_h.func_code = XPT_EN_LUN; ccb.cel.grp6_len = 0; @@ -1827,9 +1837,9 @@ static void ctlfe_dump_sim(struct cam_sim *sim) { - printf("%s%d: max tagged openings: %d, max dev openings: %d\n", - sim->sim_name, sim->unit_number, - sim->max_tagged_dev_openings, sim->max_dev_openings); + printf("%s%d: max dev openings: %d, max tagged dev openings: %d\n", + sim->sim_name, sim->unit_number, sim->max_dev_openings, + sim->max_tagged_dev_openings); } /* @@ -1838,11 +1848,21 @@ ctlfe_dump_sim(struct cam_sim *sim) static void ctlfe_dump_queue(struct ctlfe_lun_softc *softc) { + struct cam_periph *periph = softc->periph; struct ccb_hdr *hdr; - struct cam_periph *periph; + struct ccb_getdevstats cgds; int num_items; - periph = softc->periph; + xpt_setup_ccb(&cgds.ccb_h, periph->path, CAM_PRIORITY_NORMAL); + cgds.ccb_h.func_code = XPT_GDEV_STATS; + xpt_action((union ccb *)&cgds); + if ((cgds.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + xpt_print(periph->path, "devq: openings %d, active %d, " + "allocated %d, queued %d, held %d\n", + cgds.dev_openings, cgds.dev_active, cgds.allocated, + cgds.queued, cgds.held); + } + num_items = 0; STAILQ_FOREACH(hdr, &softc->work_queue, periph_links.stqe) {