From owner-svn-src-stable-8@FreeBSD.ORG Sat Jun 19 00:37:14 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D60191065677; Sat, 19 Jun 2010 00:37:14 +0000 (UTC) (envelope-from mjacob@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE2B08FC13; Sat, 19 Jun 2010 00:37:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5J0bEoZ018736; Sat, 19 Jun 2010 00:37:14 GMT (envelope-from mjacob@svn.freebsd.org) Received: (from mjacob@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5J0bE07018734; Sat, 19 Jun 2010 00:37:14 GMT (envelope-from mjacob@svn.freebsd.org) Message-Id: <201006190037.o5J0bE07018734@svn.freebsd.org> From: Matt Jacob Date: Sat, 19 Jun 2010 00:37:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209322 - stable/8/sys/dev/isp X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 00:37:14 -0000 Author: mjacob Date: Sat Jun 19 00:37:14 2010 New Revision: 209322 URL: http://svn.freebsd.org/changeset/base/209322 Log: This is an MFC of 208808 I was getting panics in sleepq_add for the second sleep in isp_kthread. I don't know why- but it occurred to me in looking at the second sleep is that all I want is a pause- not an actual sleep. So do that instead. Modified: stable/8/sys/dev/isp/isp_freebsd.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/ixgbe/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/dev/isp/isp_freebsd.c ============================================================================== --- stable/8/sys/dev/isp/isp_freebsd.c Fri Jun 18 23:14:16 2010 (r209321) +++ stable/8/sys/dev/isp/isp_freebsd.c Sat Jun 19 00:37:14 2010 (r209322) @@ -4135,7 +4135,9 @@ isp_kthread(void *arg) */ if (slp == 0 && fc->hysteresis) { isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "%s: Chan %d sleep hysteresis ticks %d", __func__, chan, fc->hysteresis * hz); - (void) msleep(&isp_fabric_hysteresis, &isp->isp_osinfo.lock, PRIBIO, "ispT", (fc->hysteresis * hz)); + mtx_unlock(&isp->isp_osinfo.lock); + pause("ispt", fc->hysteresis * hz); + mtx_lock(&isp->isp_osinfo.lock); } } mtx_unlock(&isp->isp_osinfo.lock);