From nobody Sat Mar 8 08:13:58 2025 X-Original-To: dev-commits-src-all@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 4Z8wsg2MCMz5qd3n; Sat, 08 Mar 2025 08:13:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8wsf2YQdz3l07; Sat, 08 Mar 2025 08:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741421638; 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=sk/RpNVcHHGN4ynVrLeGHibpFyVnJR1HzkiDC16AguQ=; b=LMVLpJtW2nwzrZtYQ7VzvkPlQiO9csg5Ra5n/6ohXS5qsDpycBroazKECpBESMrU5HdzZf phKPVElym5cMfQBw9kGHBrD0EkLqIJ397Cl8mCDNS82I4vHfyS5lpL/FzXG+UI/wyfEQEG U5l3M0mE5DadX030Xv5jkRnUhFoTUaVvdQ0jKbkA/GVASILZindVM94Puh7N1OhpuIRGhs 1Pj88V4uSWIGoZxCjxiCl0sYtdKoC+zXQ8HzIclwu185c5pQMNs9lZ5B5SzxzVZi22tbKp 86bZTLwY4ipdfVJrMKIZrwGC80b8txKwFWCK0MvQDYdwYc8UpI7BahmnL4FgfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741421638; a=rsa-sha256; cv=none; b=g7fK9GatnMdYcFeOFzIW9XB+Ps9ZoE7Y/MBKWxDCY2dNFRljTAcnHaPCAWPHlceit8FBlV CnsLzxqw1cRvNEugkKYog4HNFCBzaE+bbtedj/SvgN0WIm9XDBK0l20mpEa2/dXsR0t1FY 9mfuqUjRozBtMgeKeqnOde7zaYIVVGNmF/y2dRxCgBesC9OSUkTT69Wnekr+NKwmT+OPZZ RWtBBoNlXtXdsd9w7CXh1BVVsNt54MPnpkkLKCdGXwKkTKQAciYJRcKgqePiwvvL1L1QxR zabiDn6+GZEVf9XA0qA2OdHO5fD5hmvbC4tVKZEGj/o3PuO6LJ/3QRCkQxLL4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741421638; 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=sk/RpNVcHHGN4ynVrLeGHibpFyVnJR1HzkiDC16AguQ=; b=Z3/TATI8JNvWvf9ORhwdfE9lBdIRvPyKuI4rTFFWoBEp3Ns7lDUGUkkVuzGP7O4GxHn1jx qSVY/jG5vAwiqe4XoPYu1YZHhi06d2uZMkVqftpJSnd++srUq5UAV2iUMsw3ivJoljYGLL xMqfmPX6l76B0hHkDB06Na/PGjDeSHucRRuVuinQqhgYgNk5rlNhZw5bAyrvEXbDC6a4dL Vgzn0EzyO5gJFcKzMHOLTtdUHOLPvWqL2WUqGOUECYgDscERb8gKKcg4ZqsZ/Ah17edfSd hBYygXLkj8Dhh/m4pvwqL9YeWw3hrcOtbSKySZCGmDqvOsdNRyKBUVVxb1xQiA== 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 4Z8wsf1nFVzjq; Sat, 08 Mar 2025 08:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5288DwhW097686; Sat, 8 Mar 2025 08:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5288DwrO097683; Sat, 8 Mar 2025 08:13:58 GMT (envelope-from git) Date: Sat, 8 Mar 2025 08:13:58 GMT Message-Id: <202503080813.5288DwrO097683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7309434b1508 - stable/14 - dtrace: fix signature mismatch for taskqueue callbacks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7309434b15081c99c860bb9e76c38f76f4292e0f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7309434b15081c99c860bb9e76c38f76f4292e0f commit 7309434b15081c99c860bb9e76c38f76f4292e0f Author: SHENGYI HONG AuthorDate: 2025-02-23 17:42:41 +0000 Commit: Mark Johnston CommitDate: 2025-03-07 22:51:49 +0000 dtrace: fix signature mismatch for taskqueue callbacks Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49112 (cherry picked from commit a1452eec4768272056aa070db94ea7184ce1117c) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 608bff1d23ae..cfd403ac1a01 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -594,7 +594,8 @@ static dtrace_probe_t *dtrace_probe_lookup_id(dtrace_id_t id); static void dtrace_enabling_provide(dtrace_provider_t *); static int dtrace_enabling_match(dtrace_enabling_t *, int *); static void dtrace_enabling_matchall(void); -static void dtrace_enabling_reap(void); +static void dtrace_enabling_matchall_task(void *); +static void dtrace_enabling_reap(void *); static dtrace_state_t *dtrace_anon_grab(void); static uint64_t dtrace_helper(int, dtrace_mstate_t *, dtrace_state_t *, uint64_t, uint64_t); @@ -12991,6 +12992,12 @@ dtrace_enabling_match(dtrace_enabling_t *enab, int *nmatched) return (0); } +static void +dtrace_enabling_matchall_task(void *args __unused) +{ + dtrace_enabling_matchall(); +} + static void dtrace_enabling_matchall(void) { @@ -13118,7 +13125,7 @@ retry: * Called to reap ECBs that are attached to probes from defunct providers. */ static void -dtrace_enabling_reap(void) +dtrace_enabling_reap(void *args __unused) { dtrace_provider_t *prov; dtrace_probe_t *probe; @@ -16719,8 +16726,8 @@ dtrace_module_loaded(modctl_t *ctl) return; } - (void) taskq_dispatch(dtrace_taskq, - (task_func_t *)dtrace_enabling_matchall, NULL, TQ_SLEEP); + (void)taskq_dispatch(dtrace_taskq, + (task_func_t *)dtrace_enabling_matchall_task, NULL, TQ_SLEEP); mutex_exit(&dtrace_lock);