From nobody Mon Dec 18 12:08:42 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 4StzBL5Jspz54Pxx; Mon, 18 Dec 2023 12:08:42 +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 4StzBL2C3Fz3Cj5; Mon, 18 Dec 2023 12:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702901322; 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=84UIWoGAMU1lGJ3xiFWROZG4Scx4evGnlB4EXYBkIwU=; b=So8zwWZsXP0VR88jWcdDeurcERs4I2+j97CbnNvqNQZdvK1/xUIbFS/eJzHuaqZzOrrTe2 b7+eAVXwx+D537BRHKOsPTWkdE8AIq3ahicY+JClQsT/aZLw4b+f3m5P/EHz3sM75qJP1X QMikdwQAAObPXSWu/0+aNowCoekqxtyOGasyNdtSDjQmc7QRAz5ICo/Cm1+F52CjUCM9tQ VB4gUT2G098ydO7MAyUZB7/QpfQJZvpTwBTsWHcy0AtwUr6qF6iz2o7GF/cVXYXLRD3F8w SnF1V5lRukKb9YCmaquhz7+mQY1uTVkOrfw/GzPVCctYflweS7zv+Wch/22J5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702901322; a=rsa-sha256; cv=none; b=BW/VAMUA435mblnp438c6ZcjJN4lzFr1d16YvQE5RPa9+UxocqsmxoFLRLKQxDRIO9b15s kVrW7x7+BJB93G9r6FjgoO/nT6PFadC7hHqKQjTQulf3qA+Nv3oA6A4CADDNZ3aBPMYwMa 1K1qcub0Yfk9ZZuUKk70EtSpw1DnUzvUlnDzl6827cObyvucmB8rikZn3sNzaXvG+PPwOg hXpOPnjv3PX1E5SNNCmbyy7be1+RLTPDIZVigizfHKI9C4sfu4VW2kNnmNXbaHZ0h0jMvC EajZmJSLwermLNWweoHLLDVgyMIeEU/o80x+FHjPOyaza9ox0qkuLixkHLgz9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702901322; 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=84UIWoGAMU1lGJ3xiFWROZG4Scx4evGnlB4EXYBkIwU=; b=RmcIlWdF/oBHVd2nEyboB2rNqq6M6HwfUgOxLLqIGURRgotUfF0k7N/1OA9N7fn6n8+Ior bchIQccE8c64a5LA6TjsuBj42hfrSZDww60DoWlRmbWMQvnvKQz60174VYg2uLWo4VcNPZ TLvJcc8m1+yPmH1lf3Vso5VaRuTTUWRmsSY9Wqy8BUl3zGj3sZoyN7bGe150WHo/SuQ8q2 uFrF7MtlaH7dMFPaGrq+JFQLlMXXl+mvh2AEeLanm3J/tn1ndHNS+lSSKaB16kC4I1ejdS d+dxmPtBG7qtj5TSLguDlau+t9uTEB7rAJPnxLTMc+1naIQLo+1xzKkYIqyt+w== 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 4StzBL1HJBz5QD; Mon, 18 Dec 2023 12:08:42 +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 3BIC8gSM070298; Mon, 18 Dec 2023 12:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BIC8gUI070295; Mon, 18 Dec 2023 12:08:42 GMT (envelope-from git) Date: Mon, 18 Dec 2023 12:08:42 GMT Message-Id: <202312181208.3BIC8gUI070295@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: e3b9058e5cd0 - main - tcp: properly unroll sack transmission on tx error with LRD 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: e3b9058e5cd0f541da596624a366e14cabcf2e2a Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b9058e5cd0f541da596624a366e14cabcf2e2a commit e3b9058e5cd0f541da596624a366e14cabcf2e2a Author: Richard Scheffenegger AuthorDate: 2023-12-18 12:01:28 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-18 12:02:22 +0000 tcp: properly unroll sack transmission on tx error with LRD Reviewed By: tuexen, #transport MFC after: 1 week Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43085 --- sys/netinet/tcp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index f5b3ff1f03b4..6016aa3b6ddc 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1652,7 +1652,7 @@ timer: ((flags & TH_SYN) == 0) && (error != EPERM)) { if (sack_rxmit) { - p->rxmit -= len; + p->rxmit = SEQ_MIN(p->end, p->rxmit) - len; tp->sackhint.sack_bytes_rexmit -= len; KASSERT(tp->sackhint.sack_bytes_rexmit >= 0, ("sackhint bytes rtx >= 0"));