From nobody Mon Jun 06 20:00:07 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 BB7251BD4826; Mon, 6 Jun 2022 20:00: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 4LH48l4c9dz5833; Mon, 6 Jun 2022 20:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654545607; 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=IYRfTpkohEbSiTddtiO+Hk/MJtWWdDkZi4tO/5gWWpc=; b=iCvSE2+uZtWw2pqYHGnE2KL4hhYkHfjY1bj1RxvL486gJeMYOvIBFikzsQjT0MFTtMmKJo 7Q1l2nhrs5+BJ8v8kWC8DxpvCwhyXHDehFcWwm88/HuVyXeb1au37Li9eSGlU3j3jZx/NV C1TYecc6a7icjA0X4VnG4RNbc1TvZCRdp5tYJbFE9h8ZQFkO0OiTYVidUCi2Fto/cQBt5Z ynqsjX+Dogy04aK1RAd44tAtwVTgZDO1xYltuOiqXUKZ4Y2ker2cO4L+n4wYl5i3p+iwgV jWTl6rV5EWgxXeuWnaxo5lNj2Jmi6/TDEWpyBe+q60IhOqy3MAn+LugtlMAbWg== 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 66B314B78; Mon, 6 Jun 2022 20:00:07 +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 256K07JY021049; Mon, 6 Jun 2022 20:00:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 256K07d4021046; Mon, 6 Jun 2022 20:00:07 GMT (envelope-from git) Date: Mon, 6 Jun 2022 20:00:07 GMT Message-Id: <202206062000.256K07d4021046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 95a99019968c - stable/13 - tcp: Correctly compute the retransmit length for all 64-bit platforms. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95a99019968c0112c0396cffe7da0f6eb2b00af4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654545607; 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=IYRfTpkohEbSiTddtiO+Hk/MJtWWdDkZi4tO/5gWWpc=; b=t2SLDwdds4EGw2wcSDNRnw9suuyQwkLbU8WhQtlDIisf0ZHrT/pg8oLA/j37AKp2M48JDz PxOt0Rm2O+ihM1xp1zRquxGyPsksyrQpERRx6o5FU16txGYpvtBW9hz8ZDdQzdA7lOq+H4 f18fdaGZ/5i6U2Nzo19ejayegmxRONziausmYG5Hi71H18GN8U219FpI7EPggP7w1Sqs0y ElQ+ZEskrhZtf8665gKnJb6uQqGB8RuerWZnBWO4P1QS+VGsy8ALX93FI2xZVWWavD6nGC xCmrNSpANfxxec1LPChLN1U0QPG3onqOSLECeUOjrVUo73j/m5D5ScxDpbZ5dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654545607; a=rsa-sha256; cv=none; b=MpO2p/cw+0oEchBlFmzEbtulhBOY/VzhsnElIwoh2vpOBeAu0lUx+vj4pmzOwF2cXxId2w AUynSLXyjiUNHfFBesVmMPkdOMUz9eJ43JFbpOTadoQwggmBSgWY3uSoGaEX97wn/CHoE1 Qb+R4c2vsbmr+Rtc8nXX+52RJwlIVJKNB3rSnPK5tNT5b6KfCK4toi+jdHYhFCTEUsZF1l DD7lWTX4b2aEZVzkdQgHJc0sKly/CaqrMG8pAQ4jLyTUJSnBATus23MDm8WC2kdWaLUsDs U4VxRrEXTNmtn99EOgV2zfp6uLnHL0bJC+2j0GIjmNtXSdKZlh3nQaToUKe1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=95a99019968c0112c0396cffe7da0f6eb2b00af4 commit 95a99019968c0112c0396cffe7da0f6eb2b00af4 Author: Hans Petter Selasky AuthorDate: 2022-06-02 18:33:21 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-06 19:58:05 +0000 tcp: Correctly compute the retransmit length for all 64-bit platforms. When the TCP sequence number subtracted is greater than 2**32 minus the window size, or 2**31 minus the window size, the use of unsigned long as an intermediate variable, may result in an incorrect retransmit length computation on all 64-bit platforms. While at it create a helper macro to facilitate the computation of the difference between two TCP sequence numbers. Differential Revision: https://reviews.freebsd.org/D35388 Reviewed by: rscheff Sponsored by: NVIDIA Networking (cherry picked from commit 28173d49dccb91e50be9c401dbad1da908a5dc75) --- sys/netinet/tcp_output.c | 13 ++++++++----- sys/netinet/tcp_seq.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 9a395f593162..74721463e622 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -325,13 +325,16 @@ again: */ p = NULL; goto after_sack_rexmit; - } else + } else { /* Can rexmit part of the current hole */ len = ((int32_t)ulmin(cwin, - tp->snd_recover - p->rxmit)); - } else - len = ((int32_t)ulmin(cwin, p->end - p->rxmit)); - off = p->rxmit - tp->snd_una; + SEQ_SUB(tp->snd_recover, p->rxmit))); + } + } else { + len = ((int32_t)ulmin(cwin, + SEQ_SUB(p->end, p->rxmit))); + } + off = SEQ_SUB(p->rxmit, tp->snd_una); KASSERT(off >= 0,("%s: sack block to the left of una : %d", __func__, off)); if (len > 0) { diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h index b6e682ec1fe4..c77fd0fa1f6f 100644 --- a/sys/netinet/tcp_seq.h +++ b/sys/netinet/tcp_seq.h @@ -43,6 +43,7 @@ #define SEQ_LEQ(a,b) ((int)((a)-(b)) <= 0) #define SEQ_GT(a,b) ((int)((a)-(b)) > 0) #define SEQ_GEQ(a,b) ((int)((a)-(b)) >= 0) +#define SEQ_SUB(a,b) ((int)((a)-(b))) #define SEQ_MIN(a, b) ((SEQ_LT(a, b)) ? (a) : (b)) #define SEQ_MAX(a, b) ((SEQ_GT(a, b)) ? (a) : (b))