From nobody Fri Dec 17 18:11:48 2021
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6E08018EF9B1;
	Fri, 17 Dec 2021 18:11:49 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4JFxrh53MQz4hvS;
	Fri, 17 Dec 2021 18:11:48 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 619E7204CA;
	Fri, 17 Dec 2021 18:11:48 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BHIBm4A005004;
	Fri, 17 Dec 2021 18:11:48 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHIBmMY005003;
	Fri, 17 Dec 2021 18:11:48 GMT
	(envelope-from git)
Date: Fri, 17 Dec 2021 18:11:48 GMT
Message-Id: <202112171811.1BHIBmMY005003@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 30ec3138edc9 - main - dtrace: Disable getf() as it is broken on FreeBSD
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 30ec3138edc9d491446409910f52ccb1b158253e
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1639764708;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=af8vtGdUOMGJsj5fRJiZOTaY1LgmXc6tEBi0G3ktUE8=;
	b=N0QHB3ZlPXz/avDjXHdUm1IkR3JJ28gBEvX2pPhVPfJa01dB0ksRbjVr5vQJo44fhrQF13
	ttEkDYaEw8v1xL99da44EaV41kSHxt20x4WyuKgStJRd/hh6/cJKibzTowYFVihCGIg/0C
	4t9FfC5MJGHLgJA2xUF1wcQLHx9DlSQPtyC8eWY+CMWl43bPocf/U9dPtukcDY04w1d4IH
	bcQ3WHkUomC++RfNGygjcOHb0qdojp1BLOeTiHvBuDifUbin+2a7axr5tTFT0BBBv3qqTU
	4jNvO6oT99Kv3D4JxwEwPLxwS88xyXPeODe0YmvqICKm3FtJzps2G2B8jtLsdQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639764708; a=rsa-sha256; cv=none;
	b=R5xpdj1ui4Mn86ca7K/NtlM6R17ufHTOGA/V3oA+mNNQJjbZgh+MwCsDKkpDG+5BRdv6EN
	EPOoHy7vcTVAnolVHcEnxtL/mB4ZvCnGS8T/XSNjQKgK2jhhvKUpGIdWPaksj+RGsTSKqq
	mLCYZAzrBw6SUp+qAwnxxRBVkXmbeDzgp4NBD6WT/xMEFUCfYifZURk8M+J5sKtsEWtK1d
	gLic0k+wSml1De4SkZD20rlFv8CGnJvxu+FOlnA59N2Ag/BnVq0ZtdXRbcL5vaBB9ZhPv0
	vWL3YrTmCJX5tMOdURKpU6yvggPQieUdUJ9L3JHszXaIKfFON/AoW+26TN86Og==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=30ec3138edc9d491446409910f52ccb1b158253e

commit 30ec3138edc9d491446409910f52ccb1b158253e
Author:     Domagoj Stolfa <domagoj.stolfa@gmail.com>
AuthorDate: 2021-12-17 16:01:54 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-12-17 18:10:22 +0000

    dtrace: Disable getf() as it is broken on FreeBSD
    
    getf() on FreeBSD calls _sx_slock(), _sx_sunlock() and fget_locked().
    Furthermore, it does not set the per-core fault flag, meaning it
    usually ends up in a double fault panic once getf() does get called,
    especially from fbt.
    
    Reviewing the DTrace Toolkit + a number of other scripts scattered
    around FreeBSD, I have not been able to find one use of getf(). Given
    how broken the implementation currently is, we disable it until it
    can be implemented properly.
    
    Also comment out a test in aggs/tst.subr.d for getf().
    
    Reviewed by:    markj
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D33378
---
 cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d | 2 +-
 sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
index 9b02e982fe0d..6668f80d81a0 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
@@ -98,7 +98,7 @@ INTFUNC(ntohll(0x1234567890abcdefL))
 STRFUNC(inet_ntoa((ipaddr_t *)alloca(sizeof (ipaddr_t))))
 STRFUNC(inet_ntoa6((in6_addr_t *)alloca(sizeof (in6_addr_t))))
 STRFUNC(inet_ntop(AF_INET, (void *)alloca(sizeof (ipaddr_t))))
-INTFUNC(getf(0))
+/* INTFUNC(getf(0)) */
 INTFUNC(strtoll("0x12EE5D5", 16))
 STRFUNC(json("{\"systemtap\": false}", "systemtap"))
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index ad14482b80b5..4798db98f6fe 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -10014,6 +10014,9 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
 			}
 
 			if (subr == DIF_SUBR_GETF) {
+#ifdef __FreeBSD__
+				err += efunc(pc, "getf() not supported");
+#else
 				/*
 				 * If we have a getf() we need to record that
 				 * in our state.  Note that our state can be
@@ -10024,6 +10027,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
 				 */
 				if (vstate->dtvs_state != NULL)
 					vstate->dtvs_state->dts_getf++;
+#endif
 			}
 
 			break;