From nobody Wed Jun 18 12:15:52 2025 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 4bMjPh3p40z5PX6s; Wed, 18 Jun 2025 12:15:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMjPh2m7Hz3sgB; Wed, 18 Jun 2025 12:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750248952; 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=FzQuc9vOnbRAOrY4NSxXUz20brGPxXE71Q76+VX0Gy8=; b=qV913syDT/myiPPfqhagCZ+BDNwagmvBCa8zSQOhiDdneXMIzDac+KLsXseYvsPHw0nZhn DJqyG0GEVC3/LVwdXF2BCc/xZviGv+m9e9kGE5haB+81VBMxKZu8Bjkyu0vz0uZzdhXS+A 8WfTwK63yjisgwbGI5zUAF/v8Bhl9ORFIpyUBXTcc3C0QUAAjF9Y231usxW/OBKLBrBiXn tlLa4OX2xoGTLZMEM/XV4ASN3qhAERz1xhazio9bjs3qoKFc7Lcjy8+LqE+ZDRLIlwAtr6 N5vLVEAgMUwnzinP4gkunf8uovo5qJgDwvnWRbn7OkLXxf37UdO4GS3JWXsTZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750248952; 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=FzQuc9vOnbRAOrY4NSxXUz20brGPxXE71Q76+VX0Gy8=; b=huXvUlMSXKGrcev0feR+itTtD12/JjxQ1h9X+z2L0/6cey29dArELIfeAEQVODOrfc7QX/ 37JaQSsKuTZlZw5xalfelTHYSVEfB76xVijLd3GfGkTt+/telEOk2RdWgQqi/4uGmk7sMM a5egx2uwBayV1Qv9cv7iFNUZsR5gWupI752i/7ERMU0gR8OUrCx5ZNNczAFuoiLnhcfXum J0ocHEbBb06zcf2V8oloZDcYjNLrmgI1MzNsOlKnEOLDAvnJLfoJka5lYRQ7OMqelutoKx 5TVWGXtBd+2Tdw6hvNBajYYfTgWVI96+L1UB+ZSd+Upilrmcgnjjxlxo4+QViQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750248952; a=rsa-sha256; cv=none; b=SYx1PnED93cECR7sFT5/Pjo2oWW319C0yf1x3Rcdl7zK5EAoJORlvk9D8tpWs3k6XqOJi+ 1aBSA+tt4CGs52f32bLHpqgTmrqGNpIyKAUqeQIcXFIxgfNNrpeoeyBCP9vkgbeQYEsJJY 2n0zUA8I7YUPiombjZlcQvrfXHRF4Pofden3KUxEJgMwIOKCSusACoRySF4SE4nFlm5AI7 0mgA+EoCXFEHMFXUehY6nmLDa3YDkC5Fa8qBTQh5OUQBUhaD0DLrOUggoPtTzlrjTRo0JF DNmSG2KHtEdfrEakpAHiXI1nIqpV1++PQGhSOldHRls6pxZoo8BBdHjrhyOREA== 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 4bMjPh23mwzDNY; Wed, 18 Jun 2025 12:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55ICFqnX053844; Wed, 18 Jun 2025 12:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55ICFqpr053841; Wed, 18 Jun 2025 12:15:52 GMT (envelope-from git) Date: Wed, 18 Jun 2025 12:15:52 GMT Message-Id: <202506181215.55ICFqpr053841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 359f590b2901 - main - Fix a warning in the rack stack. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 359f590b2901b9ee263c2b72c26b56bcc2f33ae0 Auto-Submitted: auto-generated The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=359f590b2901b9ee263c2b72c26b56bcc2f33ae0 commit 359f590b2901b9ee263c2b72c26b56bcc2f33ae0 Author: Randall Stewart AuthorDate: 2025-06-18 12:14:51 +0000 Commit: Randall Stewart CommitDate: 2025-06-18 12:14:51 +0000 Fix a warning in the rack stack. There is an initialization warning where error may not be set when logging extended BBlogs. Lets fix this so error is init'd to zero so we won't have a warning. --- sys/netinet/tcp_stacks/rack.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 0388d73098a0..aef05f691e1d 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -621,7 +621,7 @@ rack_swap_beta_values(struct tcp_rack *rack, uint8_t flex8) struct tcpcb *tp; uint32_t old_beta; uint32_t old_beta_ecn; - int error, failed = 0; + int error = 0, failed = 0; tp = rack->rc_tp; if (tp->t_cc == NULL) { @@ -8032,6 +8032,7 @@ skip_time_check: ret = rack_timeout_rack(tp, rack, cts); } else if (timers & PACE_TMR_TLP) { rack->r_ctl.rc_tlp_rxt_last_time = cts; + rack->r_fast_output = 0; ret = rack_timeout_tlp(tp, rack, cts, doing_tlp); } else if (timers & PACE_TMR_RXT) { rack->r_ctl.rc_tlp_rxt_last_time = cts; @@ -20888,6 +20889,7 @@ just_return_nolock: rack->r_fsb_inited && TCPS_HAVEESTABLISHED(tp->t_state) && ((IN_RECOVERY(tp->t_flags)) == 0) && + (doing_tlp == 0) && (rack->r_must_retran == 0) && ((tp->t_flags & TF_NEEDFIN) == 0) && (len > 0) && (orig_len > 0) && @@ -21381,7 +21383,8 @@ send: if (max_len <= 0) { len = 0; } else if (len > max_len) { - sendalot = 1; + if (doing_tlp == 0) + sendalot = 1; len = max_len; mark = 2; } @@ -22078,6 +22081,8 @@ out: * In transmit state, time the transmission and arrange for the * retransmit. In persist state, just set snd_max. */ + if ((rsm == NULL) && doing_tlp) + add_flag |= RACK_TLP; rack_log_output(tp, &to, len, rack_seq, (uint8_t) flags, error, rack_to_usec_ts(&tv), rsm, add_flag, s_mb, s_moff, hw_tls, segsiz); @@ -22164,15 +22169,14 @@ out: rack->r_ctl.rc_prr_sndcnt = 0; } sub_from_prr = 0; - if (doing_tlp) { - /* Make sure the TLP is added */ - add_flag |= RACK_TLP; - } else if (rsm) { - /* If its a resend without TLP then it must not have the flag */ - rsm->r_flags &= ~RACK_TLP; - } - - + if (rsm != NULL) { + if (doing_tlp) + /* Make sure the TLP is added */ + rsm->r_flags |= RACK_TLP; + else + /* If its a resend without TLP then it must not have the flag */ + rsm->r_flags &= ~RACK_TLP; + } if ((error == 0) && (len > 0) && (tp->snd_una == tp->snd_max)) @@ -22510,6 +22514,7 @@ enobufs: ((flags & (TH_SYN|TH_FIN)) == 0) && (rsm == NULL) && (ipoptlen == 0) && + (doing_tlp == 0) && rack->r_fsb_inited && TCPS_HAVEESTABLISHED(tp->t_state) && ((IN_RECOVERY(tp->t_flags)) == 0) && @@ -22536,6 +22541,7 @@ enobufs: rack_use_rfo && ((flags & (TH_SYN|TH_FIN)) == 0) && (rsm == NULL) && + (doing_tlp == 0) && (ipoptlen == 0) && (rack->r_must_retran == 0) && rack->r_fsb_inited &&