From nobody Fri Oct 24 19:49:43 2025 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 4ctYQJ0f9Rz6FF7m; Fri, 24 Oct 2025 19:49:44 +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 4ctYQJ06Fyz4381; Fri, 24 Oct 2025 19:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761335384; 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=oI3JthFOT4E0SV/mXOB0xy9bdMfqXITjMyj84lUBLNQ=; b=H5KmYvcTEvsbR0R9LMYrg947XUkjW9UFTharl8c3F7a0CQUrIqFN87xnhrlpm0hOK5/a30 e/L1nVGNXL9WGAOjJASP5Ws48K776qpGgmV1jMlyKAMc2bnrZvnF7uqCKjrFAy54k5fypx yKJRMJh/yPjmGvAEa5nXWG3kC05+cFwJPumQHNY+qgO45t7xKsrhfs1K1jTC8rknAlXEPx YK1vu7k+cPe5H1wJfP5o196i77lBEgRtj3V0Iu4HgNbw9hLpmRIDpAI725ugzvxfOegpQe 6V9hL+P4wvM7fylQCb5KCAClPrNqT6rHlZucidtzQE6fzJHw7qBYYlZePDX8gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761335384; 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=oI3JthFOT4E0SV/mXOB0xy9bdMfqXITjMyj84lUBLNQ=; b=Dv5q4sjjUTLCYOhetC4gt0HkTYEiMME+hHpOuRVYyS7xFEpRVOSLplGR6xz/8uIbb3EBqf R3dm8C3CLEb8xwBsA3RBnv5okSJiC6HNTE7N0WBw+ZTI4458VO25e5V90Dh+JXHomq7KS2 HnKB+CCN3+p/KAnG5AfY3r+C2OwNvyw8kECELoBTPIf5ER2booS7TzOIieiDogO8F2pRSA 9O7QwVVV3lJH08B4sq8uYDSbDkcn4s5k2If1AklESuhfrI9meF2nSTB9Yrz4JnAsBUPvSs p4ieBjf4bUMh4Lz+UbRwteJyg1ZO+zs1eoF4/fT6bkavPAq0Wur2JGtpHU/beQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761335384; a=rsa-sha256; cv=none; b=hIumrVIRC33F+AH6xStEhWn4jfE/piYOIXPkGbh8m7bGEthEavaxXTsZrILr5cXKFCzE+B EW1ESl0FFnSYfhCaa4x0HOkD/zfOzBdphZ544mxdmxk029wZlV4fnhKCDmH4ih9wwMa2+w aUZvFyN7qdt/i1AdjjcsBbilQjU4dsyuzgiyw6CYA2j2Gww7RFX7Na2z/Tda72wL+C/7MN BvguX3cYq7q2VQ7CFZyW0AZugxoIOsmB+2W6+udkWDwzZfRKhAMPQQgo2r8FHz6Nbhd5FC 1cyPDz4+DMSgpHTinvoGWgsfU+jbd85IpRgvC2gg/feXz+SEHSrxM/6MOsHfTA== 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 4ctYQH6XhHzw2; Fri, 24 Oct 2025 19:49:43 +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 59OJnhnC010125; Fri, 24 Oct 2025 19:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OJnhVv010122; Fri, 24 Oct 2025 19:49:43 GMT (envelope-from git) Date: Fri, 24 Oct 2025 19:49:43 GMT Message-Id: <202510241949.59OJnhVv010122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 1a61a673a370 - main - tcp: save progress timeout cause in connection end status 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 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/main X-Git-Reftype: branch X-Git-Commit: 1a61a673a3700c0ebdb0c5847b5923d0e3641f89 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1a61a673a3700c0ebdb0c5847b5923d0e3641f89 commit 1a61a673a3700c0ebdb0c5847b5923d0e3641f89 Author: Peter Lei AuthorDate: 2025-10-24 19:47:12 +0000 Commit: Michael Tuexen CommitDate: 2025-10-24 19:47:12 +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 MFC after: 3 days Sponsored by: Netflix, Inc. --- 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 3b9fe7a317b0..57c57666fa3a 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -513,9 +513,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; } /*