From nobody Sat Jul 01 06:47:29 2023 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 4QtN69691Lz4l5NN; Sat, 1 Jul 2023 06:47: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 4QtN695Mqhz3N0g; Sat, 1 Jul 2023 06:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688194049; 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=kdjPgVwRjH+C0TaRphDX62UqTmAC90kxQVl1AFYm9Dw=; b=jYn/dhCUflWoDw4I0dRP3t8avVYLnogMBJe1AaOUKpQ3/xkmJS8bUmFZhvjUZGreSw8lW5 HkBo3bCoxAoMWcnY7BiT6YgxvZnzvGEc3HjJqwDM1mC58H2rCWXBKzS/0aPKNN+VAfSpFj DGfNJWx9f5JwRc7vh7JzNSqPBj1HLsWVRq2kDkXzuAsUS7youJO9oKbnhjXqkUz266SVUe RIUBkfE+X251HazmTzw3EsV3cTcwZCvHXHPOz8IH+VdDHii6aS8Kk5rwTWDb/2q2BngVmi hXxK5YsbkSdqttB/+gEU44Ti+0VlNAYO8sUaNbzUPGxmmfCUzcCkT9NEobZBLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688194049; 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=kdjPgVwRjH+C0TaRphDX62UqTmAC90kxQVl1AFYm9Dw=; b=KPWjmvQxQ+LFE1ba4UmSWxqZNP4ZNq2t2h7+rlApptyOfPKzSWhnDl2y8XA1ygADzk0KXy H2Uz2pf/s4kxpX0DrMWICcXl3v47CBo2yi/HejkwDA9ZBCGkAq7svrOCCxGWXob5ls/tj5 GI6iKNv6oBNfLPm5vtf8EMzqJWrZ/a+2vpN2hi43Xh7tzxHwP8l7HlkKr4sKh+Ftnbhqkz 2hpZuULmeKW+rWKTJN/3YDtQCGi10o/l+2Y60E6J47WNQx8awUxGJ1VgbfGSRz6PvCBVlu 1tr/WgCEFlAsjS2yyI2oj0rZhrS7DXVf0uFtzLPEgD3trZ85G+QgJIcAJgWuTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688194049; a=rsa-sha256; cv=none; b=XwoLlXD+D7t4Wuvy0nr6w9lGzPTfykeIFr0bRYar4k1Jf2EZGvxflVLVCipLM1ULGXgxzD sxq5/BOD9UrkijtIHiWDqVbAT4DhiCeIBwD41jlLxEvHuguvv500NWqTXRvEHexiH82Zbs 7m0NNvPUBzHdanQFyweA8Ib70taEgMi5cE6TJRt287r43tbe4g0rHvx2p5h146Drg3Z7cY GQLwE8uW6ulmhfTlzOtdzXK/ESzKKVvos+ozX4iI3tx6uVYL/lSc+vBcafeg/g2/oEcYYK HZP7TajsWawTHBtUS8ifOiXpdnEZTEgUv8ynzKGN3s1Imft/Yjli8QhINkiCcw== 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 4QtN694S7tzGKQ; Sat, 1 Jul 2023 06:47: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 3616lTwi009590; Sat, 1 Jul 2023 06:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3616lTHu009589; Sat, 1 Jul 2023 06:47:29 GMT (envelope-from git) Date: Sat, 1 Jul 2023 06:47:29 GMT Message-Id: <202307010647.3616lTHu009589@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: 643d06711912 - main - dtrace: another update of the siftr probe 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 643d06711912b3b318643cccf8f9bda59767aae2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=643d06711912b3b318643cccf8f9bda59767aae2 commit 643d06711912b3b318643cccf8f9bda59767aae2 Author: Michael Tuexen AuthorDate: 2023-07-01 00:45:16 +0000 Commit: Michael Tuexen CommitDate: 2023-07-01 00:45:16 +0000 dtrace: another update of the siftr probe This adds the changes corresponding to https://cgit.freebsd.org/src/commit/?id=d090464ecd4af5cd400ef5cbbfe8409d019eac34 to the siftr probe. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D40824 --- cddl/lib/libdtrace/siftr.d | 8 ++++---- share/man/man4/dtrace_tcp.4 | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/cddl/lib/libdtrace/siftr.d b/cddl/lib/libdtrace/siftr.d index 7fbe4ded384b..e61155036d96 100644 --- a/cddl/lib/libdtrace/siftr.d +++ b/cddl/lib/libdtrace/siftr.d @@ -54,12 +54,12 @@ typedef struct siftrinfo { uint32_t snd_ssthresh; int conn_state; u_int max_seg_size; - int smoothed_rtt; + uint32_t srtt; u_char sack_enabled; u_char snd_scale; u_char rcv_scale; u_int flags; - int rxt_length; + uint32_t rto; u_int snd_buf_hiwater; u_int snd_buf_cc; u_int rcv_buf_hiwater; @@ -84,12 +84,12 @@ translator siftrinfo_t < struct pkt_node *p > { 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; - smoothed_rtt = p == NULL ? 0 : p->smoothed_rtt; + srtt = p == NULL ? 0 : p->srtt; sack_enabled = p == NULL ? 0 : p->sack_enabled; snd_scale = p == NULL ? 0 : p->snd_scale; rcv_scale = p == NULL ? 0 : p->rcv_scale; flags = p == NULL ? 0 : p->flags; - rxt_length = p == NULL ? 0 : p->rxt_length; + rto = p == NULL ? 0 : p->rto; snd_buf_hiwater = p == NULL ? 0 : p->snd_buf_hiwater; snd_buf_cc = p == NULL ? 0 : p->snd_buf_cc; rcv_buf_hiwater = p == NULL ? 0 : p->rcv_buf_hiwater; diff --git a/share/man/man4/dtrace_tcp.4 b/share/man/man4/dtrace_tcp.4 index 507be10fbfca..6d7fc9f93793 100644 --- a/share/man/man4/dtrace_tcp.4 +++ b/share/man/man4/dtrace_tcp.4 @@ -346,12 +346,8 @@ in .Pa /usr/lib/dtrace/tcp.d . .It Vt u_int max_seg_size The maximum segment size for the flow, in bytes. -.It Vt int smoothed_rtt -The current smoothed RTT estimate for the flow, in units of TCP_RTT_SCALE * HZ, -where TCP_RTT_SCALE is a define found in -.Pa /usr/include/netinet/tcp_var.h , -and HZ is the kernel's tick timer. -Divide by TCP_RTT_SCALE * HZ to get the RTT in secs. +.It Vt uint32_t srtt +The current smoothed RTT (SRTT) for the flow in microseconds. .It Vt u_char sack_enabled SACK enabled indicator. 1 if SACK enabled, 0 otherwise. .It Vt u_char snd_scale @@ -360,9 +356,8 @@ The current window scaling factor for the sending window. The current window scaling factor for the receiving window. .It Vt u_int flags The current value of the t_flags for the flow. -.It Vt int rxt_length -The current retransmission timeout length for the flow, in units of HZ, where HZ -is the kernel's tick timer. +.It Vt uint32_t rto +The current retransmission timeout (RTO) for the flow in microseconds. Divide by HZ to get the timeout length in seconds. .It Vt u_int snd_buf_hiwater The current size of the socket send buffer in bytes.