From nobody Tue Nov 03 15:16:02 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 4jJsbW1ZNbz6yPQh for ; Tue, 03 Nov 2026 15:16:07 +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 4jJsbW10y2z4HsC for ; Tue, 03 Nov 2026 15:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793718967; 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=GbspNf9+BiNZtcUa9oJMcrJrpGvtTfBvFDRNMX9BkpA=; b=p5PP6HtZSCzN7W3h33sPaU1giAobz5Bdtf8x7qk5GYeL+ay5TzEsMjHsIPimOkkt4MeyBP XQG7gjSlZmLUJe0rktvO1z81c4l8pFQIbLSUG4fyJiLsle2GX/cQXbLaVYSV1ZvW5Nntwk Ps9UAb2qxgYxCIsRbyKprA5iIkmztxW8sij0Sn6sfuUmA2AVb0OjhoPtIxggyv4vDvzlzb CpDFrMsVOZ5fJM9dhW/o62thyWXFzEW6nLo3C4+puG4l3Un5dp5MA7Magb7zx9R6/uvwnP dNjOGSJxU3LRzwGF66WhBd1T4uSiXzo9/oJkWgGjtPMdfk5AohEVjODtHCicQQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793718967; b=CmLT/PcNhNPI2rzeMHaaZy6nOy8SrgltQjolb9nwtOkOxMfthFTickADudeo3g+dvIHFa7 xBaH5OT7pAKrm13rRqMb29SEWyzX0eNnu7A4OkrCLFFqFyIXrlgdvlMlM4JT6DkkFGxtW/ eJl2ZxpoGAHq97TLX1bJqhR/YL6NicuMK3jQCWUcsUD1pcgNlkCWCsE7ExxOcHeV6vp1pq 0Ak8mzoVOpCOt5Ww4+Y+Ssoaow2qicDQoDd1BheV6LVohqrJblovpptvZmQdOfO+1AnD0n lBGj8fwO3Fd/lm7aYNlDft8RlQSI6GrUNyV1igke16m+aqNlS/SkCdkifMtlAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793718967; 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=GbspNf9+BiNZtcUa9oJMcrJrpGvtTfBvFDRNMX9BkpA=; b=sdmjkhH/g2Wxie1Pnlt26PvWVty+vRMB+R0j5B+DEGXP+Q7Nb+6nyDMojtAIuQl1d+5Syx 8rBK815sb6/06QxaP+D0RKrQTbnHVt/THQQlKXND+DsBNPNAKwl4lzNC6kRWufIOsYYylI noOcBl057SjXk8FXv6qp3oOMn0o7Nb56Vhzs789ztNHyxKrJq9jv+t7uPbsIvhL+H+BzW6 xLHwGG4MEmKbpuE2/V8KXttqnpVNcV4CTUpOCdO1LOwsH1rXRoH7OznEEEXbLXZ4dNrgWg SEHG5ph2Hn/O5UkuOYtPW29cxKSSkVNlZWeBnop40t7l4rzEy43YZbDQXwRH5w== 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 4jJsbW0gtdzLhQ for ; Tue, 03 Nov 2026 15:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44421 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 15:16:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: dc5a7d98ff1c - main - Broadcom tester's were able to trigger a KASSERT in rack due to an accounting issue. 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: dc5a7d98ff1c21d5d77f7d4d7a433b59d57c6d6c Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 15:16:02 +0000 Message-Id: <6ae9fab2.44421.47c5e16@gitrepo.freebsd.org> The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=dc5a7d98ff1c21d5d77f7d4d7a433b59d57c6d6c commit dc5a7d98ff1c21d5d77f7d4d7a433b59d57c6d6c Author: Randall Stewart AuthorDate: 2026-11-03 15:14:04 +0000 Commit: Randall Stewart CommitDate: 2026-11-03 15:14:04 +0000 Broadcom tester's were able to trigger a KASSERT in rack due to an accounting issue. The recently added code to rack to help minimize reordering issues had a KASSERT for protection of its counting field. This was consistently. Triggered in broadcom's testing lab. They came up with a partial solution.. but one of their fixes was also incorrect causing the counter to increase incorrectly as well. I worked with them to give them an updated patch (the one attached in this review). They have tested that in their same repro environment and confirm this fixes the issue. Reviewed by:tuexen, nickbanks_netflix.com Differential Revision: --- sys/netinet/tcp_stacks/rack.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index d817e97e4261..56c1a8e3ebbf 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -382,6 +382,7 @@ counter_u64_t rack_alloc_limited_conns; counter_u64_t rack_split_limited; counter_u64_t rack_rxt_clamps_cwnd; counter_u64_t rack_rxt_clamps_cwnd_uniq; +counter_u64_t rack_dbl_recovery; counter_u64_t rack_multi_single_eq; counter_u64_t rack_proc_non_comp_ack; @@ -815,6 +816,7 @@ sysctl_rack_clear(SYSCTL_HANDLER_ARGS) counter_u64_zero(rack_alloc_limited_conns); counter_u64_zero(rack_split_limited); counter_u64_zero(rack_rxt_clamps_cwnd); + counter_u64_zero(rack_dbl_recovery); counter_u64_zero(rack_rxt_clamps_cwnd_uniq); counter_u64_zero(rack_multi_single_eq); counter_u64_zero(rack_proc_non_comp_ack); @@ -1734,6 +1736,12 @@ rack_init_sysctls(void) OID_AUTO, "split_limited", CTLFLAG_RD, &rack_split_limited, "Split allocations dropped due to limit"); + rack_dbl_recovery = counter_u64_alloc(M_WAITOK); + SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, + SYSCTL_CHILDREN(rack_counters), + OID_AUTO, "rxt_dbl_recovery", CTLFLAG_RD, + &rack_dbl_recovery, + "Number of times that we saw a double recovery scenario"); rack_rxt_clamps_cwnd = counter_u64_alloc(M_WAITOK); SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, SYSCTL_CHILDREN(rack_counters), @@ -3228,6 +3236,7 @@ rack_counter_destroy(void) counter_u64_free(rack_split_limited); counter_u64_free(rack_multi_single_eq); counter_u64_free(rack_rxt_clamps_cwnd); + counter_u64_free(rack_dbl_recovery); counter_u64_free(rack_rxt_clamps_cwnd_uniq); counter_u64_free(rack_proc_non_comp_ack); counter_u64_free(rack_sack_proc_all); @@ -5600,6 +5609,8 @@ rack_cong_signal(struct tcpcb *tp, uint32_t type, uint32_t ack, int line) tp->t_flags &= ~TF_WASFRECOVERY; tp->t_flags &= ~TF_WASCRECOVERY; if (!IN_FASTRECOVERY(tp->t_flags)) { + struct rack_sendmap *rsm; + /* Check if this is the end of the initial Start-up i.e. initial slow-start */ if (rack->rc_initial_ss_comp == 0) { /* Yep it is the end of the initial slowstart */ @@ -5609,6 +5620,27 @@ rack_cong_signal(struct tcpcb *tp, uint32_t type, uint32_t ack, int line) rack->r_ctl.rc_prr_out = 0; rack->r_fast_output = 0; rack->r_ctl.recovery_rxt_cnt = 0; + /* Now to protect against a double entry to recovery (exit and re-enter) + * lets go through the outstanding and update the recovery_rxt_cnt to + * account for retransmitted packets. + */ + TAILQ_FOREACH(rsm, &rack->r_ctl.rc_tmap, r_tnext) { + if ((rsm->r_flags & RACK_WAS_SACKPASS) && + (rsm->r_rtr_cnt > 1)) { + /* + * A double entry into recovery where we + * retransmitted this rsm in the previous recovery. + * Note the counter should be used to see if it ever occurs. + * If it never is found anywnhere then we should remove this + * code i.e the TAILQ_FOREACH block. Note we use r_rtr_cnt in + * the multiply since we don't need the actual count to be accurate + * we just need either 1 or >1 since once its >1 the recovery_rxt_cnt + * will prevent a false postive on bad entries to recovery. + */ + rack->r_ctl.recovery_rxt_cnt += ((rsm->r_end - rsm->r_start) * (rsm->r_rtr_cnt - 1)); + counter_u64_add(rack_dbl_recovery, 1); + } + } if (rack->rack_no_prr == 0) { rack->r_ctl.rc_prr_sndcnt = ctf_fixed_maxseg(tp); rack_log_to_prr(rack, 2, in_rec_at_entry, line); @@ -9883,7 +9915,7 @@ do_rest_ofb: } nrsm->r_dupack = 0; /* 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__); + prohibit_marking = rack_check_reorder_ack(tp, rack, rsm, rsm->r_end, cts, 0, __LINE__); rack_log_retran_reason(rack, nrsm, __LINE__, 0, 2); rack_update_rtt(tp, rack, rsm, to, cts, SACKED, 0); changed += (rsm->r_end - rsm->r_start);