From owner-svn-src-projects@FreeBSD.ORG Wed Oct 16 12:13:20 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9935A4C9; Wed, 16 Oct 2013 12:13:20 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8832E28BE; Wed, 16 Oct 2013 12:13:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GCDKsG094038; Wed, 16 Oct 2013 12:13:20 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GCDKeP094037; Wed, 16 Oct 2013 12:13:20 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310161213.r9GCDKeP094037@svn.freebsd.org> From: Alexander Motin Date: Wed, 16 Oct 2013 12:13:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256622 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 12:13:20 -0000 Author: mav Date: Wed Oct 16 12:13:20 2013 New Revision: 256622 URL: http://svnweb.freebsd.org/changeset/base/256622 Log: Prohibit sleeping in CAM completion threads. We have limited number of them same as interrupt threads. We don't want somebody carelessly blocked all CAM subsystem by arbitrary sleep. Modified: projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 11:53:03 2013 (r256621) +++ projects/camlock/sys/cam/cam_xpt.c Wed Oct 16 12:13:20 2013 (r256622) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -5264,6 +5265,7 @@ xpt_done_td(void *arg) STAILQ_HEAD(, ccb_hdr) doneq; STAILQ_INIT(&doneq); + THREAD_NO_SLEEPING(); mtx_lock(&queue->cam_doneq_mtx); while (1) { while (STAILQ_EMPTY(&queue->cam_doneq)) {