From owner-svn-src-stable-11@freebsd.org  Sat Dec 31 12:49:21 2016
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 97970C9864F;
 Sat, 31 Dec 2016 12:49:21 +0000 (UTC) (envelope-from mjg@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 66F151C33;
 Sat, 31 Dec 2016 12:49:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBVCnKkd084452;
 Sat, 31 Dec 2016 12:49:20 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBVCnKTd084451;
 Sat, 31 Dec 2016 12:49:20 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201612311249.uBVCnKTd084451@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sat, 31 Dec 2016 12:49:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r310965 - stable/11/sys/kern
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Dec 2016 12:49:21 -0000

Author: mjg
Date: Sat Dec 31 12:49:20 2016
New Revision: 310965
URL: https://svnweb.freebsd.org/changeset/base/310965

Log:
  MFC r303921:
  
      ktrace: do a lockless check on fork to see if tracing is enabled
  
      This saves 2 lock acquisitions in the common case.

Modified:
  stable/11/sys/kern/kern_ktrace.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_ktrace.c
==============================================================================
--- stable/11/sys/kern/kern_ktrace.c	Sat Dec 31 12:47:41 2016	(r310964)
+++ stable/11/sys/kern/kern_ktrace.c	Sat Dec 31 12:49:20 2016	(r310965)
@@ -572,9 +572,14 @@ void
 ktrprocfork(struct proc *p1, struct proc *p2)
 {
 
+	MPASS(p2->p_tracevp == NULL);
+	MPASS(p2->p_traceflag == 0);
+
+	if (p1->p_traceflag == 0)
+		return;
+
 	PROC_LOCK(p1);
 	mtx_lock(&ktrace_mtx);
-	KASSERT(p2->p_tracevp == NULL, ("new process has a ktrace vnode"));
 	if (p1->p_traceflag & KTRFAC_INHERIT) {
 		p2->p_traceflag = p1->p_traceflag;
 		if ((p2->p_tracevp = p1->p_tracevp) != NULL) {