Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 2 Feb 2012 19:02:16 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r230921 - in head/sys/cam: ata scsi
Message-ID:  <201202021902.q12J2GXO050293@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Thu Feb  2 19:02:15 2012
New Revision: 230921
URL: http://svn.freebsd.org/changeset/base/230921

Log:
  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.
  
  MFC after:	1 week

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Thu Feb  2 19:01:41 2012	(r230920)
+++ head/sys/cam/ata/ata_da.c	Thu Feb  2 19:02:15 2012	(r230921)
@@ -1098,7 +1098,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 &&
@@ -1653,7 +1653,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: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu Feb  2 19:01:41 2012	(r230920)
+++ head/sys/cam/scsi/scsi_da.c	Thu Feb  2 19:02:15 2012	(r230921)
@@ -1149,7 +1149,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);
 		cam_periph_unlock(periph);
 
@@ -1597,7 +1597,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);
@@ -2768,7 +2768,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);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202021902.q12J2GXO050293>