From nobody Sun Nov 08 12:29:08 2026 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 4jMsfX2N1bz6yCZT for ; Sun, 08 Nov 2026 12:29:08 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMsfX1dkwz4nxt for ; Sun, 08 Nov 2026 12:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794140948; 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=okc2ilYdLcNIWssWM1scEAGeVL8RHwS8vLeY0+1FG8c=; b=xy/8xbwFiOYeSnAvQOubFb24EYTSnbCOhbmoECRdt1LAELJAxLZA5sKYaybVvrztmqeq0j k+qq1L2sEovdkTqpYIOuiysLdcp09HwN/CcJx8RrX5IAdAINNkshm1FGL9mX7Dpa7jItoc PtcxWBnS4rPieE+b+ANuPR+YFct35UAoEKcLGfXK7Juqe98Xs113Cz7BSH083jBaXebevB ln+Zk8/lR3ftdCEbFKKZSwaN28CnddTHiZ05yWLNhKr3HYjuMuS4whvhkQ7LNwg3oFaWWj x11v6wt3AoNTAu32+zx6BH9Zzvd/TOAtadvd9CyhjIUfbjh1DQpfCsCc8ZyH/g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794140948; b=BaHtCugMtHKhKL55scVWJMua1eojVKlUqVOD7bqSg6qu+cstPPFS4ygjPCYUhVjZDTw0Ds 0ex7i33EMhWlImmgY6uLE3DuE2TtbapYgcNr34lkoQj2My5ZIs+dsMk+t1k0ciQV7oZd6n +Y+gyd5h14WFfsr9fml9VQOqA9PtKaTvMtrf5AZksRqmRtXdVGJ1Rs6R+dNQHMlISgg+yR 9tTTLf4BJ2Q13fzncX7KD0Y88EYV4QgtKsm7eZaXNHapjnZxZfhjGSeCPRtGDhHjG2G9nq q8/dimk2rxAjDwURLrLmKVVzI2vGmVwlWyXayJVU5IWLdJMxLM3F1fkeKozWGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794140948; 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=okc2ilYdLcNIWssWM1scEAGeVL8RHwS8vLeY0+1FG8c=; b=w33oyckhiLphT50CZiwSQ2a3BkxFnc3UcDpZWYK1W9S+tw4xb1NnRIDJFeJ0ldvCW3X9c8 mOJmiU6XqGSyGwXN4xucNuxLdhgpp+mlS36bD299KxkoUedEdOvl1iJ/ejynPfktNvK706 JohqiSlPSsgBultwWwsd4fSR3b4mCR39gA9T31J7OoqXm/5iTIBy6UNacy5a7ysdh+0g6l gWypzi9MznV4oSkTsLTIL3yWz9Gv4uv2NkbdAuyjQsCOCiw9DABz9LO1ak0ZV6BjC8cVyV Y5qIPMkNmfFBAMwWovTLH7yo+mxrOvBuPt8QIw09VLxvD309VjtKTvivtvv+uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jMsfX1FDJz16hp for ; Sun, 08 Nov 2026 12:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a6cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 12:29:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 96691152d13b - main - Mark Johnsons Claude code found a duplicate call to rack_check_reorder_ack() in rack.c List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96691152d13be08926aa48e2cbdae1dfa36dd76c Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 12:29:08 +0000 Message-Id: <6af06b14.1a6cc.7e535728@gitrepo.freebsd.org> The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=96691152d13be08926aa48e2cbdae1dfa36dd76c commit 96691152d13be08926aa48e2cbdae1dfa36dd76c Author: Randall Stewart AuthorDate: 2026-11-08 12:27:06 +0000 Commit: Randall Stewart CommitDate: 2026-11-08 12:27:06 +0000 Mark Johnsons Claude code found a duplicate call to rack_check_reorder_ack() in rack.c Mark's Claude code properly points out an interesting bug case where if a new block is created from a sack aka rsm |--------| sackblk |---------> Then when the new block is created rack_check_reorder_ack() is called and then called again when the block is actually ack'ed. Proper thing is to *not* in this case call the function and only call it at the processing to ACK. You leave the hookery side however since that is just transfering the existing block pointers. Differential Revision:https://reviews.freebsd.org/D61159 --- sys/netinet/tcp_stacks/rack.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 19a5f055c0f2..b27c1e3e9809 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -9554,8 +9554,10 @@ do_rest_ofb: } rack_log_map_chg(tp, rack, NULL, rsm, nrsm, MAP_SACK_M2, end, __LINE__); rsm->r_flags &= (~RACK_HAS_FIN); - /* Check if the ack was too soon i.e. reordering + ack arrives too quickly */ - prohibit_marking = rack_check_reorder_ack(tp, rack, nrsm, nrsm->r_end, cts, 0, __LINE__); + /* Don't do a rack_check_reorder_ack() here since this block just gets + * us so the new rsm can be handled down below in the if(SEQ_GEQ(end, rsm->r_end) below. + * It will be called in that block. + */ /* Position us to point to the new nrsm that starts the sack blk */ rsm = nrsm; }