From nobody Thu Jan 30 11:01:59 2025 X-Original-To: dev-commits-src-branches@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 4YkGLc0qg9z5lysk; Thu, 30 Jan 2025 11:02:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YkGLc0Cqtz3gvN; Thu, 30 Jan 2025 11:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738234920; 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=or0dIPTLiQ1aTkWJGVDiiwUzyBrny6rvPsSfKcKDoBM=; b=x1QhLTORzzgfqNXxUp2ax0wWBi+80X/3maDeD59/KYpzAtAzIqpC9wOFl3oid8Vy5zsZhU vCIVUZ41/jrtFoqqm1FAc+byLeMd93IhoNkbKNGqozZUxrz54IZmGcYanCePAEShrxtdKM p0BJQyHSFinQPwaP9gpcEcjM+gZxN62lEY8hir9FRz4FqovivjXrT1NgYAmMDPfLEuoC/K 0R1LZfwfTzpzaV/4ZessXkWrswOqaGiQaJLQVLxrZuLpb+kIBnlYVRMv88LXheZ+dXZK9f I0xCJ5lTE2ZQxdz06Jx7DBPgjCCtnEO6CIK7gJFOTqS08mhOjP6fPVZsVIpNPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738234920; 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=or0dIPTLiQ1aTkWJGVDiiwUzyBrny6rvPsSfKcKDoBM=; b=ud2AyOtmb7PJ9eoSnGEqo6U/KtruyN/nNgpUymBF3lcMXXwQJRNy76dSdBg1Z88zkzltli 0tZ4iHSxlZsYsuD1picVgL6/GfX8ROqTyYbprmlNr5a5zmmBgbQOkpziatKF+k0Ku3PmKp Mn4MKiNOfM6TbhYRViY/Oc6IaKoyjVw+hy81ygC/eIuF00ocTtIhVD9cezcZZEwaQ1+7It jXQ4qu5RRf12SsQvfcUcOtWC07l+tof54GVcfOMgtQLzEf3GiMOKv3KZvSR2b9PAeGbbOg BK/yAFL3HKhqNBpvHx+qT+c+zHkCduMh1XDIoeEaAI/dvI8WNZmvikeJpKdo1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738234920; a=rsa-sha256; cv=none; b=PkATZTEbBcFnD+ZuXuTBVJndgLGgSqHahGkXJJL9AmlWP+e901LK0jIJZSIxhDxHmYOZuZ NNik9nsFJckAYVlhxrCeKyy/JgWy9dcPeWweZW5WCfyoQ3Nz0nmXFyBT6cVFWjUSQ6+3t5 M+R0mFYGcgSdMnPi36nsX8NGZEkzy0oTvoq+Sl+BUPPQrU21n6MVcXn5csCO25ZhhBU27U P0d2M2rCo4M2Nu1hHSqmpPMrTlRslZmdfgssenFxi1Bf1io0S1UYyo3KKxzXXljH14xfW2 QH0tkwuS/BUVxOuoRD48nnLqd4NoIP3KA/2NPNEhcCj8fhUcNt0xiJIaRSZu3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkGLb6ZXLzllT; Thu, 30 Jan 2025 11:01:59 +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 50UB1xmR077872; Thu, 30 Jan 2025 11:01:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UB1xeQ077869; Thu, 30 Jan 2025 11:01:59 GMT (envelope-from git) Date: Thu, 30 Jan 2025 11:01:59 GMT Message-Id: <202501301101.50UB1xeQ077869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: d467e667dfcc - stable/14 - pf: add extra SCTP multihoming probe points List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d467e667dfcc26712f10491b6734c79689c41d5b Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d467e667dfcc26712f10491b6734c79689c41d5b commit d467e667dfcc26712f10491b6734c79689c41d5b Author: Kristof Provost AuthorDate: 2025-01-08 21:23:17 +0000 Commit: Kristof Provost CommitDate: 2025-01-30 11:00:30 +0000 pf: add extra SCTP multihoming probe points Add probe points in the SCTP multihome parsing code. This is intended to help debug a multihome issue, and is expected to be generally useful, so will be included for everyone. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit 2d2481c35f5a53322e982e47a2bb8f9085f525b7) --- sys/netpfil/pf/pf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 31c3dd8009de..255d85440fa5 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -132,6 +132,13 @@ SDT_PROBE_DEFINE2(pf, sctp, multihome, add, "uint32_t", "struct pf_sctp_source *"); SDT_PROBE_DEFINE3(pf, sctp, multihome, remove, "uint32_t", "struct pf_kstate *", "struct pf_sctp_source *"); +SDT_PROBE_DEFINE4(pf, sctp, multihome_scan, entry, "int", + "int", "struct pf_pdesc *", "int"); +SDT_PROBE_DEFINE2(pf, sctp, multihome_scan, param, "uint16_t", "uint16_t"); +SDT_PROBE_DEFINE2(pf, sctp, multihome_scan, ipv4, "struct in_addr *", + "int"); +SDT_PROBE_DEFINE2(pf, sctp, multihome_scan, ipv6, "struct in_addr6 *", + "int"); SDT_PROBE_DEFINE3(pf, eth, test_rule, entry, "int", "struct ifnet *", "struct mbuf *"); @@ -6533,6 +6540,8 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, int off = 0; struct pf_sctp_multihome_job *job; + SDT_PROBE4(pf, sctp, multihome_scan, entry, start, len, pd, op); + while (off < len) { struct sctp_paramhdr h; @@ -6544,6 +6553,9 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, if (ntohs(h.param_length) < 4) return (PF_DROP); + SDT_PROBE2(pf, sctp, multihome_scan, param, ntohs(h.param_type), + ntohs(h.param_length)); + switch (ntohs(h.param_type)) { case SCTP_IPV4_ADDRESS: { struct in_addr t; @@ -6573,6 +6585,8 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, if (! job) return (PF_DROP); + SDT_PROBE2(pf, sctp, multihome_scan, ipv4, &t, op); + memcpy(&job->pd, pd, sizeof(*pd)); // New source address! @@ -6606,6 +6620,8 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, if (! job) return (PF_DROP); + SDT_PROBE2(pf, sctp, multihome_scan, ipv6, &t, op); + memcpy(&job->pd, pd, sizeof(*pd)); memcpy(&job->src, &t, sizeof(t)); job->pd.src = &job->src; @@ -6656,6 +6672,7 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, return (PF_PASS); } + int pf_multihome_scan_init(struct mbuf *m, int start, int len, struct pf_pdesc *pd, struct pfi_kkif *kif)