From nobody Thu Aug 6 09:08:12 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 4hG1fB1g3Jz6mgpd for ; Thu, 06 Aug 2026 09:08:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hG1fB0xMFz3Yx6 for ; Thu, 06 Aug 2026 09:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786007298; 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=pRc+c5g9xa7sTp2xxSiJriWHtnu7hoyRDNTAZKa7owM=; b=M/eRvceaqgzsvtcbOPOhlVkp/cwmUOdDXaLpXnQ+MKAiy/qwZlZrX8VvnnAEkLBgGxl1b0 FWVIXIGMr3fbjS31quAMcabZxMXVkdiLhcJd2eZLFA+gn7HlXYgth+3hdI7/tRrlrjhjje M3Kt++jgFdChlB6CzxrJrSIRNkGPbale04rSzHgUhHMzuLsCu9HKkoLIPQbQIzMdis2SSV QJFzpz3i60vhMa0xNPeeG210QciU9Lgdo3eCtHKOokGK6U4Dg1LMUXagJ8jRufp8RZ5j8O NMfRNnIBth9VoJ0aQJRdytCqA9fEO1fYD8Pgj73zT4jg96c7Y/a2WpWyceV5Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786007298; a=rsa-sha256; cv=none; b=QGaP5RKoG7FxUiVt8NdMtdqA5W8otFyoxOPeQ79+G343zdnHr3nlonRO7nyYaJ2qgTdGoc ZHiZcHv4aeZUcAwzHnV2432xpXeW3eu37B+YIjZFDU9h2PNh+ju3Eq8LVTTgtEBGpNbFwL dJgi8DgjeGj4H9KVfo+NI1TvinyqT+omsI1q0YYMdNHL2dj0dDXi+EM+Kl11xdKz2NbBSx KlkVHnKZtrSTNhJ7bbou6rma65zHtysQz/As1RZO0b/vbcDFOGhaTFtSNHmfmtly80qlll ltOvrhhe3WWxfUbygtqWHOvxB8Ky3LYXVbdSdcpXGLa+3XaVZ825kVTDLBVG9g== 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=1786007298; 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=pRc+c5g9xa7sTp2xxSiJriWHtnu7hoyRDNTAZKa7owM=; b=gbYGFwbODdxz9uefv2HP3+lAuUlI7W1/wv2dZD4VTBdgi2oHu4ujYMC8QnYAlS5KobTmdq EMjjDqeB7kd2pqQCTs7XE5NkfbaVeVozaw4r+2OzVcgSdhobP/bWruhpZ4kjqpnFWfynix pAfHXTISjvXDNN3w7llxNEeMTwzrL4v+ji3O08uOxg4QnuFMhQEXfmkTXN1Rl+/NyWFEJv NY7lvCbKHsFt2rrS6mwM3mpNCjL9mXAPny0AKT5BcFkLZc3B/hgkrM7b/oqaiC72e3WS7j ZTp9BQImR1e0PR1i8ebUXP+Ci1keu5cpkteVxxUNeKeH9lSnnN7wy/PqM4pMdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG1f46xM2z32 for ; Thu, 06 Aug 2026 09:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18fba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 09:08:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: e8d1cee43741 - stable/15 - tcp: improve handling of stopped timers 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 List-Id: 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e8d1cee437414dd9bb3c779ff0a0c234fb7d411e Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 09:08:12 +0000 Message-Id: <6a744efc.18fba.394b020f@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d1cee437414dd9bb3c779ff0a0c234fb7d411e commit e8d1cee437414dd9bb3c779ff0a0c234fb7d411e Author: Michael Tuexen AuthorDate: 2026-07-28 20:15:22 +0000 Commit: Michael Tuexen CommitDate: 2026-08-06 09:07:02 +0000 tcp: improve handling of stopped timers When a TCP timer is stopped, t_timers[] is set to SBT_MAX. Adding the corresponding t_precisions[], if it is not zero, would result in overflows in tcp_timer_next(). To avoid this, skip stopped timers. The problem was identified while debugging uperf by Lukas Book and an initial patch was provided by him. The committed patch was suggested by glebius. The problem can be observed by running netstat -nxptcp and looking for negative timer values and by observing very long running timers in some cases. Reported by: Lukas Book Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D58484 (cherry picked from commit 52b7cbcb78c14e89f6faec8da5acc2caa3d37208) --- sys/netinet/tcp_timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 57c57666fa3a..56c50faaf4d1 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -859,6 +859,8 @@ tcp_timer_next(struct tcpcb *tp, sbintime_t *precision) sbintime_t after, before; for (i = 0, rv = TT_N, after = before = SBT_MAX; i < TT_N; i++) { + if (tp->t_timers[i] == SBT_MAX) + continue; if (tp->t_timers[i] < after) { after = tp->t_timers[i]; rv = i;