From nobody Wed Feb 23 17:49:30 2022 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 CB41319E90E2; Wed, 23 Feb 2022 17:49:30 +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 4K3k7Z5M8Lz3FyT; Wed, 23 Feb 2022 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645638570; 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=T4TL4RNvGQwHPyFWgKcA+tduOXCymGHL5Rf5DdJdTn0=; b=WbLtQqxviLygJ8hs8qD2buM6ZakkIUu2b85cSdSEqcUWg5xKbecOtKKeS0IpSTGfboMV/j dmcjGXgrBBei4E/mvrSx2IExeFmwP5kmznmYwjmQheiFhoT6v/hQsnc/GxlsYRq2neRGtC s6Z1nhVtBUBltY68rYPASE8uFE+nxX8BV/Na2C8dOjPAZHbZJkt0jqSL2IaNcA47fzU95t idb+JeFOkxR+BrIIvcABa/azz7nbq0voqPK/YWD3qhPtFQucr90E+feX2jpYbP4m9Oh+SV OIQDETU/EwaqtPEaW5UrzVrOBUJXuZCRKWNjJwOoPtAs7mnSNCEu83dsPN5sPw== 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 984E71C9C6; Wed, 23 Feb 2022 17:49:30 +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 21NHnU3N088950; Wed, 23 Feb 2022 17:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NHnUOR088949; Wed, 23 Feb 2022 17:49:30 GMT (envelope-from git) Date: Wed, 23 Feb 2022 17:49:30 GMT Message-Id: <202202231749.21NHnUOR088949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Wing Subject: git: bcc9518b98b3 - stable/13 - Fix dtrace SDT probe tcp:::debug-input 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: bcc9518b98b3c6c7ac9d45dffd947592a5e9993a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645638570; 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=T4TL4RNvGQwHPyFWgKcA+tduOXCymGHL5Rf5DdJdTn0=; b=mZojYflK2rJCvPlgyUduO787Rm0bllQEY6h22ENEgZL8IGav3n5rJC6d/xir4dgaxaWm+F SiwjKT5j9TAUna7pQ7Uu+UEAkv8UpwVo31RyBuTp8JfVK/XUd5vf/TC6Cv5HV3Sb1GKoE1 f0PvrKaByMBL4vE06ENR24U+SuVG5Q6iOPfHobJL5rLeThqN41DDqKtfY/FLqpHjpywRIh bmP6om4hJeDF/JrxlHFQtmg5T2N5CLain8vZchrXhadx4qaHOhdVxNutiAgCzY6rjhkJC4 YUCJUBKqOTZIIhp2QvPkWfmON9MvBRoHIwGmLG3phhvnGo+79KyULripnv+03A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645638570; a=rsa-sha256; cv=none; b=wNKcaXzNW9V5RSldcat/VXxX2sQjNSUjwt9tyDD09HR0ITsv/qRb8Yg63kisE+8m0lSp+8 s5+hUEOYbAga4ZGlOqGf5Us1hMz+nmUxPsZxaRO572BIR7qOuM7FCHZclXBpXBYmU2DrjU nugKmd8piAkK6kASCfV3zfzHAFsuUmXTLsy6tZZHDMSlglMmuo0g38MYDX8WZjP204SJ8M lPYOmY+dZUD62JrBCYVBpOqJQAJwCBRBmT4KXR692ZQvoD+V/HMhn1WjQSNlW/V5sYRI0m EYwFovjwGZjGcFGpG9yRiGhQtgwqGiPPlGyB3yBsiUO5GF+nferEocbVx2dDag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=bcc9518b98b3c6c7ac9d45dffd947592a5e9993a commit bcc9518b98b3c6c7ac9d45dffd947592a5e9993a Author: Robert Wing AuthorDate: 2021-12-21 02:15:43 +0000 Commit: Robert Wing CommitDate: 2022-02-23 17:47:40 +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 (cherry picked from commit 08d157a8321c845dad9f2d6eecea07639a23411a) --- 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 *" ,