From nobody Thu Jul 24 16:13:27 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 4bnwzC4C1Qz62vmn; Thu, 24 Jul 2025 16:13:27 +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 4bnwzC3b2jz43jN; Thu, 24 Jul 2025 16:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753373607; 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=gzAj6TsFkJrlxRu9Fw9egnaab3POn1WA9na5LTYOr8Y=; b=nxc63BJYn1Aym8EWCDts+uiUg3eFKaygaK+GFV88ajz+hPES1Rn7lf9Kv4f9b0NyVQIcYd UkNuERg0GFuYhMFE7qHJKmP2Zlo0B6hwG/CU+izwMZwJaNzDlfJRjsdqntF/1RK09FY2dZ hZTjDCfAoWLHi2eeHzj5A4Zy5M3kEFmE6GpEJwHmKkjj1W6lRt9WhllmlmydYoAKe4aEQ5 Jh5laXn7Vu3FBYLm9alhQ4hipcHLtiCOddNoSfeyOPEuELxqTFvLF2cRy3HkCjGWP/iBjY JCB8C1O59trhsK8s2/Mw1aHGqPJGNaZV3YF10vvfV0e9/GVJ8hx97FbqL5aYXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753373607; 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=gzAj6TsFkJrlxRu9Fw9egnaab3POn1WA9na5LTYOr8Y=; b=oVPwb8s5ZIvs9SsG7GKYtnN/aP97X5Ihli7OTMoZd6T+e5ovvGgpzASeVTUaAp4ZnDyuwO 0pLL0t2kTwAGG7vKxeSF2G8QI+roO4Cik+GtVuPwr5LeJ1a9Qkp78uBSOKTs/yoqH07x4W XvNruDieA9PxRDxrNx+pr/PDT/mkZbLrOM6gj+75CRemVCylC7Zncbt1mlV0Fv711H0pgl DgedyQiN5RTojyF9VFqZFNeJlUmntDNbGgrQc6u+Cd1NBZk5va1iczh0kg/L/RGUbYonzc APiJ4+3kUCpP8aKw8UYQSeX11v+710yYV5GPyabtbjKHTZINuO5Jfm6BncuGGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753373607; a=rsa-sha256; cv=none; b=a84i2dj3yn5IS5Ohx7ykhKZwoQrWYPvKVLzRMqH8pfdtawgIysEHFDFNaYxwkCvmEPMiut 4IhnE7dBImrqIbxfOtTiM12+T1/gt1q6ymcTuXHrQqJgJgfvhWMgMjXj0k1i7tbjqinZyJ aRDBpKLIhBeRUYpjjvFZqe67gdvzuwfDYaJSieSdUlN7MCIjcrgFf4K1PC4r8r9XZJsqF/ e3fxrSHo/cFOulVlUBoghpTrep9xu5/FFlNmBup0CJmAKI+J221aLC4GZ1K5sxSINZ/lds ADbLpLOlEv2QIhjtfqzKiiTYtjRNn8hl7np7re6z+omB7FiUyLMHvNZ0/IY2lA== 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 4bnwzC3BFpz14qK; Thu, 24 Jul 2025 16:13:27 +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 56OGDRaM061629; Thu, 24 Jul 2025 16:13:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56OGDRn0061626; Thu, 24 Jul 2025 16:13:27 GMT (envelope-from git) Date: Thu, 24 Jul 2025 16:13:27 GMT Message-Id: <202507241613.56OGDRn0061626@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: b45aa1d82745 - main - tcp rack,bbr: cleanup 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: b45aa1d82745e096b7b3006aceb8b5ec13b343f1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b45aa1d82745e096b7b3006aceb8b5ec13b343f1 commit b45aa1d82745e096b7b3006aceb8b5ec13b343f1 Author: Michael Tuexen AuthorDate: 2025-07-24 16:11:20 +0000 Commit: Michael Tuexen CommitDate: 2025-07-24 16:11:20 +0000 tcp rack,bbr: cleanup Remove code that can't be enabled in FreeBSD anyway. Reviewed by: glebius, rrs MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51423 --- sys/netinet/tcp_stacks/bbr.c | 6 +----- sys/netinet/tcp_stacks/rack.c | 9 +-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index d2636f01714e..4345e6d4480e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -13172,11 +13172,7 @@ send: mb, moff, &len, if_hw_tsomaxsegcount, if_hw_tsomaxsegsize, msb, - ((rsm == NULL) ? hw_tls : 0) -#ifdef NETFLIX_COPY_ARGS - , NULL, NULL -#endif - ); + ((rsm == NULL) ? hw_tls : 0)); if (len <= maxseg) { /* * Must have ran out of mbufs for the copy diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 834e1347a152..cb2c021967b4 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14638,9 +14638,6 @@ rack_init(struct tcpcb *tp, void **ptr) if (rack->r_ctl.pcm_s == NULL) { rack->r_ctl.pcm_i.cnt_alloc = 0; } -#ifdef NETFLIX_STATS - rack->r_ctl.side_chan_dis_mask = tcp_sidechannel_disable_mask; -#endif rack->r_ctl.rack_per_upper_bound_ss = (uint8_t)rack_per_upper_bound_ss; rack->r_ctl.rack_per_upper_bound_ca = (uint8_t)rack_per_upper_bound_ca; if (rack_enable_shared_cwnd) @@ -21556,11 +21553,7 @@ send: m->m_next = tcp_m_copym( mb, moff, &len, if_hw_tsomaxsegcount, if_hw_tsomaxsegsize, msb, - ((rsm == NULL) ? hw_tls : 0) -#ifdef NETFLIX_COPY_ARGS - , &s_mb, &s_moff -#endif - ); + ((rsm == NULL) ? hw_tls : 0)); if (len <= (tp->t_maxseg - optlen)) { /* * Must have ran out of mbufs for the copy