From nobody Fri Sep 5 06:40:19 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 4cJ6D33GQGz67BSK; Fri, 05 Sep 2025 06:40:19 +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 4cJ6D32XJKz3vNb; Fri, 05 Sep 2025 06:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054419; 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=pUGf/QmXjNn6lLaLRT937qpUYgaLcn8rhmiE13/ek6g=; b=dOcMMYUobpv1yX/pPgJhbZtQ8TGKvKjk1YEJvgughOnW9B2EAoKWvf/60rhLft0yVYPAco z9Rj0cTl4ahFKnJhdmnFSUlFTikcRQ+v8rnjeqvNXLNjrk899hPfr3OFLeJ3MRP7gtjfHZ tPhkGnVC8DWuRnVz3YvCruyP3kx37V9JFg/cZkjMNJD5yNeBc9kYxfGc6YF0sVI2bRnLOU YNZnL7r+e7wwMztVEHdzNgIGSvcS+6M2m5HF+sNSD1z9jzElGEtungAh9Qm59KVcg7wTGw vWNFaqLe8JI9pIg3N7sPkwL7A5yrkUGGMJVgbKmtF1Ii7htn566D8ww9RnHD1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757054419; 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=pUGf/QmXjNn6lLaLRT937qpUYgaLcn8rhmiE13/ek6g=; b=iLw3u927bmoR5BZqqYs60e0GYJwRc84CyLJb1RP4P7+NhIuJB9fPoGlHXO764J2RTo2J6i evehaBSxGyPneegUaivNg9AAXcWFnsa+ybWoVaxEmvD5OqovlZMKXqfGs/NTNpQ3x6Ggqc u76src/u+W2ZN/9gWp06KbDUP3jhazGQ+WzOLrGX9KeWBnIIthcTw1BpFMSa2o5cfd0Xhg Vq0yHyYSvR3JafbpTAGjnT1aZcUIWuVj2BUDB/8d5fv8qZeLvusmS3nA14tPDc7ziN6XbJ PrV+zmHscLPiaV16HQw5HGll4kHdmyKZW/MMfnntUtXod1uX0pRLWNn3kRCCOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757054419; a=rsa-sha256; cv=none; b=KXPOtAvsYR3a2AfEImiHIkZw1ncglGxkcLBA0OrZZ2kjbJ/5lMZYbUp9pmKu8Y7vv+muhW itPbTQLB6aeRXOg7mBI5wMNh1Ta2njaHinE1XoEa2x2RH5mfrrZRuqj3ijfU8IiGEi57Yx ivDNTT1iS4yvlS/2d7olDDWhqXO2XIMdsaPnlFeYadlkjZOR6NfI3MfeCxyIhnxsbxU1wL ilqr2v0PGMW4XXzmee3OvVQO/ziqAK8rco9qcoxP3cQgYY8D5cK+elCXgjSFyIbz38qG7A sqF3pFS9tKp6m8W17Bfjdmz8gBOrIMaWc+UhzuFElpK7hegnigwqkrzVO/UU2Q== 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 4cJ6D31qvrzdfP; Fri, 05 Sep 2025 06:40:19 +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 5856eJwK037366; Fri, 5 Sep 2025 06:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5856eJte037363; Fri, 5 Sep 2025 06:40:19 GMT (envelope-from git) Date: Fri, 5 Sep 2025 06:40:19 GMT Message-Id: <202509050640.5856eJte037363@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: 5e5087a127b1 - stable/14 - tcp: remove references to Lock(b) 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e5087a127b1eec83dc663f687dd3b1cd051740c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5087a127b1eec83dc663f687dd3b1cd051740c commit 5e5087a127b1eec83dc663f687dd3b1cd051740c Author: Peter Lei AuthorDate: 2025-06-26 14:05:05 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 06:39:35 +0000 tcp: remove references to Lock(b) Reviewed by: tuexen Sponsored by: Netflix, Inc. (cherry picked from commit 41c1db8a4daae24dff545ee2d20ba6ffe8abd625) --- sys/netinet/tcp_stacks/tcp_bbr.h | 2 -- sys/netinet/tcp_stacks/tcp_rack.h | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/netinet/tcp_stacks/tcp_bbr.h b/sys/netinet/tcp_stacks/tcp_bbr.h index f88efe3c9ef9..10ddd12bda75 100644 --- a/sys/netinet/tcp_stacks/tcp_bbr.h +++ b/sys/netinet/tcp_stacks/tcp_bbr.h @@ -347,8 +347,6 @@ struct bbr_log_sysctl_out { /* * Locking for the rack control block. * a) Locked by INP_WLOCK - * b) Locked by the hpts-mutex - * */ #define BBR_STATE_STARTUP 0x01 #define BBR_STATE_DRAIN 0x02 diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index 1251dabbed37..aa232c183dd5 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -315,8 +315,6 @@ extern counter_u64_t rack_opts_arry[RACK_OPTS_SIZE]; /* * Locking for the rack control block. * a) Locked by INP_WLOCK - * b) Locked by the hpts-mutex - * */ #define RACK_GP_HIST 4 /* How much goodput history do we maintain? */ @@ -596,7 +594,7 @@ struct rack_control { struct tcp_rack { /* First cache line 0x00 */ - TAILQ_ENTRY(tcp_rack) r_hpts; /* hptsi queue next Lock(b) */ + TAILQ_ENTRY(tcp_rack) r_hpts; /* unused */ int32_t(*r_substate) (struct mbuf *, struct tcphdr *, struct socket *, struct tcpcb *, struct tcpopt *, int32_t, int32_t, uint32_t, int, int, uint8_t); /* Lock(a) */