From nobody Tue Apr 15 12:46:35 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 4ZcP6g5St2z5t5wv; Tue, 15 Apr 2025 12:46: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 4ZcP6g3YPHz3W50; Tue, 15 Apr 2025 12:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744721195; 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=mDjFRpsjsazLluADaJaon6sR/4ddQDfl3MHKIqJB3Q4=; b=DSeF/KL2P9/mmM9ozCbFwj4pjZ9R6M0d3hqe6nMKqDdNNoFDbfV44ELOogmtwobw7gXJAA P4Y3IHyO8WvOlhcCV0K1gZp/2JDddeWehInEtUvAFJd8cY3w8UiR8Qec92m2XMDmGArRoA XjLlD4qVk4wLFm922AOieJ9/wLB1tAt+NOFNjyCm4/XrtXmsaqCevgwgzlBgql43H3RDI5 DCQ9KX4JhMYhchjM7rWw1uHAkkTgsudaAX5QZ99i0/3mFBS9jaF2qXvFxgXzjR5D37AoSa 2zQ0t4NAbf6V49Yiyr5i9vUXFJ7P7TXtVFM8/JvBNemYVsQA/ITTyRgdC6JSCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744721195; a=rsa-sha256; cv=none; b=QmI/ThWI60bg6+v2SdypRmbvyOFtKlsZp9wuZLNkOP7MnTrjYGwG1Ey9X3wqOBPs5OQ0dU OaWJRMlFX0w0/PG34CNHbXkaitJ+N6D4aauqBLM2Ccda7/D02BewpSH1Uyfmq3M0BIVGuq iP7P4iYAwsU0pyoS/WtXCllN1x+4Gy1uL+ONeSoRnzDeW743W3Cr1zym74uHgSqqtiQhwr 2H5VTIvsOL+w+j5hQpS6I6Vxytz86wooRcZGDQTjvn6AAKKQMg+fYdOJEkjE7Rlw2Kg+DB DNsrk9OcRrQJ1YTNH8+YEoaSsQwPpmOGL5ovXmNbGCC3zKndsjNwS4cz7S5trg== 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=1744721195; 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=mDjFRpsjsazLluADaJaon6sR/4ddQDfl3MHKIqJB3Q4=; b=bf0HDmCznXlfdw9xfmZp5NJIe4AVwpXVKiMUeOophJwVW2nA7VLe7VEcOgW3zDgOF4Ofjo KaXb1JRhDHcx4GGxnTCquw3sRKlv3MzcLqBGRlY4iREcQyl0BA63cVuM2lMVg5c4mRRAhk OjMEiw5hT5rhd303OBi7ddXreukXYx/u2z9bh++hqcZDubhsaMtRN98rTKjX4EXiFql+ST ZTgSgm4BjTqKqJ4UBzKoqfuwbJUdDqges3JyOouW6UhWdWYXP2RM56bmP3ttC/1xRCQ3RZ zfGbrmGdTbZx4Ag7qPHRuL4J/HocntK+rg/pE7noNU/rf76c4GbR2xsFqybzsA== 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 4ZcP6g37HjzbHD; Tue, 15 Apr 2025 12:46:35 +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 53FCkZun078300; Tue, 15 Apr 2025 12:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FCkZRR078297; Tue, 15 Apr 2025 12:46:35 GMT (envelope-from git) Date: Tue, 15 Apr 2025 12:46:35 GMT Message-Id: <202504151246.53FCkZRR078297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 29273f6a2582 - main - pf: add SDT on REASON_SET() 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29273f6a258264ebc053da8e1a20e85d620b68aa Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=29273f6a258264ebc053da8e1a20e85d620b68aa commit 29273f6a258264ebc053da8e1a20e85d620b68aa Author: Kristof Provost AuthorDate: 2025-04-14 11:41:30 +0000 Commit: Kristof Provost CommitDate: 2025-04-15 07:47:48 +0000 pf: add SDT on REASON_SET() Add a probe point in the REASON_SET macro. This can be halpful during debugging, letting us figure out exactly where PF made a decision. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 ++ sys/netpfil/pf/pf.c | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index e3a8412bde73..22b902532743 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -330,6 +330,7 @@ MALLOC_DECLARE(M_PFHASH); MALLOC_DECLARE(M_PF_RULE_ITEM); SDT_PROVIDER_DECLARE(pf); +SDT_PROBE_DECLARE(pf, , test, reason_set); struct pfi_dynaddr { TAILQ_ENTRY(pfi_dynaddr) entry; @@ -1759,6 +1760,7 @@ struct pf_sctp_multihome_job { #define REASON_SET(a, x) \ do { \ + SDT_PROBE2(pf, , test, reason_set, x, __LINE__); \ if ((a) != NULL) \ *(a) = (x); \ if (x < PFRES_MAX) \ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 9d965d583629..8c4b5a7ea2da 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -120,6 +120,7 @@ #define DPFPRINTF(n, x) if (V_pf_status.debug >= (n)) printf x SDT_PROVIDER_DEFINE(pf); +SDT_PROBE_DEFINE2(pf, , test, reason_set, "int", "int"); SDT_PROBE_DEFINE4(pf, ip, test, done, "int", "int", "struct pf_krule *", "struct pf_kstate *"); SDT_PROBE_DEFINE5(pf, ip, state, lookup, "struct pfi_kkif *",