From nobody Tue Oct 28 21:23:39 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 4cx3Jr2gSsz6DVpp; Tue, 28 Oct 2025 21:23:40 +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 4cx3Jq6dkbz3l9v; Tue, 28 Oct 2025 21:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686619; 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=ski+8LVwKd9OgzB8mmmLN0o1LOuCvr8UgMXFavxu4OE=; b=VTkKpk+5jiqzVDGhiPEpnUgLtxjILC61k3nZmU1Px2HpQhAbwmmdplrewtLIQVQK/f38Iz phKZA9HWlq711iM8wvEykT10XGjB7zrgUvljpZ5RbQmVbRj9I4zeoDYCBHP65uHAk1xf8G UN4QLXYW8xb752xt5ZaONu/NPGxUUqgvdX30h9Bn5bb7UyDSt64KPoQFPQfF14hXfHdYok J/XL7o7HOVWi+5WGyE1019dbheEnhNzuf4MXt1bp6EcMXq9xb99wsr58oLg7PjUYzGT9aq 1+CTQzg/H0Ri/DYvBlh8s0sHYF7/GBmE4L8gFAQsyMNxW/8ceZaU2+NBg3NH2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686619; 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=ski+8LVwKd9OgzB8mmmLN0o1LOuCvr8UgMXFavxu4OE=; b=bKVIBDAgVMq8IovdMPz9pCNlzHKJ8BFCoMkDgOZ1Cm0IU2XVslpc3/e/NTcx7hipC9xlPL TYc4iDcnXk9/ZV33uVMMCdXl053zSg0sIAaGgwTRyx88Eg8//hfTueDohnLa32chbNjJp0 FPqds/Run9ADwFfLyRaMnnQGIYkqWZ5wOchNfE2G6407mExc1MeE/DucRWqPb6UAosvtIs Kn7TP/JM6dUdH7WpdK2ldUO9aqtrN9LGq7XN2/+anpRe6OvihRM8AKwGDUer1nHx/a8Th6 0rbS1Z9JqSWfT0eufQWMBD8lhirDqJ9lw5MqR06GVuhaoDZI6W6yKJTtp+QcWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761686619; a=rsa-sha256; cv=none; b=VF2g3aISDFsknl/PBJ/cKfk/u90gshnxwXWZGv9T7pO7YiIUKLYECKsTT3uvVZZoqMi+8+ JdztNHYaCf7dBJgTnYnr3w6kFp3q2FOfvztgTwuu7G0ggq+dqh01pTNp76LlWsyEwLYeiH buVYMTKniXHZA8njNQphyUjs1Hy/9932ymbpThMmkdIWc6fXZR3h5pELQRRGysHYHRqITU uofZ6jKXhEdxCA3UFMyyGEBOxA7oE2m8FEtTA4ybcfYGkibawXRTtER5H50DidD/GJPjyo Tkw/eLIHz08QQkyoSAiN3CXnPCFhhe0ZZv7cX1C7rdU8xlYbeiZ0onjW1JgYxw== 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 4cx3Jq5xcWz160V; Tue, 28 Oct 2025 21:23: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 59SLNdTg075587; Tue, 28 Oct 2025 21:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SLNdDM075583; Tue, 28 Oct 2025 21:23:39 GMT (envelope-from git) Date: Tue, 28 Oct 2025 21:23:39 GMT Message-Id: <202510282123.59SLNdDM075583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: df023b0275ed - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: df023b0275edf17211dd10204c11cab426075ed0 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=df023b0275edf17211dd10204c11cab426075ed0 commit df023b0275edf17211dd10204c11cab426075ed0 Author: Peter Lei AuthorDate: 2025-10-24 19:47:12 +0000 Commit: Colin Percival CommitDate: 2025-10-28 21:23:02 +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. Approved by: re (cperciva) Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 1a61a673a3700c0ebdb0c5847b5923d0e3641f89) (cherry picked from commit 6b81787240d8abe5d0f8d8d9d9cb6b87c3ed99bf) --- 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; } /*