From nobody Mon Jun 16 22:00:42 2025 X-Original-To: dev-commits-src-main@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 4bLkTQ74Xhz5yStX; Mon, 16 Jun 2025 22:00:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLkTQ6V9zz3ZkL; Mon, 16 Jun 2025 22:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750111242; 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=+G6I6uQCBGn/lrLySwj+fwPPod5CUgrVy18QxNFlglY=; b=Tw6DyDAtTCE0yqm6n/IpfL4Kv11LQ21XCk2X4oXg4co81gU4voXkdpeSJNSpdxBXQ7upES l9Dp7C6RcOT2I6OCAFhx2TmzhNVnpFM2CFuhNZ68IttgL7ruezukRjL6Xsq9u5GrBG2QW9 WvBYI3DUe8kv/8lRlSAOF/kFxxhw5u8f7WFqI+OkCXA0SAUDzVEytozr86/abhoXLbunD0 LY4DLIRSgphEaVyzH2TeGxalPsEaToXCV58f0Ox5tkU0hRNK3+XP0qgTe2X1YsweUS7DbG xpV2WAg0d4r+mZpPLm/9mW8uVfbjeI49vj59g2uhuBWEW3g9CEdknUAqO5ukYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750111242; 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=+G6I6uQCBGn/lrLySwj+fwPPod5CUgrVy18QxNFlglY=; b=xi6DLxGbJ36vq0xjz044YsJzMi0YMBk5vggctOSxvMieUYH1f9gAYVo02kjccitJy+AbyX wP1kGttWeW83YKM98gt35/il0qa1a2QHrIv8sydOiNN4Sr1oMEM+txRvEkOCFCZHYX2XO6 EaoDGZAojCrlB6tz7SxROeh6fMIOLdphjn8iraPyeRX06Hxp5FLUHqpWHkqRRJSbhwa/hQ 5nrGDbsVmSL2VDzgNfMv/xFC31CLfvM5N/aAFwjy2uJC2Svp5hYs1zpS7BfrC8/T8yZX7R 0LfK3BAkYPFPF+kIjUu/WSdPzmHhZ1IcDMfw0gQzC0n6F3+VEenppb7KNzVKNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750111242; a=rsa-sha256; cv=none; b=Rt0vmxEyPNFdtD7v1nFTJhwK1/xxgkGM+TVD+L08JrwHbHvX6KVFKxCRfi20FrBhlowmOz XdcWRSeNRxQieOEfM7s97nwRd+P6mqqdQMBTUqUsdZpM7E3beSEcRm4nN6vZ25R9BrOvvH kUXPVebMELTfp0nT+cXKen08R8ON1cmJpgyoqY4p9aDKjtk4bh47jsec1A/ezT3Z8duu8y tHyLmlOPxW1m1ycRrqqAoQEjXkEz0p4wxrQx1TC/Br+KgCc7gBCqN7r2QABvsb2mXHE3V7 T5wvMp1pZ4g+z4MHp5yfExWAdzZXJzfZMN730GhxtbmjrE9q7Suz+OQJT/q1mQ== 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 4bLkTQ640Wz1W5; Mon, 16 Jun 2025 22:00:42 +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 55GM0gEX021966; Mon, 16 Jun 2025 22:00:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GM0gh1021963; Mon, 16 Jun 2025 22:00:42 GMT (envelope-from git) Date: Mon, 16 Jun 2025 22:00:42 GMT Message-Id: <202506162200.55GM0gh1021963@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: d8496725c155 - main - Revert "tcp: cleanup timer initialisations" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d8496725c155e5454a872c8ff61fc7f14d57dc37 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d8496725c155e5454a872c8ff61fc7f14d57dc37 commit d8496725c155e5454a872c8ff61fc7f14d57dc37 Author: Michael Tuexen AuthorDate: 2025-06-16 14:17:59 +0000 Commit: Michael Tuexen CommitDate: 2025-06-16 14:17:59 +0000 Revert "tcp: cleanup timer initialisations" This reverts commit c13f4b1574da77f89ab57cfcc87fe8ad80f25263. Using MSEC_2_TICKS() breaks compiling contrib/bsnmp/snmp_mibII/mibII_tcp.c since it includes tcp_timer.h in userland and MSEC_2_TICKS() is only defined for kernel land. --- sys/netinet/tcp_subr.c | 4 ++++ sys/netinet/tcp_timer.h | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index d82a54031a95..f766bf25ad66 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1473,7 +1473,11 @@ tcp_init(void *arg __unused) tcp_keepintvl = TCPTV_KEEPINTVL; tcp_maxpersistidle = TCPTV_KEEP_IDLE; tcp_rexmit_initial = TCPTV_RTOBASE; + if (tcp_rexmit_initial < 1) + tcp_rexmit_initial = 1; tcp_rexmit_min = TCPTV_MIN; + if (tcp_rexmit_min < 1) + tcp_rexmit_min = 1; tcp_persmin = TCPTV_PERSMIN; tcp_persmax = TCPTV_PERSMAX; tcp_rexmit_slop = TCPTV_CPU_VAR; diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 8e1c609fd575..a3ca268417ba 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -71,21 +71,21 @@ /* * Time constants. */ -#define TCPTV_MSL MSEC_2_TICKS(30000) /* max seg lifetime (hah!) */ +#define TCPTV_MSL ( 30*hz) /* max seg lifetime (hah!) */ #define TCPTV_SRTTBASE 0 /* base roundtrip time; if 0, no idea yet */ -#define TCPTV_RTOBASE MSEC_2_TICKS(1000) /* assumed RTO if no info */ +#define TCPTV_RTOBASE ( 1*hz) /* assumed RTO if no info */ -#define TCPTV_PERSMIN MSEC_2_TICKS(5000) /* minimum persist interval */ -#define TCPTV_PERSMAX MSEC_2_TICKS(60000) /* maximum persist interval */ +#define TCPTV_PERSMIN ( 5*hz) /* minimum persist interval */ +#define TCPTV_PERSMAX ( 60*hz) /* maximum persist interval */ -#define TCPTV_KEEP_INIT MSEC_2_TICKS(75000) /* initial connect keepalive */ -#define TCPTV_KEEP_IDLE MSEC_2_TICKS(120*60*1000) /* dflt time before probing */ -#define TCPTV_KEEPINTVL MSEC_2_TICKS(75000) /* default probe interval */ +#define TCPTV_KEEP_INIT ( 75*hz) /* initial connect keepalive */ +#define TCPTV_KEEP_IDLE (120*60*hz) /* dflt time before probing */ +#define TCPTV_KEEPINTVL ( 75*hz) /* default probe interval */ #define TCPTV_KEEPCNT 8 /* max probes before drop */ #define TCPTV_MAXUNACKTIME 0 /* max time without making progress */ -#define TCPTV_FINWAIT2_TIMEOUT MSEC_2_TICKS(60000) /* FIN_WAIT_2 timeout if no receiver */ +#define TCPTV_FINWAIT2_TIMEOUT (60*hz) /* FIN_WAIT_2 timeout if no receiver */ /* * Minimum retransmit timer is 3 ticks, for algorithmic stability. @@ -107,15 +107,15 @@ * The prior minimum of 1*hz (1 second) badly breaks throughput on any * networks faster then a modem that has minor (e.g. 1%) packet loss. */ -#define TCPTV_MIN MSEC_2_TICKS(30) /* minimum allowable value */ -#define TCPTV_CPU_VAR MSEC_2_TICKS(200) /* cpu variance allowed (200ms) */ -#define TCPTV_REXMTMAX MSEC_2_TICKS(64000) /* max allowable REXMT value */ +#define TCPTV_MIN ( hz/33 ) /* minimum allowable value */ +#define TCPTV_CPU_VAR ( hz/5 ) /* cpu variance allowed (200ms) */ +#define TCPTV_REXMTMAX ( 64*hz) /* max allowable REXMT value */ #define TCPTV_TWTRUNC 8 /* RTO factor to truncate TW */ #define TCP_MAXRXTSHIFT 12 /* maximum retransmits */ -#define TCPTV_DELACK MSEC_2_TICKS(40) /* 40ms timeout */ +#define TCPTV_DELACK ( hz/25 ) /* 40ms timeout */ /* * If we exceed this number of retransmits for a single segment, we'll consider