From nobody Thu Jan 27 18:25:06 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 363DB196DAE9; Thu, 27 Jan 2022 18:25:07 +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 4Jl8C7120Tz3lWT; Thu, 27 Jan 2022 18:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643307907; 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=1UuDUAz5GjeDrhekyXFouIGmHHtpDd5YkT/9IcMAf90=; b=CXAAjbHMD6tTnSFEv61cGNbK5/QSa4PtgrcQ1AKOcAmNrQ9vsevwH8kxK/37UP4UFO5SmN /O15oRLYgWI4sU5Hq0ZWmzfVS/++akEh6QA7OYEdU/bSy/cJn3xoTvGwFmUiN3P0RrXpSO 5Mwne73G1OcKMQHfjt0XTZ1XHTrxtFEVH8C3zCScCIJv9CpZ4t0KCOoURsGVpavjdRknIc 8ChBCzMgswc/WqisC/ktOiOC9q1R/oybF+lrrTZxUlP0BStmq1RZOoiQ5qMY/mZTEM9G6W dAP+CY+gLF2CPLHOvfce25TRd92hchaBgZE0moUXEoXQuj3mBUDRr4V1/KDPeQ== 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 F41A61B912; Thu, 27 Jan 2022 18:25:06 +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 20RIP6Wr062637; Thu, 27 Jan 2022 18:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RIP6Xs062636; Thu, 27 Jan 2022 18:25:06 GMT (envelope-from git) Date: Thu, 27 Jan 2022 18:25:06 GMT Message-Id: <202201271825.20RIP6Xs062636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 4531b3450b23 - main - tcp: Tidying up the conditionals for unwinding a spurious RTO 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4531b3450b23a01de04b3bb393e475cf734793c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643307907; 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=1UuDUAz5GjeDrhekyXFouIGmHHtpDd5YkT/9IcMAf90=; b=HvfDtXSyfH86/z+5xoBk7Hd/l3vAlW16hc9oBNMpR8BrHglgLKQGRg+SxeOpmbCNtfX+rM 8rL8JYBO/oMnKy4aAXXplQhMOOVcsWUQ1EWkCwIfQgBxCu8gep1HCvlLeRV8IyBGBfSvNk NDwt1ZliAEe5LdEKkWDaKv2FFkvgg+NhVeYfWrxoedtNIzDKwaLgCiZH2KC8zaijk1ZVvf lCtqnwsODCS2DwWHicDqx9cDtW2C9sICKQI2lrYQK0TF4ggIPFup0reqkRmvDMgRtwyoYn Jn+4uCA1FNxC0p40UMyGvm7Y1cQDUXYnZyNC7JuKVQqyu+Gc5KIzqw5C1Povlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643307907; a=rsa-sha256; cv=none; b=JJx0nipFAV19C7kPh0NptrgmJaYkSK3uy9g3t6KlpVHGH9YEJIv1q09GmZTYcyR04N1rn5 eWj/gtoUP7+BSfZhd1adDJEJcaoa3fA75vWKOiIHNSBG6AagOV6F+iMg8fw0KLX8SnJe1u WY5pFKLNjgttYcqEHxRb1bQ/qD7blKdxe22hAyVNFZEjscidA3NxIwmarU8ZVu01jYTNL5 yUM8xVqeVO7h42SB1oUbQjADlQ1hsl6sUsmtdCHIog7pGfPy5OW7c0rdhk6+a7JNvb8WiQ SKbAyo7cMNuqBcPjBjvR/DaLkIgBhWeViRhIdwuU2HmqNOo1yj1/+j4Au0Zf5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=4531b3450b23a01de04b3bb393e475cf734793c8 commit 4531b3450b23a01de04b3bb393e475cf734793c8 Author: Richard Scheffenegger AuthorDate: 2022-01-27 17:59:21 +0000 Commit: Richard Scheffenegger CommitDate: 2022-01-27 17:59:55 +0000 tcp: Tidying up the conditionals for unwinding a spurious RTO - Use the semantically correct TSTMP_xx macro when comparing timestamps. (No functional change) - check for bad retransmits only when TSopt is present in ACK (don't assume there will be a valid TSopt in the TCP options struct) - exclude tsecr == 0, since that most likely indicates an invalid ts echo return (tsecr) value. Reviewed By: tuexen, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D34062 --- sys/netinet/tcp_input.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index d6d193d18213..5ffbf18b5991 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1648,9 +1648,10 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, to.to_tsecr -= tp->ts_offset; if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks())) to.to_tsecr = 0; - else if (tp->t_flags & TF_PREVVALID && - tp->t_rxtshift == 1 && - tp->t_badrxtwin != 0 && SEQ_LT(to.to_tsecr, tp->t_badrxtwin)) + else if (tp->t_rxtshift == 1 && + tp->t_flags & TF_PREVVALID && + tp->t_badrxtwin != 0 && + TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) cc_cong_signal(tp, th, CC_RTO_ERR); } /* @@ -1807,7 +1808,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, if ((to.to_flags & TOF_TS) == 0 && tp->t_rxtshift == 1 && tp->t_flags & TF_PREVVALID && - (int)(ticks - tp->t_badrxtwin) < 0) { + tp->t_badrxtwin != 0 && + TSTMP_LT(ticks, tp->t_badrxtwin)) { cc_cong_signal(tp, th, CC_RTO_ERR); } @@ -2884,8 +2886,10 @@ process_ACK: */ if (tp->t_rxtshift == 1 && tp->t_flags & TF_PREVVALID && - tp->t_badrxtwin && - SEQ_LT(to.to_tsecr, tp->t_badrxtwin)) + tp->t_badrxtwin != 0 && + to.to_flags & TOF_TS && + to.to_tsecr != 0 && + TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) cc_cong_signal(tp, th, CC_RTO_ERR); /*