From nobody Sat Feb 24 16:15:39 2024 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 4ThsRw1zvgz5B53q; Sat, 24 Feb 2024 16:15:40 +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 4ThsRv6V5Yz4YpV; Sat, 24 Feb 2024 16:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708791339; 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=wn1+lMCVdjWkc4i0PI1qbqQ4c4niARwLjMgSXO1osYU=; b=g5jB4GKLBeejmmDMZcnuVJTBpxveQaoPgsFdaYhN1rxDxKBUsE38ANvIvCFg22Rr5Yd2gx wQBYMgAyWLXRSvIRPipMRxMnUaPQRCgdHepwL8UkFiPQD6GemqAc3xWcILg7KAmIEcOjUm icZljm7756Um50UVBLBGS7KOghJarQBC8tXgcfe9Ys1DHc6ZEnf3eItSqaGQiM3+pierEc ABU3C0971viC64SwyULtSDIHVpaDz5k+WdUk9wCrLRicIZPDBLlyPzWDOBD/Bil0wM4jE6 1dV4D48xhWZ7NltKmR5nysi+JDPjeeH0Gj8b1rMJ3CVigqawynYgdFQ4qjBVSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708791339; a=rsa-sha256; cv=none; b=pmuX4y2Y7hjcTSZDpjvPdQIrmBP7llk+OmfMw0IzX+CuzVjI5v+6eUELhMs+apg0zX0C39 04iDHt6PouN6t/IQfmBqkE4Lo6606ESEEkCy8ZEvoghf8qfiu9R6t0R3XZpF5XP95pj46r ohxdFVTFTfcygQ3/PBZVrH2CLJop9FF67GDTIO1NkwW/2veguwx4EwHqBfdtBbVui48SJW JYw/2EZFp2SPGRlhdcFUbywNh8vDBL57QCqNgXBKBM0yq+JiMa4prnktIpyOkqfweT1kyA vZcZJDsLtWGsdv8IIr7U0TGjwtEeRNvYmANK2+kODgrYU6ZfZ1LQsU1I+BVQpg== 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=1708791339; 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=wn1+lMCVdjWkc4i0PI1qbqQ4c4niARwLjMgSXO1osYU=; b=jvsTwwKVoxEnIzK3F5VfqRH7/00/PVhnVi0C3JYikfTzHDaarodBk0fAAsH143VSfweXnM gDyXlGzkDdgsfL5SAuVm2nNIXSTgO+3ubRGhQoomN9KEPwkm6TtZYTV6krEPK+hgaXfXSp z3YJUJmCsKI/x1Ct3m0svTOKbfsdtXY8gXcapb7rlOZ/TqMndVV3WbQ1bouSr2ExocD4gJ nJwkA+YXtA4EpfNlS7QVCQcH2djrhkPgiU2PXdHRFYdHR6xNVQd9w73d8dQCKiYoN3AfII khTZcreEdblC460sW9QoiEKCNgAVFEeCGusQCxjF2eZf0/RlKt18mpWCqi02Cg== 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 4ThsRv5bYcz15c9; Sat, 24 Feb 2024 16:15:39 +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 41OGFdoQ091804; Sat, 24 Feb 2024 16:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OGFd22091801; Sat, 24 Feb 2024 16:15:39 GMT (envelope-from git) Date: Sat, 24 Feb 2024 16:15:39 GMT Message-Id: <202402241615.41OGFd22091801@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: 40fdc6d25f01 - main - tcp: provide correct snd_fack on post_recovery 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: 40fdc6d25f01eea7767f1ba21efcde0e8e26b5eb Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=40fdc6d25f01eea7767f1ba21efcde0e8e26b5eb commit 40fdc6d25f01eea7767f1ba21efcde0e8e26b5eb Author: Richard Scheffenegger AuthorDate: 2024-02-24 15:53:32 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 15:55:31 +0000 tcp: provide correct snd_fack on post_recovery Ensure that snd_fack holds a valid value when doing the post_recovery CC processing, for preparation of the cc_cubic update, so that local pipe calculations can correctly refer to snd_fack during and after CC events. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43957 --- sys/netinet/tcp_input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index f023d7477790..8df975bcee54 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -479,6 +479,10 @@ cc_post_recovery(struct tcpcb *tp, struct tcphdr *th) INP_WLOCK_ASSERT(tptoinpcb(tp)); if (CC_ALGO(tp)->post_recovery != NULL) { + if (SEQ_LT(tp->snd_fack, th->th_ack) || + SEQ_GT(tp->snd_fack, tp->snd_max)) { + tp->snd_fack = th->th_ack; + } tp->t_ccv.curack = th->th_ack; CC_ALGO(tp)->post_recovery(&tp->t_ccv); }