From nobody Wed Aug 13 19:22:00 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 4c2JCY09fVz64PCR; Wed, 13 Aug 2025 19:22:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2JCX3g5Sz3GdJ; Wed, 13 Aug 2025 19:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755112920; 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=hGwHb+pu8zi+vqdQLpJEasBRzBPGWL+2M76aFMgw9Es=; b=b4ainddmwL0gBMutPijL4dQ7PQx5l0zXLJyPKnj2ZesK2/H0sKV7IwFtcizJOlhigopdJB 9TmZIQR1JZxpJ+e8Vv/p90LlapK1GeBspr1BnuC23ZMHPUssPWxeE3EitbPUQoBYoqGx0i 00fKC4NLPzxJ9Och022VJ0ZDXXHsVrNE0OnuARrb5E1K3BHEGEFsHvIl/utlgYoGJBem2a WMnE9ykwlyLtkxL4CUipdo64H50HMtYbiLB+W1nJi9asDP+NOSJS4vvr2Ei5NQ1h4DaxIn hX8gyDhOfkW9iAj6rF+CKhqj5kAl/E7OOdrrYp2e9OpSgWlZ22FXqYmy+EG04g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755112920; 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=hGwHb+pu8zi+vqdQLpJEasBRzBPGWL+2M76aFMgw9Es=; b=T1jFa8HhtBctHoZ5ZfzmkwmVXXJPjf72psjbTvEAa7XP4qR2y753lctlbePn/4R/pbjPkM OkkNvACIIxKM6O5cYF6lU6KC3l7GQdQQNs+jAw10WH2ADW+ik3MuVEL38ioq0nz+GZ6OJF 9v20FeLV01XwlOxXKZiYQpxa3CREvduDIN6vreP5jZy6CpQmt/E9dVHOWAyEALSCMBw3AD wC3jqI1S95kvY73I2EQNPH6w1LkvJ3fLj1DrzV4g8Cv4qAxeEz5+nPe2FRCqJ7z2vKHmi7 V8vUjbVqhsMckF+v7toytQKhcn7FRDq5vaiEdQgguxe1GzOtPz4O1NMYDqvbug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755112920; a=rsa-sha256; cv=none; b=frOMXey4AUykQtQnjc4YPH6ZpVhzGWxHMCThNlfT1WdBlxWsnhFtagQz0ctjTMDGHx9qoG SMflzsipb0Spl75HcDyes/Uw5ZcOlevkUIDXnQwDFEIENMHx6Kpmjb0D7sGyhta2KF/W2K BkkPL56JNq/gAzJqiyCJXfLBtJLsWnz1I6gMoVIZCdlXo3uMt7IFdjYiLFcEXpl0g9XLbr 82YOAyQVL8YRlAwotDIaGvAxg5+d9YrelSHyaTEGCq+bUA/GGlnFCUiCp+o6mo5KJDLf1z l6gkLP16CGG9ygzunYTipjyGDUAQQZuEIRwRCys29tsBEsl7fved6aWJBSOkvg== 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 4c2JCX2ZWbz59f; Wed, 13 Aug 2025 19:22:00 +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 57DJM0vA042430; Wed, 13 Aug 2025 19:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DJM0vH042426; Wed, 13 Aug 2025 19:22:00 GMT (envelope-from git) Date: Wed, 13 Aug 2025 19:22:00 GMT Message-Id: <202508131922.57DJM0vH042426@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: 7b9f6ebb9268 - stable/14 - tcp: ensure SACK rxmit never ends up left of its hole 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b9f6ebb9268defdfa4403abdf4b12282110f4c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9f6ebb9268defdfa4403abdf4b12282110f4c8 commit 7b9f6ebb9268defdfa4403abdf4b12282110f4c8 Author: Richard Scheffenegger AuthorDate: 2025-08-06 20:25:30 +0000 Commit: Richard Scheffenegger CommitDate: 2025-08-13 19:19:25 +0000 tcp: ensure SACK rxmit never ends up left of its hole When a RTO happens during SACK loss recovery, snd_recover can possibly pulled left. With Lost Retransmission Detection (LRD) this can lead to rxmit of a hole to end up pointing to the left of the hole, which is unexpected and leads to complications. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51725 (cherry picked from commit 65d4a83399843cb4c6dd44061599390843c162db) --- sys/netinet/tcp_output.c | 2 +- sys/netinet/tcp_sack.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 9855083b579a..a8e2a18f72da 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1255,7 +1255,7 @@ send: * fack acks recoverypoint. */ if ((tp->t_flags & TF_LRD) && SEQ_GEQ(p->rxmit, p->end)) - p->rxmit = tp->snd_recover; + p->rxmit = SEQ_MAX(p->rxmit, tp->snd_recover); tp->sackhint.sack_bytes_rexmit += len; } if (IN_RECOVERY(tp->t_flags)) { diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index f33c7030f21e..cc02263512da 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -770,7 +770,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) cur->end = sblkp->start; cur->rxmit = SEQ_MIN(cur->rxmit, cur->end); if ((tp->t_flags & TF_LRD) && SEQ_GEQ(cur->rxmit, cur->end)) - cur->rxmit = tp->snd_recover; + cur->rxmit = SEQ_MAX(cur->rxmit, tp->snd_recover); } else { /* * ACKs some data in middle of a hole; need @@ -790,7 +790,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) cur->rxmit = SEQ_MIN(cur->rxmit, cur->end); if ((tp->t_flags & TF_LRD) && SEQ_GEQ(cur->rxmit, cur->end)) - cur->rxmit = tp->snd_recover; + cur->rxmit = SEQ_MAX(cur->rxmit, tp->snd_recover); delivered_data += (sblkp->end - sblkp->start); } }