From nobody Mon Oct 27 22:49:39 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 4cwTGW55HHz6FkrV; Mon, 27 Oct 2025 22:49:39 +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 4cwTGW4RXMz48jX; Mon, 27 Oct 2025 22:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761605379; 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=m1OnMF4yTUM4fj9ek1RfEheSYFo6O/yOkyX/SqkRRFQ=; b=Z8L7HEuN0+I4C64SBF4RU1N5HD6FfKZvn7FCs/6y0U/TZMtdMruVkconYJY+u9D2fp+yUL YJIOe7KcPHA6xTs/zj1lc+rxLnn8pZG3N/t+nVKOyo2TPQWUrICzUjw1sFIEs+LtQXOU6s qpHGpEq5Ztioe5IKe/33OC5ryvkGCBCMBvxLy0j/+z/SzbRr2m9Ch+4CSrvAhic5YkNnHq d+cs+bALdQBUuI4RpEv7HjrIcaizlwnZb7Z+sezPzORjsuQyphl8lk1CQb09aaJoLHBxm9 475sFdPHMCEz8/UpOXLIlLZL3dMblL686xOFMzul8ajVY504oTE8y6G0FcLJ0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761605379; 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=m1OnMF4yTUM4fj9ek1RfEheSYFo6O/yOkyX/SqkRRFQ=; b=jNVpfhhhn2jXdd5+vLSyJtnM++9rmBgEztYY7eFoMq5DgIqQEAvNXarTfGv3TtcIhtHGe/ D7C3T4PpmLDPoXlMhZIxxz9bG7fOewYJZlEZeBuFFQFxHZ/u+yIf7euobD7Njh6XOp7lmx Nyesi9DE3OCnl+0ndWSH+jKkwAQ9XpOIh/CLmJ+PH7NliEycdIj1mSMw4jJT31SZYJejpu S5jpMljyAHDYIsRVXmOuecVFqiw/H0Zjo/GL79RoS/TiTMO+66bDWnQDrp+fss4Xh2Gqgj jILK8K8Xc8KKvk7Qcnk4B25hQw7cMVdhL+qDNsMb/ODW+hXxd38rLJYytKV88A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761605379; a=rsa-sha256; cv=none; b=b4WUPK4EfCEo/tBVZftteA+bu9K2UnOp/ytlP5ggNlx6znM+UPdmFc5PdSqmgyG/19kzb9 BD1pZZ8zVENT6NtWUmZvNhkBqZ24WMPlOmVIJhwqQHxhji3PBDkq6VA503jddiiuhzgGkn XmJiTV9wlr1+ojXHqdsfISzY2z52OSSKFptncBVi21/7JSxDPsWhkW4fJqZoOGQS3LXQeS 2p3QxzzQRIZvUoe557FK669MOq+ZfbL70oiqL5HQtQQbCSgxU4FXAGIJJch/uMuZ/0clKg 3JqNf9pH8jzGuuZusEYoyM10EYxD03tro24lbNGLFKh/vZWs7LszHJHCdkBQ1w== 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 4cwTGW3yq7z7w0; Mon, 27 Oct 2025 22:49:39 +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 59RMndEf017559; Mon, 27 Oct 2025 22:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RMndfN017556; Mon, 27 Oct 2025 22:49:39 GMT (envelope-from git) Date: Mon, 27 Oct 2025 22:49:39 GMT Message-Id: <202510272249.59RMndfN017556@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: 6b81787240d8 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 6b81787240d8abe5d0f8d8d9d9cb6b87c3ed99bf Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6b81787240d8abe5d0f8d8d9d9cb6b87c3ed99bf commit 6b81787240d8abe5d0f8d8d9d9cb6b87c3ed99bf Author: Peter Lei AuthorDate: 2025-10-24 19:47:12 +0000 Commit: Michael Tuexen CommitDate: 2025-10-27 22:44:40 +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 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; } /*