From owner-svn-src-all@FreeBSD.ORG  Thu Mar  5 07:40:42 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8340AD50;
 Thu,  5 Mar 2015 07:40:42 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E9D4AF2;
 Thu,  5 Mar 2015 07:40:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t257eg4L087206;
 Thu, 5 Mar 2015 07:40:42 GMT (envelope-from rwatson@FreeBSD.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t257eg2E087205;
 Thu, 5 Mar 2015 07:40:42 GMT (envelope-from rwatson@FreeBSD.org)
Message-Id: <201503050740.t257eg2E087205@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rwatson set sender to
 rwatson@FreeBSD.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 5 Mar 2015 07:40:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279626 - head/sys/cddl/dev/fbt/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Mar 2015 07:40:42 -0000

Author: rwatson
Date: Thu Mar  5 07:40:41 2015
New Revision: 279626
URL: https://svnweb.freebsd.org/changeset/base/279626

Log:
  Don't all DTrace's FBT on ARM to instrument undefinedinstruction(), as
  this would lead to DTrace reentrance.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/cddl/dev/fbt/arm/fbt_isa.c

Modified: head/sys/cddl/dev/fbt/arm/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/arm/fbt_isa.c	Thu Mar  5 07:30:48 2015	(r279625)
+++ head/sys/cddl/dev/fbt/arm/fbt_isa.c	Thu Mar  5 07:40:41 2015	(r279626)
@@ -105,6 +105,13 @@ fbt_provide_module_function(linker_file_
 	if (name[0] == '_' && name[1] == '_')
 		return (0);
 
+	/*
+	 * Architecture-specific exclusion list, largely to do with FBT trap
+	 * processing, to prevent reentrance.
+	 */
+	if (strcmp(name, "undefinedinstruction") == 0)
+		return (0);
+
 	instr = (uint32_t *)symval->value;
 	limit = (uint32_t *)(symval->value + symval->size);