From nobody Thu Jan 8 06:24:34 2026 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 4dmvyB3Cvgz5hsY0 for ; Thu, 08 Jan 2026 06:24:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dmvyB2W9cz3S5H for ; Thu, 08 Jan 2026 06:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767853474; 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=i9531gylaQ48tN+PZxx9/WdJ33MkudmGEUxje7EocM4=; b=ZXed8dDJpqoYZxxKfzQVf5q7PMsfEdPRO3LV3yn3kdjGNIuub7BqvWxRbAs1cWw/FhZhOX MTiJ0Taichi2iEV66yh3h0jLzq1GYksMolhSHswu6tes6Pz1y6WfIS/p6UknbFjk2wk5s1 z6cbTbfV3QY+sp1CxQraFz3tElnLVb1hawjGIIIK8F3P8VFTQ3EDRvma/S7Qkd2UoU3n/T EywkJpVKDtA/I9kRXj0u2sDSqsKPZzDCw1SApXQdW3Z3WbRMRZjQmYURB5jJhJ1iCGo08p lAVqN2NgcZ1SYIhS7TfBoThnhQk9YCJs2nBk+7pLFx1fEa2N2Bv9IL3rwYnogw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767853474; 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=i9531gylaQ48tN+PZxx9/WdJ33MkudmGEUxje7EocM4=; b=hkD+ORNqAebK2VE3Hmx42qaSuHNeJ+J2Ll8jAbdK2hOh4F3Bm1yMF8dA3ConMov7u7DW7k ItCjUONUtoQylWhhAPFoCzLpHucufz7EKKozGESbKCfQZ56kD4xyAlI+exGJR8pTZHxnzZ +UNmtDsxRhE2lgFWEao9ohU7W8AgSCDZnPc2E3SJIZubBtOA5BWJbK3ZK/oVcpQInq34px 4fwcQF4QO4yyQHyF2PzK1oTGf5XGfmNQ70EzgPg7HZrrYsYTO0OeHksmPhh44VyySEkxq/ 5rUgHytC/QLjYIRrcO7vUk2b0VmbQQWIC2oEAQzhBxfVHsN0GGWkK1VkNmMFLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767853474; a=rsa-sha256; cv=none; b=gzJzgRLENZLAf1V9H0NNrmyDg9ojYen19ymv7FSzORylgxLoPZLK3tz/CATNO5+kYsSaWa 5+mdTU+HUZMqRui9eZH39rFUzMXKRUJ2Lkybzcue6vYmUCdZ4BUsswWx9WVsarlW3L+Kgv iMxOF5fBkOn77nAXcV8u9VBelFS3fEwo8ZtHdn0AwDGAoaAiNEzc77boyDwBLyF7cWf5A4 bkNoDP9RhsbS3l0LHN+zCSlnrWfhnq9FrSA66pvEBXYf6lO/8Q33V1E36rZAKbodPyxIQn tqfsSeXxdU4eHu9OVstM95lDj9E73/BMxY9+wQbafUfraa61qUHwab+fHeeCjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dmvyB1x2czBTr for ; Thu, 08 Jan 2026 06:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38a0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Jan 2026 06:24:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ecb1f465836a - main - cam: Start adding dtrace provider 'cam' 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecb1f465836a40c7cdcbcfb67d7d23c36b48c1eb Auto-Submitted: auto-generated Date: Thu, 08 Jan 2026 06:24:34 +0000 Message-Id: <695f4da2.38a0d.36b08c40@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ecb1f465836a40c7cdcbcfb67d7d23c36b48c1eb commit ecb1f465836a40c7cdcbcfb67d7d23c36b48c1eb Author: Warner Losh AuthorDate: 2026-01-08 06:19:03 +0000 Commit: Warner Losh CommitDate: 2026-01-08 06:19:03 +0000 cam: Start adding dtrace provider 'cam' Start to provide robust tracing in cam now that clang has broken my fbt-based dtrace scripts a couple of times. Sponsored by: Netflix Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54468 --- sys/cam/cam.c | 5 +++++ sys/cam/cam.h | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/sys/cam/cam.c b/sys/cam/cam.c index 917197542edc..8e70aacba9a9 100644 --- a/sys/cam/cam.c +++ b/sys/cam/cam.c @@ -30,9 +30,13 @@ #include #ifdef _KERNEL +#include "opt_kdtrace.h" + #include #include #include +#include +#include #include #else /* _KERNEL */ #include @@ -55,6 +59,7 @@ FEATURE(scbus, "SCSI devices support"); +SDT_PROVIDER_DEFINE(cam); #endif static int camstatusentrycomp(const void *key, const void *member); diff --git a/sys/cam/cam.h b/sys/cam/cam.h index 83c1fc7b35ca..4d12debdd86f 100644 --- a/sys/cam/cam.h +++ b/sys/cam/cam.h @@ -33,6 +33,9 @@ #ifdef _KERNEL #include "opt_cam.h" +/* Only need the hooks here so no opt_kdtrace.h */ +#include +#include #endif #ifndef _KERNEL @@ -374,6 +377,17 @@ extern const struct cam_status_entry cam_status_table[]; extern const int num_cam_status_entries; #ifdef _KERNEL extern int cam_sort_io_queues; +#ifdef SDT_PROVIDER_DECLARE +SDT_PROVIDER_DECLARE(cam); +#endif +#define CAM_PROBE1(group, probe, arg0) \ + SDT_PROBE1(cam, , group, probe, arg0) +#define CAM_PROBE2(group, probe, arg0, arg1) \ + SDT_PROBE2(cam, , group, probe, arg0, arg1) +#define CAM_PROBE3(group, probe, arg0, arg1, arg2) \ + SDT_PROBE3(cam, , group, probe, arg0, arg1, arg2) +#define CAM_PROBE4(group, probe, arg0, arg1, arg2, arg3) \ + SDT_PROBE4(cam, , group, probe, arg0, arg1, arg2, arg3) #endif union ccb; struct sbuf;