Page MenuHomeFreeBSD
Files F107543099

D33054.diff
No OneTemporary
Actions

D33054.diff
View Options

diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c
--- a/sys/dev/mpr/mpr_sas.c
+++ b/sys/dev/mpr/mpr_sas.c
@@ -248,7 +248,8 @@
* INRESET flag as well or scsi I/O will not work.
*/
if (tm->cm_ccb) {
- mpr_dprint(sc, MPR_XINFO, "Unfreezing devq for target ID %d\n",
+ mpr_dprint(sc, MPR_XINFO | MPR_RECOVERY,
+ "Unfreezing devq for target ID %d\n",
tm->cm_targ->tid);
tm->cm_targ->flags &= ~MPRSAS_TARGET_INRESET;
xpt_release_devq(tm->cm_ccb->ccb_h.path, 1, TRUE);
@@ -1924,6 +1925,9 @@
*/
if (targ->flags & MPRSAS_TARGET_INRESET) {
ccb->ccb_h.status = CAM_REQUEUE_REQ | CAM_DEV_QFRZN;
+ mpr_dprint(sc, MPR_XINFO | MPR_RECOVERY,
+ "%s: Freezing devq for target ID %d\n",
+ __func__, targ->tid);
xpt_freeze_devq(ccb->ccb_h.path, 1);
xpt_done(ccb);
return;
@@ -2513,8 +2517,8 @@
if ((sassc->flags & MPRSAS_QUEUE_FROZEN) == 0) {
xpt_freeze_simq(sassc->sim, 1);
sassc->flags |= MPRSAS_QUEUE_FROZEN;
- mpr_dprint(sc, MPR_XINFO, "Error sending command, "
- "freezing SIM queue\n");
+ mpr_dprint(sc, MPR_XINFO | MPR_RECOVERY,
+ "Error sending command, freezing SIM queue\n");
}
}
@@ -2549,7 +2553,7 @@
if (sassc->flags & MPRSAS_QUEUE_FROZEN) {
ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
sassc->flags &= ~MPRSAS_QUEUE_FROZEN;
- mpr_dprint(sc, MPR_XINFO,
+ mpr_dprint(sc, MPR_XINFO | MPR_RECOVERY,
"Unfreezing SIM queue\n");
}
}
@@ -2817,7 +2821,7 @@
if (sassc->flags & MPRSAS_QUEUE_FROZEN) {
ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
sassc->flags &= ~MPRSAS_QUEUE_FROZEN;
- mpr_dprint(sc, MPR_XINFO, "Command completed, unfreezing SIM "
+ mpr_dprint(sc, MPR_INFO, "Command completed, unfreezing SIM "
"queue\n");
}
@@ -3425,6 +3429,11 @@
* the target until the reset has completed. The CCB holds the path which
* is used to release the devq. The devq is released and the CCB is freed
* when the TM completes.
+ * We only need to do this when we're entering reset, not at each time we
+ * need to send an abort (which will happen if multiple commands timeout
+ * while we're sending the abort). We do not release the queue for each
+ * command we complete (just at the end when we free the tm), so freezing
+ * it each time doesn't make sense.
*/
void
mprsas_prepare_for_tm(struct mpr_softc *sc, struct mpr_command *tm,
@@ -3440,13 +3449,15 @@
target->tid, lun_id) != CAM_REQ_CMP) {
xpt_free_ccb(ccb);
} else {
- mpr_dprint(sc, MPR_XINFO,
- "%s: Freezing devq for target ID %d\n",
- __func__, target->tid);
- xpt_freeze_devq(ccb->ccb_h.path, 1);
tm->cm_ccb = ccb;
tm->cm_targ = target;
- target->flags |= MPRSAS_TARGET_INRESET;
+ if ((target->flags & MPRSAS_TARGET_INRESET) == 0) {
+ mpr_dprint(sc, MPR_XINFO | MPR_RECOVERY,
+ "%s: Freezing devq for target ID %d\n",
+ __func__, target->tid);
+ xpt_freeze_devq(ccb->ccb_h.path, 1);
+ target->flags |= MPRSAS_TARGET_INRESET;
+ }
}
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 16, 4:13 PM (21 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15827091
Default Alt Text
D33054.diff (2 KB)

Event Timeline