From nobody Tue Dec 21 02:19:39 2021 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 A902C18F2DFC; Tue, 21 Dec 2021 02:19:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJ0XC2znzz4g1q; Tue, 21 Dec 2021 02:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 43C2620C76; Tue, 21 Dec 2021 02:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BL2JdtS018499; Tue, 21 Dec 2021 02:19:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL2Jdpb018498; Tue, 21 Dec 2021 02:19:39 GMT (envelope-from git) Date: Tue, 21 Dec 2021 02:19:39 GMT Message-Id: <202112210219.1BL2Jdpb018498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 08d157a8321c - main - Fix dtrace SDT probe tcp:::debug-input 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08d157a8321c845dad9f2d6eecea07639a23411a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640053179; 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=9cSXlSw8vK1zTzElIRsaFdJENqnN5PbxqbFsxBAq5fY=; b=RdVPq4U2PfJagGGlIVP7kssall1DO0zEEhdUk4qwSxLizdE9qLBcJKiR4C0D3v80vrq7mY OZ2BaYaaQrj1SdB+l8k2m4kvgUFVnILSgPOstD1wYQLkeaq6DiNIXOqPng5U/oyDzx1Ibc VXXhuR521agk35UB+AUKYMDbb9aRk29Uot3/irmjDf0x0UF2qQ/lJkB1FvVYmad78dGe9J SCBtyGrIw72piDamWsFfG2D2kLJOaqy9NhTlX/GtVz/15dSR3erv/tVBHuAH+QFfrx9KLL Z1eOdJFtHfVWKTnDSANWUMkOOL4E5oF6wWE9QKCChBvk9L7Qw17YpSpCdEojhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640053179; a=rsa-sha256; cv=none; b=r3Mv4+wtei0g+W2TxlOxxWGCwkDUpKCx+0hAfr3xVgJqeaZmRMZAJ4pOV/vEhMppJRSWxv ppDq/TPa2doxhqbmXYsqnBOsoNmDIdiJm1fIVGvSTSoahDQdJcIuATSBlv47f9P/CNoNFs NyFx1gZm4D/lkPqEjEpy1Omnw89NjlnGoD48j4R6X75u5I+ZaG7FDM9v0TsByKXPL2CDlO 1VEqpAaH+x2+jSLFYSidcxzKJcAU0e0uTBmjXPLtVrGHKKFXmfVORWhEjvBAKQiUthDamI Fdv4s2lLoqLQ69p/PqvI/qbD+231zu3F6GKkyCUQyqbtcVIuAhmOutn/x4EDkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=08d157a8321c845dad9f2d6eecea07639a23411a commit 08d157a8321c845dad9f2d6eecea07639a23411a Author: Robert Wing AuthorDate: 2021-12-21 02:15:43 +0000 Commit: Robert Wing CommitDate: 2021-12-21 02:15:43 +0000 Fix dtrace SDT probe tcp:::debug-input The tcp:::debug-input probe is passed an mbuf pointer, use the correct translator for ipinfo_t when defining tcp:::debug-input. Fixes: 82988b50a17c ("Add an mbuf to ipinfo_t translator to finish ...") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D33066 --- sys/netinet/in_kdtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c index 2cb6748eacdb..a7314a27dbac 100644 --- a/sys/netinet/in_kdtrace.c +++ b/sys/netinet/in_kdtrace.c @@ -111,7 +111,7 @@ SDT_PROBE_DEFINE1_XLATE(tcp, , , siftr, SDT_PROBE_DEFINE3_XLATE(tcp, , , debug__input, "struct tcpcb *", "tcpsinfo_t *" , "struct tcphdr *", "tcpinfoh_t *", - "uint8_t *", "ipinfo_t *"); + "struct mbuf *", "ipinfo_t *"); SDT_PROBE_DEFINE3_XLATE(tcp, , , debug__output, "struct tcpcb *", "tcpsinfo_t *" ,