d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase device openings to tagged maximum.

Browse Source 
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
This commit is contained in:
Alexander Motin 2017-03-11 18:46:46 +00:00
parent f0985602f2
commit b1303ffeb2
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/cam/ctl/scsi_ctl.c
View File

@ -468,6 +468,16 @@ ctlferegister(struct cam_periph *periph, void *arg)
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) {