From nobody Mon Feb 24 14:56:34 2025 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 4Z1kMl1CFbz5pHSk; Mon, 24 Feb 2025 14:56:35 +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 4Z1kMk6FlSz3PcW; Mon, 24 Feb 2025 14:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740408994; 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=Ah7iqrbK5orDm/dK7TVFOka0laoLPU91xr9xdlH3ByU=; b=uQ+P+mc8nHtBtiy9wr2n4s8vnYxrpYuqAiYIuH3wJZDF+90TiOGSQzdEXjtzqJPVVIslSL FWnDKN4XKaSvqysKqROvgfikX5rIceRzKbuFPRl+/ajjUv3Fj2m6/+aOlFTWXjuegQh1Ap 1cBrhA0KgIGD+tlRmJVtUWEp6P6V7acScZlmOE5TOjIqqs/NB1nVVAGv/9uYMGoYWFVXmH yavV2+UO+t4n0PeE0hiHF8PFYAFHQ+74C4Sy/IiO2E/xK2atkvsf6hpl0TZgEt6qDCuLYF SAFtAYl2tKJIeLls2I7iEec8t6RB265vmIojR0xqvPLwzpMYpYnin8XRtf/zGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740408994; a=rsa-sha256; cv=none; b=cKtqUwyWbR8EykQ9BhzV0RE8Bdc5zErUAAOiRJPivb9q6nBKE/cq3RGemXy+GyUd+5QxfY C6zvB88JqdsqlkJ96eh6YO/KZrntSdq7lIo651CrgXNrDd+j/AJAqpc0vT2I2l7WPICDGQ IR0KWhWnwqpCsH8ILlHLR2yKAOobscYsRj04FZPUub9ZTqe+VovwvAZ3w1m1Q2p965CKR5 QB2JZaa3PrdLX/bbEiTvFD+QJX9RzgphhLx7jnT3drhx9G2eizU8kDbHOTZ4I0R9v0bW9D /+WLV3yWP6GKJPaeHaV+bxYdsPt9VVprBIIeTUfBDZSMN2ZTfbfAKBd0Jjri/A== 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=1740408994; 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=Ah7iqrbK5orDm/dK7TVFOka0laoLPU91xr9xdlH3ByU=; b=Eo4rOhQidKoVZvyTt1omzIYjHJ9PcDfGqBO/PW3KPZVsiEbgGMi5SGVRKPtGSSijAL5zCr 2DpuZpgc5v8RjujsEC63Z5s2O+6D6um8ypQwNgItmvUuHPh+GK4kuSwb89tfBMusslQQ7e eGK7OJ/gGtq7dA9U6tEqNfGARtlFt+BvmclBA4iIl085ZgZypx7emJgBKGNA4leXKacC5v VXjb/1tX/d96hLHODAleHTgvL9TqwSr8bb2HssgkR7G/nOiCorIarzFyPxqUBwlVtUY0Kp fR79DcddpaAE4ccFqfv0MQhxTopJgzg605OPpWhaicwRy4+fNs67qiwxBac+UQ== 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 4Z1kMk5ksZzlv7; Mon, 24 Feb 2025 14:56:34 +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 51OEuYa5008840; Mon, 24 Feb 2025 14:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OEuYcu008837; Mon, 24 Feb 2025 14:56:34 GMT (envelope-from git) Date: Mon, 24 Feb 2025 14:56:34 GMT Message-Id: <202502241456.51OEuYcu008837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a1452eec4768 - main - dtrace: fix signature mismatch for taskqueue callbacks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a1452eec4768272056aa070db94ea7184ce1117c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a1452eec4768272056aa070db94ea7184ce1117c commit a1452eec4768272056aa070db94ea7184ce1117c Author: SHENGYI HONG AuthorDate: 2025-02-23 17:42:41 +0000 Commit: Mark Johnston CommitDate: 2025-02-24 14:56:29 +0000 dtrace: fix signature mismatch for taskqueue callbacks Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49112 --- 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);