From owner-svn-src-head@FreeBSD.ORG  Thu Oct 11 15:21:08 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 63426455;
 Thu, 11 Oct 2012 15:21:08 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 4C48C8FC0C;
 Thu, 11 Oct 2012 15:21:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9BFL7bR043351;
 Thu, 11 Oct 2012 15:21:07 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9BFL7v4043349;
 Thu, 11 Oct 2012 15:21:07 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210111521.q9BFL7v4043349@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 11 Oct 2012 15:21:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241444 - head/sys/cam
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Oct 2012 15:21:08 -0000

Author: mav
Date: Thu Oct 11 15:21:07 2012
New Revision: 241444
URL: http://svn.freebsd.org/changeset/base/241444

Log:
  Increase device CCB queue array size by CAM_RL_VALUES - 1 (4) elements.
  It is required to store extra recovery requests in case of bus resets.
  On ATA/SATA this fixes assertion panics on HEAD with INVARIANTS enabled or
  possible memory corruptions otherwise if timeout/reset happens when device
  CCB queue is already full.
  
  Reported by:	gibbs@
  MFC after:	1 week

Modified:
  head/sys/cam/cam_queue.c

Modified: head/sys/cam/cam_queue.c
==============================================================================
--- head/sys/cam/cam_queue.c	Thu Oct 11 13:25:09 2012	(r241443)
+++ head/sys/cam/cam_queue.c	Thu Oct 11 15:21:07 2012	(r241444)
@@ -314,7 +314,8 @@ cam_ccbq_resize(struct cam_ccbq *ccbq, i
 	 * same size once the outstanding entries have been processed.
 	 */
 	if (space_left < 0
-	 || camq_resize(&ccbq->queue, new_size) == CAM_REQ_CMP) {
+	 || camq_resize(&ccbq->queue, new_size + (CAM_RL_VALUES - 1)) ==
+	    CAM_REQ_CMP) {
 		ccbq->devq_openings += delta;
 		ccbq->dev_openings += delta;
 		return (CAM_REQ_CMP);
@@ -327,7 +328,7 @@ int
 cam_ccbq_init(struct cam_ccbq *ccbq, int openings)
 {
 	bzero(ccbq, sizeof(*ccbq));
-	if (camq_init(&ccbq->queue, openings) != 0) {
+	if (camq_init(&ccbq->queue, openings + (CAM_RL_VALUES - 1)) != 0) {
 		return (1);
 	}
 	ccbq->devq_openings = openings;