From nobody Thu Mar 13 10:14:31 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 4ZD3JR71fSz5qQsR; Thu, 13 Mar 2025 10:14:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZD3JR4LFWz3m1Z; Thu, 13 Mar 2025 10:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860871; 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=WDBAEeVgzjzHZShojuN9b90VcaghhGZBMfCVVaI9JHk=; b=vjtFwKuTh2q5fLe8ck6pY13Lm0saEHoTF7qFU329/lLzuLc9nxFMIZt0kw0kC8q2Cs57g8 BxPKkCkWUQUxP6tupg7qVU6FWIwWV1F9xYMSVHXWq6agMq8aZow3hACbFFXS9TOrG/HQlw XJiQobnRHJB1z9CKqqTaSA5hT/42CZ9/CPdb9QWrjxO+h4IAh5SKbIts/9dRngFZWenVoP +L2c3oG0DWlb193gqnRLAyHeofCOmNCfA0HzIYeDjuizD0EkXklUkxfMIU9RBGtHFU8NbM qxutsAkGiR7rM+IPg9mL5dHh/ZOMD9oyx3ZtPjpTCEQKZJcDlFLtt69k4XgoCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860871; a=rsa-sha256; cv=none; b=q0hyvxDetX1xV/9OxDNsPCpYJpmS+dLEEJ7gtW9C0zP4VpqTpS3MV3w1vMrtTXRguqO3LM lxwUO/DzRFHPbTK3/gftn5lUZqVuTS1gcDeBUtGXccgQ3sfhLVP6bvN+wOwrvfQ96QZQW3 W3qz7StNViFCQg2Q2SUQHDk9zbK42qJZik+7qrFRoDqH45Dz5EiYxkRSS1lFdLIWD7vfge GFIgnVrF6LJ9kYuiaqFDYYuqPPZGLGKzt7Ka+mIxGuUxEnzwaMgbqRKModD1IRykNGENJS B3OGUth9dCKFf7YMczT+Ml+s7zGhlzbeno8tLXG+Ti8UKnD3dZBVmSUPC7yl4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860871; 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=WDBAEeVgzjzHZShojuN9b90VcaghhGZBMfCVVaI9JHk=; b=wTw/y1QoSc1IWiiO5GDAdLAj5WZ3aNEozF74vW2wwKXIv+ardsN2UdvbR/tSWFReNNiwrh /gdH82tuIKWUp/Wcl85qfOjo9UHqMgFyEkqWdtQGPzEp2KyRJxeifIglANTLxddyZavMHX +6WBYmNx6lfqvKz7BtEyNsPnTZPXf/X0hQp4Mg0/8v+/mLEQYmzdtx/MPD7ijzx/PO3tGl 8gE4bIln4CC4co8vp6xcY6tTRfRTDwAf/noC3RGhhInpsQ63TtEUGzQd0kxd1j3lOLkiDY PwIUByEGm+U5xaYx27t6u+aGektqUshJ/CHGBt/yLQkei5jrSBKCQwRpBCHKqQ== 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 4ZD3JR3GmDztQR; Thu, 13 Mar 2025 10:14:31 +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 52DAEVVb092013; Thu, 13 Mar 2025 10:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAEVjl092010; Thu, 13 Mar 2025 10:14:31 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:31 GMT Message-Id: <202503131014.52DAEVjl092010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 140c473fb905 - stable/14 - tcp_ratelimit: Use static initializers 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 140c473fb9050c2befae2f021d00b2713a12c60f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=140c473fb9050c2befae2f021d00b2713a12c60f commit 140c473fb9050c2befae2f021d00b2713a12c60f Author: Zhenlei Huang AuthorDate: 2025-03-06 04:51:45 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:51 +0000 tcp_ratelimit: Use static initializers MFC after: 1 week (cherry picked from commit 09de37310313d87942fc5349914be46b9cb8c808) --- sys/netinet/tcp_ratelimit.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_ratelimit.c b/sys/netinet/tcp_ratelimit.c index 1834c702c493..521ebad4e5dd 100644 --- a/sys/netinet/tcp_ratelimit.c +++ b/sys/netinet/tcp_ratelimit.c @@ -246,10 +246,10 @@ const uint64_t desired_rates[] = { #define RS_ONE_GIGABIT_PERSEC 1000000000 #define RS_TEN_GIGABIT_PERSEC 10000000000 -static struct head_tcp_rate_set int_rs; +static struct head_tcp_rate_set int_rs = CK_LIST_HEAD_INITIALIZER(); static struct mtx rs_mtx; -uint32_t rs_number_alive; -uint32_t rs_number_dead; +uint32_t rs_number_alive = 0; +uint32_t rs_number_dead = 0; static uint32_t rs_floor_mss = 0; static uint32_t wait_time_floor = 8000; /* 8 ms */ static uint32_t rs_hw_floor_mss = 16; @@ -1772,9 +1772,6 @@ static eventhandler_tag rl_shutdown_start; static void tcp_rs_init(void *st __unused) { - CK_LIST_INIT(&int_rs); - rs_number_alive = 0; - rs_number_dead = 0; mtx_init(&rs_mtx, "tcp_rs_mtx", "rsmtx", MTX_DEF); rl_ifnet_departs = EVENTHANDLER_REGISTER(ifnet_departure_event, tcp_rl_ifnet_departure,