From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 29 17:22:00 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 50703F8E;
 Fri, 29 Mar 2013 17:22:00 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4378FDF;
 Fri, 29 Mar 2013 17:22:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2THLxIL069061;
 Fri, 29 Mar 2013 17:21:59 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2THLxt4069059;
 Fri, 29 Mar 2013 17:21:59 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201303291721.r2THLxt4069059@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 29 Mar 2013 17:21:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248897 - projects/camlock/sys/cam
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 17:22:00 -0000

Author: mav
Date: Fri Mar 29 17:21:59 2013
New Revision: 248897
URL: http://svnweb.freebsd.org/changeset/base/248897

Log:
  Make request allocation code always permit immediate allocation for requests
  with priority >= CAM_PRIORITY_OOB (special cases).  Assume that caller knows
  what it does and why and will not send more then request at a time, needed
  for single-stepping error recovery.

Modified:
  projects/camlock/sys/cam/cam.h
  projects/camlock/sys/cam/cam_xpt.c

Modified: projects/camlock/sys/cam/cam.h
==============================================================================
--- projects/camlock/sys/cam/cam.h	Fri Mar 29 16:26:25 2013	(r248896)
+++ projects/camlock/sys/cam/cam.h	Fri Mar 29 17:21:59 2013	(r248897)
@@ -80,6 +80,7 @@ typedef struct {
 #define CAM_PRIORITY_BUS	((CAM_RL_BUS << 8) + 0x80)
 #define CAM_PRIORITY_XPT	((CAM_RL_XPT << 8) + 0x80)
 #define CAM_PRIORITY_DEV	((CAM_RL_DEV << 8) + 0x80)
+#define CAM_PRIORITY_OOB	(CAM_RL_DEV << 8)
 #define CAM_PRIORITY_NORMAL	((CAM_RL_NORMAL << 8) + 0x80)
 #define CAM_PRIORITY_NONE	(u_int32_t)-1
 #define CAM_PRIORITY_TO_RL(x)	((x) >> 8)

Modified: projects/camlock/sys/cam/cam_xpt.c
==============================================================================
--- projects/camlock/sys/cam/cam_xpt.c	Fri Mar 29 16:26:25 2013	(r248896)
+++ projects/camlock/sys/cam/cam_xpt.c	Fri Mar 29 17:21:59 2013	(r248897)
@@ -3179,7 +3179,8 @@ xpt_run_dev_allocq(struct cam_ed *device
 	CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_allocq(%p)\n", device));
 	drvq = &device->drvq;
 	while ((drvq->entries > 0) &&
-	    (device->ccbq.devq_openings > 0) &&
+	    (device->ccbq.devq_openings > 0 ||
+	     CAMQ_GET_PRIO(drvq) >= CAM_PRIORITY_OOB) &&
 	    (cam_ccbq_frozen(&device->ccbq, CAM_PRIORITY_TO_RL(
 	     CAMQ_GET_PRIO(drvq))) == 0)) {
 		union	ccb *work_ccb;