svn commit: r231253 - in stable/9/sys/cam: ata scsi

[Alexander Motin]

Author: mav
Date: Thu Feb  9 07:43:38 2012
New Revision: 231253
URL: http://svn.freebsd.org/changeset/base/231253

Log:
  MFC r230921:
  Insert ordered command every 1/4 of the current command timeout, not 1/4
  of the default one.
  
  Without this change setting kern.cam.ada.default_timeout to 1 instead of 30
  allowed me to trigger several false positive command timeouts under heavy
  ZFS load on a SiI3132 siis(4) controller with 5 HDDs on a port multiplier.

Modified:
  stable/9/sys/cam/ata/ata_da.c
  stable/9/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ata/ata_da.c
==============================================================================
--- stable/9/sys/cam/ata/ata_da.c	Thu Feb  9 07:40:13 2012	(r231252)
+++ stable/9/sys/cam/ata/ata_da.c	Thu Feb  9 07:43:38 2012	(r231253)
@@ -1105,7 +1105,7 @@ adaregister(struct cam_periph *periph, v
 	 */
 	callout_init_mtx(&softc->sendordered_c, periph->sim->mtx, 0);
 	callout_reset(&softc->sendordered_c,
-	    (ADA_DEFAULT_TIMEOUT * hz) / ADA_ORDEREDTAG_INTERVAL,
+	    (ada_default_timeout * hz) / ADA_ORDEREDTAG_INTERVAL,
 	    adasendorderedtag, softc);
 
 	if (ADA_RA >= 0 &&
@@ -1660,7 +1660,7 @@ adasendorderedtag(void *arg)
 	}
 	/* Queue us up again */
 	callout_reset(&softc->sendordered_c,
-	    (ADA_DEFAULT_TIMEOUT * hz) / ADA_ORDEREDTAG_INTERVAL,
+	    (ada_default_timeout * hz) / ADA_ORDEREDTAG_INTERVAL,
 	    adasendorderedtag, softc);
 }
 

Modified: stable/9/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_da.c	Thu Feb  9 07:40:13 2012	(r231252)
+++ stable/9/sys/cam/scsi/scsi_da.c	Thu Feb  9 07:43:38 2012	(r231253)
@@ -1098,7 +1098,7 @@ dadump(void *arg, void *virtual, vm_offs
 				/*data_ptr*/(u_int8_t *) virtual,
 				/*dxfer_len*/length,
 				/*sense_len*/SSD_FULL_SIZE,
-				DA_DEFAULT_TIMEOUT * 1000);		
+				da_default_timeout * 1000);
 		xpt_polled_action((union ccb *)&csio);
 
 		if ((csio.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
@@ -1511,7 +1511,7 @@ daregister(struct cam_periph *periph, vo
 	 */
 	callout_init_mtx(&softc->sendordered_c, periph->sim->mtx, 0);
 	callout_reset(&softc->sendordered_c,
-	    (DA_DEFAULT_TIMEOUT * hz) / DA_ORDEREDTAG_INTERVAL,
+	    (da_default_timeout * hz) / DA_ORDEREDTAG_INTERVAL,
 	    dasendorderedtag, softc);
 
 	mtx_unlock(periph->sim->mtx);
@@ -2398,7 +2398,7 @@ dasendorderedtag(void *arg)
 	}
 	/* Queue us up again */
 	callout_reset(&softc->sendordered_c,
-	    (DA_DEFAULT_TIMEOUT * hz) / DA_ORDEREDTAG_INTERVAL,
+	    (da_default_timeout * hz) / DA_ORDEREDTAG_INTERVAL,
 	    dasendorderedtag, softc);
 }