From nobody Mon Dec 25 08:56:37 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 4SzBbV0vg2z54K3d; Mon, 25 Dec 2023 08:56:38 +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 4SzBbV04JLz3TMG; Mon, 25 Dec 2023 08:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703494598; 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=MO3z1W5Dlqgv6ifoO7/A/cwtNCbtg/kh5kImll8Dznk=; b=FAvNOIXVThKNJDxQlLHmdQJocXW/BkK7RmzPm2qXydr9/aZj7MrKfCpIXN7mhXePIH0F4u JW46PpbM5akdMUCOjZH4lA/THmEvWlc9tYg3XPDIQjd40Qrq6cTQV4CyWThul8r1Vn8Jo9 jJEXcvjS+mr4tDY5DtFUmSkvUkNwVzMHBxnBls8pxxNyg1fNb0dt0o6lBuyGYvFOOR7XiA PZCKNK/0on3N2EfxaSuEEGs/Fox8v7oYHM/u99kjC7d7Cp/F0zBw1F6fm6vHkqQxVRU90/ kA23MortYlR47ig3z5fEvF4e6tgUKUKbFmiqAmHYRV1IluW0aXLdv/z8iUiHqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703494598; a=rsa-sha256; cv=none; b=cMVcRNHLqvmIbSr09SuFAZ5CsLwEdOsQzGZYlfMVmRoHEll3u3ElcEvgAFs1Fw/cOxcsTu PF5leGGMUHKEK/CwSQIuxsCr63aC8hgPz0ksQSckNcQk6sZR9Pd5pZ5hrs2SoZqbCU1I9H NjMH0HofURPTxTJi/eVqDEqZBC/0jemNUpuYOL9rSRgb7/XW+7R1AOE4FfUC61e7QbX/6V +8GdeZrRM3OCUEdXkNHJ9LDZXEH1QuBkyKw7hXFomdM4ru5ucUWuFZbpUvTHJZe2OhCxze WpXs/IPzxklCuo1yic8EHzlYII+1F3biYOoeJWQYbNH0YKA6JA8PAbyIE/JcPg== 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=1703494598; 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=MO3z1W5Dlqgv6ifoO7/A/cwtNCbtg/kh5kImll8Dznk=; b=vVMCUGTO63YvjVEDwP7cw2veMfO0HJsQA2HnPZT69cCPbW8i6BY+cfO6A/mZq2F+VyoS5N LZ4KoPZZHZOpQfA10GVGDcVU9RuD6nIOVqJDSEXR1kVtr57sUx54gwkuvtXdkvA5Wm3xA+ 8JCCf8F/Sb7zaXWGxANdVNjK7Jtf8bupfaPlcOLGHfMIykIdmBlJEUazRm0K9je8X5jAdA 9bw4DdFsHcO+k2vM+jNT+AWzc0E5qQp0kZ/0rdNCdaUqJ/PZmmV52kQf0BOJIOcOVlqMdV 3kYY1OMoK8jgfj5ckKiKJeOuHDmrmJopCk6SjeIN0ebCoh3YJM9NlDe36PJiQA== 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 4SzBbT6Dtcz14h9; Mon, 25 Dec 2023 08:56:37 +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 3BP8ubqn049447; Mon, 25 Dec 2023 08:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BP8ubs4049444; Mon, 25 Dec 2023 08:56:37 GMT (envelope-from git) Date: Mon, 25 Dec 2023 08:56:37 GMT Message-Id: <202312250856.3BP8ubs4049444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: ac83f3fa44f3 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ac83f3fa44f3c64ddb4f817aa4c2032546a1ac92 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=ac83f3fa44f3c64ddb4f817aa4c2032546a1ac92 commit ac83f3fa44f3c64ddb4f817aa4c2032546a1ac92 Author: Richard Scheffenegger AuthorDate: 2023-12-18 12:01:28 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-24 13:32:29 +0000 tcp: properly unroll SACK transmission on TX error with LRD PR: 275798 Reported by: ddaniel@nvidia.com Reviewed by: tuexen, #transport MFC after: 1 week Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43085 (cherry picked from commit e3b9058e5cd0f541da596624a366e14cabcf2e2a) --- 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 d83d4b8d65b1..8efea91e116f 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1654,7 +1654,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"));