From nobody Sat Jul 1 06:29:29 2023 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 4QtMjP5Qlrz4kvbx; Sat, 1 Jul 2023 06:29:29 +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 4QtMjP4syyz3HJR; Sat, 1 Jul 2023 06:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688192969; 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=OQT0dVTljyxy4ADe8i61B0r1YhMDNHRF4fSn6MKF+y4=; b=NTRxN2cZqxnYvLy6Gt7nZnrQ+ZQgJ0hdaIfk3ZhnnUTViAIqVeqrOlubsyNU+lq6MwQhqT TdlfO0W8xnBPGUB/bLxJvmgLCwlip3b1svrteQbQYjOnrc9pPjlR3mh32HO414Up+oF/Sr xVOwcfMjIWy6s/C6AlniqVuoHMGc1OPNjMWHke19SLDSt/jlqVOphG7W/sWCdwHglla1LI mxbzDi8q/8FYGQr4WCLjHDA16XL+OopIHNvLpa+UGUJWEkhla+KST7ElCKP4MgXgdZn+it StqPp4qx/ZjKodsbgyBMG9e8naI8cvPqkxkBUwgYb3A4/zrwKl4fkQSKzjSVIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688192969; 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=OQT0dVTljyxy4ADe8i61B0r1YhMDNHRF4fSn6MKF+y4=; b=iY5HmmfAaAPQole/tX5cQfTGU+7tMByH+iHA9eRU/rhRvZk8raM46LpUAhNCq8rudM/Cap ArSaLHPAv7KkuIPsDPYIDNl76TYvGRx4i2kUjja8YeRaoyC9nqx2sbLp0dHPuT8193xAos G7prH2BCL127QbznS9HdiusLr+F1qnS1ZYVKt5NRNCUkFCKxXTxYBPfGXnNItqHs4RsMDo MepB4AVXjn7rdiaiyBgfxhcO032kMZEQMGPgHe2vJE2Kals5c8OaAd50hHBVoA8sXrwWIP cQly0V4knmRNnaWJtiho0JYTv6RvsGfd10firf8DW1HLwqqQZm5uwCCQs4AG5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688192969; a=rsa-sha256; cv=none; b=kV1n8xP5qvAt88Y8bzbTYPKKT1aE1+FCZXrNp2w9EfNafQbvBfcyJ2zm69HAXTtXX407ZD vxPUiz2u5UNmv8hCQ2TVOHKmVFOXOXIY676R7uDyAChjtSpMrY3NKAH/3RAw63OfvjurKu ksbZipPZrCC0ZnWNczNylLNTjgmhPtk4EHHU/WDi5urdGVPqZhGJ2S3+huZ8k7nMAQ8Tuo qB8Ug1vCfwTR9jAOn9O8bPph0Daqajo3gVwsJk/RlHXv+yAI9aapbOOPZT2xfizfAz1zAt jC7wLnEPwF+xX9epB1doiqM/GAe4TDstBzU0v6sS89izREkDbI6ej+nrrMI8HQ== 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 4QtMjP3fkTzFK7; Sat, 1 Jul 2023 06:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3616TTNp076962; Sat, 1 Jul 2023 06:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3616TTSa076961; Sat, 1 Jul 2023 06:29:29 GMT (envelope-from git) Date: Sat, 1 Jul 2023 06:29:29 GMT Message-Id: <202307010629.3616TTSa076961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: cade9a8e371d - main - dtrace: update siftr probe 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cade9a8e371d3a95334149aa362bde3a36f13257 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cade9a8e371d3a95334149aa362bde3a36f13257 commit cade9a8e371d3a95334149aa362bde3a36f13257 Author: Michael Tuexen AuthorDate: 2023-07-01 00:26:52 +0000 Commit: Michael Tuexen CommitDate: 2023-07-01 00:26:52 +0000 dtrace: update siftr probe This adds the changes corresponding to https://cgit.freebsd.org/src/commit/?id=1241e8e7aed5d709a6cf62024e9ae750981c03ae to the siftr probe. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D40823 --- cddl/lib/libdtrace/siftr.d | 12 ++++++------ share/man/man4/dtrace_tcp.4 | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cddl/lib/libdtrace/siftr.d b/cddl/lib/libdtrace/siftr.d index e75d41534268..7fbe4ded384b 100644 --- a/cddl/lib/libdtrace/siftr.d +++ b/cddl/lib/libdtrace/siftr.d @@ -47,11 +47,11 @@ typedef struct siftrinfo { uint32_t hash; uint16_t tcp_localport; uint16_t tcp_foreignport; - uint64_t snd_cwnd; - u_long snd_wnd; - u_long rcv_wnd; - u_long snd_bwnd; - u_long snd_ssthresh; + uint32_t snd_cwnd; + uint32_t snd_wnd; + uint32_t rcv_wnd; + uint32_t t_flags2; + uint32_t snd_ssthresh; int conn_state; u_int max_seg_size; int smoothed_rtt; @@ -80,7 +80,7 @@ translator siftrinfo_t < struct pkt_node *p > { snd_cwnd = p == NULL ? 0 : p->snd_cwnd; snd_wnd = p == NULL ? 0 : p->snd_wnd; rcv_wnd = p == NULL ? 0 : p->rcv_wnd; - snd_bwnd = p == NULL ? 0 : p->snd_bwnd; + t_flags2 = p == NULL ? 0 : p->t_flags2; snd_ssthresh = p == NULL ? 0 : p->snd_ssthresh; conn_state = p == NULL ? 0 : p->conn_state; max_seg_size = p == NULL ? 0 : p->max_seg_size; diff --git a/share/man/man4/dtrace_tcp.4 b/share/man/man4/dtrace_tcp.4 index 205317819c56..507be10fbfca 100644 --- a/share/man/man4/dtrace_tcp.4 +++ b/share/man/man4/dtrace_tcp.4 @@ -325,19 +325,18 @@ Hash of the packet that triggered the log message. The TCP port that the local host is communicating via. .It Vt uint16_t tcp_foreignport The TCP port that the foreign host is communicating via. -.It Vt uint64_t snd_cwnd +.It Vt uint32_t snd_cwnd The current congestion window (CWND) for the flow, in bytes. -.It Vt u_long snd_wnd +.It Vt uint32_t snd_wnd The current sending window for the flow, in bytes. The post scaled value is reported, except during the initial handshake (first few packets), during which time the unscaled value is reported. -.It Vt u_long rcv_wnd +.It Vt uint32_t rcv_wnd The current receive window for the flow, in bytes. The post scaled value is always reported. -.It Vt u_long snd_bwnd -The current bandwidth-controlled window for the flow, in bytes. -This field is currently unused and reported as zero. -.It Vt u_long snd_ssthresh +.It Vt uint32_t t_flags2 +The current value of the t_flags2 for the flow. +.It Vt uint32_t snd_ssthresh The slow start threshold (SSTHRESH) for the flow, in bytes. .It Vt int conn_state A TCP state.