From owner-p4-projects@FreeBSD.ORG  Tue Jan 19 12:33:18 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 456451065697; Tue, 19 Jan 2010 12:33:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0A11A1065695
	for <perforce@freebsd.org>; Tue, 19 Jan 2010 12:33:18 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EC1788FC14
	for <perforce@freebsd.org>; Tue, 19 Jan 2010 12:33:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0JCXHHA045242
	for <perforce@freebsd.org>; Tue, 19 Jan 2010 12:33:17 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0JCXHAt045240
	for perforce@freebsd.org; Tue, 19 Jan 2010 12:33:17 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 19 Jan 2010 12:33:17 GMT
Message-Id: <201001191233.o0JCXHAt045240@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173362 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jan 2010 12:33:18 -0000

http://p4web.freebsd.org/chv.cgi?CH=173362

Change 173362 by mav@mav_mavtest on 2010/01/19 12:32:25

	Reserve some CCBs, to not allocate in case of error recovery.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#13 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#142 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#13 (text+ko) ====

@@ -69,7 +69,7 @@
 		return (NULL);
 
 	sim = (struct cam_sim *)malloc(sizeof(struct cam_sim),
-	    M_CAMSIM, M_NOWAIT);
+	    M_CAMSIM, M_ZERO | M_NOWAIT);
 
 	if (sim == NULL)
 		return (NULL);
@@ -86,6 +86,7 @@
 	sim->flags = 0;
 	sim->refcount = 1;
 	sim->devq = queue;
+	sim->max_ccbs = 8;	/* Reserve for management purposes. */
 	sim->mtx = mtx;
 	if (mtx == &Giant) {
 		sim->flags |= 0;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#142 (text+ko) ====

@@ -926,8 +926,6 @@
 	if (xpt_sim == NULL)
 		return (ENOMEM);
 
-	xpt_sim->max_ccbs = 16;
-
 	mtx_lock(&xsoftc.xpt_lock);
 	if ((status = xpt_bus_register(xpt_sim, NULL, 0)) != CAM_SUCCESS) {
 		mtx_unlock(&xsoftc.xpt_lock);
@@ -4435,7 +4433,7 @@
 
 	device->mintags = 1;
 	device->maxtags = 1;
-	bus->sim->max_ccbs = device->ccbq.devq_openings;
+	bus->sim->max_ccbs += device->ccbq.devq_openings;
 	cur_device = TAILQ_FIRST(&target->ed_entries);
 	while (cur_device != NULL && cur_device->lun_id < lun_id)
 		cur_device = TAILQ_NEXT(cur_device, links);