From nobody Fri Oct 31 19:10:59 2025 X-Original-To: dev-commits-src-branches@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 4cyrDN1ZnNz6Dp1s; Fri, 31 Oct 2025 19:11:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyrDN15zLz4FT6; Fri, 31 Oct 2025 19:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937860; 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=IUN9z+wm3qWWKDmI7kV7HwaxvDmh2l8kTeVC3po8oDA=; b=ESFQiP9OKbLFuphgWL06zGf24qx04ONnuFSKevqpEFz5+5ps/+fbBWvXyIHQqcyRgXcf77 fEAUISGho2mN4Kuvk16riyaIThEJXWNVAuqXsL7LCyaE7QPK44aWGKjG/Mb0ktA24QMbiS 3i/h3A1bF8Zk1FyZ0xHAna48CXGppBOBfAD+lcKAyRa/CXun3qD8uHe0Ew9YRI8XfzDO91 vwKdiJgQVzYtaPU+JCEb213GKyYUc5zugvlh+Zw0I5h76IjQmJ4+aIosTprn/wBuPwOjIk tdyVovqs8zyCiE8/MEfpPPbUm1jhpFL3KDrXiNAWJudoEl4D1D57LzN2U1puVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937860; 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=IUN9z+wm3qWWKDmI7kV7HwaxvDmh2l8kTeVC3po8oDA=; b=EwDr4fqSkNg8ntF+DSYiIk7Nb3oLGOIYkimj0fFNaCtmCrssGesEdms3Nesl+M2NknhiYX ZqffBLo7i0OOTHMwgAXsyqaWBS5IeuNI47wbSerulZI1Nje1HrG5/j2YtvKJ4f6PpLTUrC 6ciAnJZTqs9dETnWLzYI1Le4Uo4XtMmGN1PAoRIozJHaYKT7yfomplSbinIl9O/Sp1on0i 4ij42jStNE1ZAAw9fYLudaMpapAAMd+ZXVslDTT0zyQhwLOnePXrZ5aQGr9QKax+LpiIKi vnVk2wRaIGdy+t2UIyu58i0iYIh/Z8wwvdAs2MmXmNJsm43xD6UPLI1sI6bfGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761937860; a=rsa-sha256; cv=none; b=EQobSzQCWkBgui0USkayb3Qc9Mgz3c1vdG5Mm8lxuAlVXO8kZ0jNZSkN1TVMpSaHCh1Ab7 pj7ef45eTS1f8dV10vU1vjhoIeR3spoLXyOM7EMZCRxMgR/9aa2LZ6Y78W5k2+j7ZWPvUA C05GMBxOGhK05UbOZHE1NNTwUUfRYwInS7g5PyoXSppYeYuW7zdyLD+YHJMKSMsP51Z9iM j9LMQgf2VfHRFjDOZiHec3LtSGutL/3C6wvXS9D7ayVZpYI2I7ggda7eahH5TgLzz86FQm SSBgptU4EJy7jU+H9i2kVSSWj2Z0soLHXQYbdKqHROS4j0Y7yp7y13Zrfc000w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cyrDN0YdHz1KQB; Fri, 31 Oct 2025 19:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59VJAxW7076692; Fri, 31 Oct 2025 19:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VJAxFJ076689; Fri, 31 Oct 2025 19:10:59 GMT (envelope-from git) Date: Fri, 31 Oct 2025 19:10:59 GMT Message-Id: <202510311910.59VJAxFJ076689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6c31df0a2faa - stable/14 - tcp: save progress timeout cause in connection end status List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 6c31df0a2faad343ae3b0f004ad2c3b55f6eccdd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6c31df0a2faad343ae3b0f004ad2c3b55f6eccdd commit 6c31df0a2faad343ae3b0f004ad2c3b55f6eccdd Author: Peter Lei AuthorDate: 2025-10-24 19:47:12 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 14:10:25 +0000 tcp: save progress timeout cause in connection end status TCP stats are currently incremented for the persist and progress timeout conditions, but only the persist cause was saved in the connection end info status, which in turn is logged in the blackbox "connection end" event. Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 1a61a673a3700c0ebdb0c5847b5923d0e3641f89) --- sys/netinet/tcp_timer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 65a9fbc84ff7..1c687e94bb4a 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -515,9 +515,12 @@ tcp_timer_persist(struct tcpcb *tp) if (progdrop || (tp->t_rxtshift >= V_tcp_retries && (ticks - tp->t_rcvtime >= tcp_maxpersistidle || ticks - tp->t_rcvtime >= TCP_REXMTVAL(tp) * tcp_totbackoff))) { - if (!progdrop) + if (progdrop) { + tcp_log_end_status(tp, TCP_EI_STATUS_PROGRESS); + } else { TCPSTAT_INC(tcps_persistdrop); - tcp_log_end_status(tp, TCP_EI_STATUS_PERSIST_MAX); + tcp_log_end_status(tp, TCP_EI_STATUS_PERSIST_MAX); + } goto dropit; } /*