From nobody Wed Nov 16 10:24:36 2022 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 4NBzgT1WHzz4hVnZ; Wed, 16 Nov 2022 10:24:37 +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 4NBzgT11yNz40qj; Wed, 16 Nov 2022 10:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668594277; 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=gGYUecxCFwWBp43n9QE1UgmITNiIzvYhJ77Saxgch50=; b=C0QJYCoRQdPs/J+cdqd/OS+Kb2+Iux6bw9np/vBBusevnaj93/y6qBfLG0P8UULWljJ6Q+ CSDNDCb4dxoDoHX0iUCEC8sEVo8OXQoHAzGck2Yzr0uQS6QlCUqoBY65CyobbcHd3aX24v 8C9+NFjQDVXXazlYIirw/GeTD72c/nYPbpTwzv/cUSWe0dISkdacm8F7SPzHibgJ7aI5d2 EQHeE5bMUIk/vAmmrZ+VPaAmBNP/DqTqDV+e4wiJec2JxGgoAzLHHS06xbfhx2bpb/FdEj qVZLYE2f0cf7DeEU4WQ02WaTXcFyKTudhcylj9sV709bnBNsIWvRRIruRe+r5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668594277; 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=gGYUecxCFwWBp43n9QE1UgmITNiIzvYhJ77Saxgch50=; b=aUj1r636h78yXK0+Vc1u24UCXfjzj+zm3HKSVQ1RQH85IMS+XY75/lesywwYLJHvIw2j3V BhRadL88lJQfuIvrH98qGQcoSdFloc9FiZ/8lZbae3RuF0e3y3OZjpsmMfZRlMgclFbImw 8Yg7dDyQoQ1HMgvajp0pzCAIa1IFQ+MT9MxrkqvhO91v98puxo9bLRFzwJ4FCWwJziV8aR l1rnnTXEMhQHjh7Rmq8YAqyOvd601bx0ZvcPx01bYecwMdbFG7891g+2Y5Y2hIFN3vdRn8 KmcxVZM6gBzsEo6qM/FnK5iTgZvSX3x4IByTxsgAiWCsrhbOTEaXwjmYrzupEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668594277; a=rsa-sha256; cv=none; b=Nnxh45Dkj0h5PhQ878sAhfJCe8X7cm6kIBN56PLHowwI+Ce0rUNwy8vAB6rcFj1vKWBdOo Jfhh1KoU1oDKuhWzlLCY6cnfT8IU3ejVgZUugGiaZiPn3xHjRKCVRNTQEvwJtwO8nOd5yk bNJnIXWQrWOho6Y3wy54ren3iRqezb7vdQ6Z7zm9mph7aGNy3qu40NsBb0bTPsvefcbi60 +HRFviwpPFJ1sQnvyjr7FRL4XrTbu35mQPXrQQ4ZwhH9Mfsgi7g9mMm8qHDW2BpFKg0qXB plJ6Fm0HywcIpuuswnUN4KghyXLSEc9aW8c7XMjc834gpcDJvU3sLfPYDNc3AQ== 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 4NBzgS75KXzyLw; Wed, 16 Nov 2022 10:24:36 +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 2AGAOaTK051551; Wed, 16 Nov 2022 10:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AGAOa1v051550; Wed, 16 Nov 2022 10:24:36 GMT (envelope-from git) Date: Wed, 16 Nov 2022 10:24:36 GMT Message-Id: <202211161024.2AGAOa1v051550@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: bd4f986644b3 - main - tcp: remove unused t_rttbest 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: bd4f986644b3804e19b92d39f1f90ffabff83e14 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bd4f986644b3804e19b92d39f1f90ffabff83e14 commit bd4f986644b3804e19b92d39f1f90ffabff83e14 Author: Michael Tuexen AuthorDate: 2022-11-16 10:22:13 +0000 Commit: Michael Tuexen CommitDate: 2022-11-16 10:22:13 +0000 tcp: remove unused t_rttbest No functional change intended. Reviewed by: rscheff@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D37401 --- sys/netinet/tcp_input.c | 4 ---- sys/netinet/tcp_stacks/bbr.c | 3 --- sys/netinet/tcp_stacks/rack.c | 3 --- sys/netinet/tcp_usrreq.c | 5 ++--- sys/netinet/tcp_var.h | 2 -- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 301c2837fc0c..e4f2663cafdc 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -377,7 +377,6 @@ cc_conn_init(struct tcpcb *tp) if (tp->t_srtt == 0 && (rtt = metrics.rmx_rtt)) { tp->t_srtt = rtt; - tp->t_rttbest = tp->t_srtt + TCP_RTT_SCALE; TCPSTAT_INC(tcps_usedrtt); if (metrics.rmx_rttvar) { tp->t_rttvar = metrics.rmx_rttvar; @@ -3634,8 +3633,6 @@ tcp_xmit_timer(struct tcpcb *tp, int rtt) delta -= tp->t_rttvar >> (TCP_RTTVAR_SHIFT - TCP_DELTA_SHIFT); if ((tp->t_rttvar += delta) <= 0) tp->t_rttvar = 1; - if (tp->t_rttbest > tp->t_srtt + tp->t_rttvar) - tp->t_rttbest = tp->t_srtt + tp->t_rttvar; } else { /* * No rtt measurement yet - use the unsmoothed rtt. @@ -3644,7 +3641,6 @@ tcp_xmit_timer(struct tcpcb *tp, int rtt) */ tp->t_srtt = rtt << TCP_RTT_SHIFT; tp->t_rttvar = rtt << (TCP_RTTVAR_SHIFT - 1); - tp->t_rttbest = tp->t_srtt + tp->t_rttvar; } tp->t_rtttime = 0; tp->t_rxtshift = 0; diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index c59e64fbf5ed..250418d87150 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -6384,8 +6384,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) tp->t_rttvar += delta; if (tp->t_rttvar <= 0) tp->t_rttvar = 1; - if (tp->t_rttbest > tp->t_srtt + tp->t_rttvar) - tp->t_rttbest = tp->t_srtt + tp->t_rttvar; } else { /* * No rtt measurement yet - use the unsmoothed rtt. Set the @@ -6394,7 +6392,6 @@ tcp_bbr_xmit_timer_commit(struct tcp_bbr *bbr, struct tcpcb *tp, uint32_t cts) */ tp->t_srtt = rtt_ticks << TCP_RTT_SHIFT; tp->t_rttvar = rtt_ticks << (TCP_RTTVAR_SHIFT - 1); - tp->t_rttbest = tp->t_srtt + tp->t_rttvar; } KMOD_TCPSTAT_INC(tcps_rttupdated); tp->t_rttupdated++; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 2aff74362c10..7105ce8bab83 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -7711,8 +7711,6 @@ tcp_rack_xmit_timer_commit(struct tcp_rack *rack, struct tcpcb *tp) tp->t_rttvar += (delta >> 3); if (tp->t_rttvar <= 0) tp->t_rttvar = 1; - if (tp->t_rttbest > tp->t_srtt + tp->t_rttvar) - tp->t_rttbest = tp->t_srtt + tp->t_rttvar; } else { /* * No rtt measurement yet - use the unsmoothed rtt. Set the @@ -7721,7 +7719,6 @@ tcp_rack_xmit_timer_commit(struct tcp_rack *rack, struct tcpcb *tp) */ tp->t_srtt = rtt; tp->t_rttvar = rtt >> 1; - tp->t_rttbest = tp->t_srtt + tp->t_rttvar; } rack->rc_srtt_measure_made = 1; KMOD_TCPSTAT_INC(tcps_rttupdated); diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 7837a28f90b5..4ac563d1fc8e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3131,9 +3131,8 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) tp->t_rxtcur, tp->t_maxseg, tp->t_srtt); db_print_indent(indent); - db_printf("t_rttvar: %d t_rxtshift: %d t_rttmin: %u " - "t_rttbest: %u\n", tp->t_rttvar, tp->t_rxtshift, tp->t_rttmin, - tp->t_rttbest); + db_printf("t_rttvar: %d t_rxtshift: %d t_rttmin: %u\n", + tp->t_rttvar, tp->t_rxtshift, tp->t_rttmin); db_print_indent(indent); db_printf("t_rttupdated: %lu max_sndwnd: %u t_softerror: %d\n", diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 3cfbad75085d..46670a04e42c 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -213,8 +213,6 @@ struct tcpcb { int t_blackhole_exit; /* when to exit blackhole detection */ u_int t_rttmin; /* minimum rtt allowed */ - u_int t_rttbest; /* best rtt we've seen */ - int t_softerror; /* possible error not yet reported */ uint32_t max_sndwnd; /* largest window peer has offered */ /* Cache line 5 */