From owner-svn-src-head@freebsd.org  Tue Jan 26 01:15:20 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A6E8A46424;
 Tue, 26 Jan 2016 01:15:20 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BB9D789;
 Tue, 26 Jan 2016 01:15:20 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0Q1FJpq011730;
 Tue, 26 Jan 2016 01:15:19 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0Q1FJWf011729;
 Tue, 26 Jan 2016 01:15:19 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201601260115.u0Q1FJWf011729@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 26 Jan 2016 01:15:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294757 - head/sys/kern
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 01:15:20 -0000

Author: markj
Date: Tue Jan 26 01:15:18 2016
New Revision: 294757
URL: https://svnweb.freebsd.org/changeset/base/294757

Log:
  Evaluate the sysctl_running fail point before taking the sysctl lock.
  
  The fail point handler may sleep, but this is not permitted while holding a
  rm read lock.
  
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/kern/kern_sysctl.c

Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c	Tue Jan 26 01:02:19 2016	(r294756)
+++ head/sys/kern/kern_sysctl.c	Tue Jan 26 01:15:18 2016	(r294757)
@@ -166,6 +166,8 @@ sysctl_root_handler_locked(struct sysctl
 	if (!(oid->oid_kind & CTLFLAG_MPSAFE))
 		mtx_unlock(&Giant);
 
+	KFAIL_POINT_ERROR(_debug_fail_point, sysctl_running, error);
+
 	if (tracker != NULL)
 		SYSCTL_RLOCK(tracker);
 	else
@@ -1838,8 +1840,6 @@ sysctl_root(SYSCTL_HANDLER_ARGS)
 #endif
 	error = sysctl_root_handler_locked(oid, arg1, arg2, req, &tracker);
 
-	KFAIL_POINT_ERROR(_debug_fail_point, sysctl_running, error);
-
 out:
 	SYSCTL_RUNLOCK(&tracker);
 	return (error);