From nobody Wed Oct 11 21:11:10 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 4S5QRf5y5Bz4wjW0; Wed, 11 Oct 2023 21:11:10 +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 4S5QRf5WT8z3NWp; Wed, 11 Oct 2023 21:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697058670; 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=XWmq9gZIvBViTZ5YTyllwuYovxG35T5M8Nx0EXjeH3U=; b=YTgBUMXIpFfOoLXW87YMt3j2PMgC6II3UPWR9f3uB9XaaA4ijm5tCkqy2wgwFpFwxSIr9L nRZuVl1Wjk7QWqlRhkNQwQ4OoX24mtUOaLEqgc+Ls1NGPRrgVyH9Qrtxg/evyfdzcxeIdH 7fNLyVZcpWBJuEKhmY04Q8OTwph0dmOzX+92C1cQ3sM1C575pzbx3ksjVKfbuDZ5YtQK2R /em5IYY7s+AbRZfynt7Nffxe/8qHJjBQrnN8sZZAv/E77RJ3mqqv5WKBnbv0OdL7DcZ3Kk zScq9unScm6sqKwWzWWNdEL0scxiuWbfQvCaBpsGHqkrhXlfT9DJWS3DmOV2yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697058670; a=rsa-sha256; cv=none; b=r63cIKozZNZvMdx+8BelovYb7y5/EGlrYZNykMN0kkIj9luN7qDfBRm354F6soOMscL29+ +WhLxR71xSNMwqhjwJHRnnJm0CyGTO8VfOIv2cstBgY/jqhq6geuSHs8dtyXcTNxA7ea4X MNcVdFTJWqFV4AcvdQsuSilyyPGRQtLaMz8hUmJVHOwgp1BfY/FV9dQmITgmvc4DjKynqM FWn39Gd4XL7/IDO2vQeh9A0OKY1Nt50pbX6t29Zvpr+KAKEN5vLBeVzovG7AvdPe82jaWQ 8f/pQX+gw9hGQsrR8DvZ9fmZpEH7Q9N+vxse7aDJQG4v1HJjukdFSKtBjFpxcw== 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=1697058670; 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=XWmq9gZIvBViTZ5YTyllwuYovxG35T5M8Nx0EXjeH3U=; b=CuiPWuRidG6UEizF/doPpEKSXGtraj0qutVZZBUPfnuewn6lYfGyMd5/akVd1z00+m4CSM YKr2PIsWBR5kw5qRvMJshQXC3hCGwsRDVpPHi7CL1rrvtm3qQXnczOKUXu4ocUw5mxlxFw pBxivcyutUEO39fUTvWOOOeLzYLJpKTwz9XfwKG4w29aw8Ic1VKBVF21DQsOhJ2nVi30yy fgm0l1XcVZubnKQgq2bBo2tWg7hSCIvLbRL1P2TPnSjToV1bngYfXfLxamuhUQkKaxDk3i 2APKqRl+XTIUXYXUOCy29ie+KmVY4MG03jL9wnBECDC1fYrq575JDSfgeRvXyw== 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 4S5QRf4ZZdzcgf; Wed, 11 Oct 2023 21:11:10 +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 39BLBAP2070412; Wed, 11 Oct 2023 21:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BLBAmC070409; Wed, 11 Oct 2023 21:11:10 GMT (envelope-from git) Date: Wed, 11 Oct 2023 21:11:10 GMT Message-Id: <202310112111.39BLBAmC070409@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: 91ee2d8d9a67 - main - tcp: clear SACK state when scoreboard is forcefully freed 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: 91ee2d8d9a67c4b70612cb02d6d8bcb6a226cb6f Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=91ee2d8d9a67c4b70612cb02d6d8bcb6a226cb6f commit 91ee2d8d9a67c4b70612cb02d6d8bcb6a226cb6f Author: Richard Scheffenegger AuthorDate: 2023-10-11 20:38:34 +0000 Commit: Richard Scheffenegger CommitDate: 2023-10-11 21:09:58 +0000 tcp: clear SACK state when scoreboard is forcefully freed When a Retransmission Timeout happens during an on-going SACK loss recovery episode, the internal SACK accounting was not cleared. Reported by: pho Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42162 --- sys/netinet/tcp_sack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 9a01ff684cbb..8647630bb6bc 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -888,6 +888,10 @@ tcp_free_sackholes(struct tcpcb *tp) while ((q = TAILQ_FIRST(&tp->snd_holes)) != NULL) tcp_sackhole_remove(tp, q); tp->sackhint.sack_bytes_rexmit = 0; + tp->sackhint.sacked_bytes = 0; + tp->sackhint.delivered_data = 0; + tp->sackhint.lost_bytes = 0; + tp->sackhint.hole_bytes = 0; KASSERT(tp->snd_numholes == 0, ("tp->snd_numholes == 0")); KASSERT(tp->sackhint.nexthole == NULL,