From nobody Mon Sep 22 19:23:03 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 4cVtLH6Fbgz68JwL; Mon, 22 Sep 2025 19:23:03 +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 4cVtLH5cYTz45NP; Mon, 22 Sep 2025 19:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758568983; 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=rLHtr55Wig4dIn3qv/Fx+Xft/SP5Kpi37XoAMeAU/zY=; b=FQDJ/bLa8oFiBfPOBkgZc4kXIWRNuIr1KxWQ0uD/RufNAiqa+/gurQSr+LGvCYLWQ6XG9s ie6lEofV4b0juqIGxs0Zym+DUHfDtPxvvGWTJoyUtpMUSJPsIB/88u6JR+QmRckXE8/4UR n8ma4O89BJkJ+KJ5RPpa+u4G1/ZVuEUxMJUaYmGazPMRAgw3ZcauOEMddrUUj4dZ3twFfK ypshzMOmGaLzoyu7JROKYMHjAvpC/B/nzWHAYKut/i1N5bXusNGULx0yuhln01HT0BuKz6 0QyUQ9eocSLkwh7reXXTKWhpTv/Ow1XiZ76NkR6YSdsNRFs3cnFn2+U85SIyjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758568983; 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=rLHtr55Wig4dIn3qv/Fx+Xft/SP5Kpi37XoAMeAU/zY=; b=Gx7IYSbqxTOOIH+eVOJN7AUUdETUbMnfFdKoaZm+bSLOLAMHGTf9LbqHi9lB5IZ74T1WCY MsuRsTOSG35dpa72gddiy0EORYW5ZFm/fPl+JdoT0LGD3kLYf8yAtjgIT/KJ6m9XFai//P /wbGI9+6xUc/Xpo34XuxwxhumkmJ82u7OJV0kt1Q4w//+IbKAep9dKcQY/X4oYvTili+C2 ZQoCtMVtzGzHxGFNN+c0c89r92962IXyAjbSrfQF2hfn5XnyOd/ZKYPRi1C0yvryqVjU4e OsrYxwV04OaupOdZKReHhCUH2G2yq2GxbFOjgJc2iNAOIOzstDemk7TrIxy5Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758568983; a=rsa-sha256; cv=none; b=nQT5wky6wXPMHObdsin1iTqkey5w40yxRCNXKY5JXz3qsbrJayzxYdxaCyp1E5MBMEZiFV p2mFhC2bEz5Io+nEKPZgheu4r8/ssSRh3TUHZ2BoEpSCrTA7Lo52gKuMcw3wZAiB9Zrzhr AiIL+PBF45gFwXmn0iH3IB5RcxRHnu2XMOliV6IxF/DWquqy9wNasFBCAskppTwFZIAxgz OQDtbjC640ymYbgUZb8P7y4kcHkR0Z9TD8OdRVtyKwKlp64G6hfPJXB/LAhwCRmM3OC9rx GA79NBtlNXWEPKW8/pWVXVRlUhWQ3+KlY8bGDNxQBVEqGGGqht1O0qwVIRENQA== 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 4cVtLH4fM8z1CR5; Mon, 22 Sep 2025 19:23:03 +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 58MJN35T028331; Mon, 22 Sep 2025 19:23:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58MJN3Hp028328; Mon, 22 Sep 2025 19:23:03 GMT (envelope-from git) Date: Mon, 22 Sep 2025 19:23:03 GMT Message-Id: <202509221923.58MJN3Hp028328@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: 65a9bef46996 - stable/15 - tcp: improve compilation of cc and their helper modules 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/15 X-Git-Reftype: branch X-Git-Commit: 65a9bef469969dda95d7c5cc4a525a3b33c76cd7 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=65a9bef469969dda95d7c5cc4a525a3b33c76cd7 commit 65a9bef469969dda95d7c5cc4a525a3b33c76cd7 Author: Michael Tuexen AuthorDate: 2025-09-16 21:30:40 +0000 Commit: Michael Tuexen CommitDate: 2025-09-17 04:49:21 +0000 tcp: improve compilation of cc and their helper modules * Allow the congestion control modules CDG, CHD, HD, and vegas also to be compiled into the kernel for IPv6 only kernel configs. * Compile the helper module h_ertt for round trip time estimation only into the kernel, if one of the congestion control module using it (one of CDG, CDH, HD, or vegas) is also compiled into the kernel. Please note the second point implies that TCP TSO is done whenever possible as long as none of the congestion control modules CDG, CHD, HD, or vegas is loaded or compiled into the kernel. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52547 (cherry picked from commit 1bb72d3d6eee50232b6d6acbc201f9aaac93e2b5) --- sys/conf/files | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 9661bafea8f9..db05a1424f00 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4369,15 +4369,23 @@ netinet/cc/cc.c optional cc_newreno inet | cc_vegas inet | \ cc_chd inet | cc_cdg inet | cc_newreno inet6 | cc_vegas inet6 | \ cc_htcp inet6 | cc_hd inet6 |cc_dctcp inet6 | cc_cubic inet6 | \ cc_chd inet6 | cc_cdg inet6 -netinet/cc/cc_cdg.c optional inet cc_cdg tcp_hhook -netinet/cc/cc_chd.c optional inet cc_chd tcp_hhook +netinet/cc/cc_cdg.c optional inet cc_cdg tcp_hhook | \ + inet6 cc_cdg tcp_hhook +netinet/cc/cc_chd.c optional inet cc_chd tcp_hhook | \ + inet6 cc_chd tcp_hhook netinet/cc/cc_cubic.c optional inet cc_cubic | inet6 cc_cubic netinet/cc/cc_dctcp.c optional inet cc_dctcp | inet6 cc_dctcp -netinet/cc/cc_hd.c optional inet cc_hd tcp_hhook +netinet/cc/cc_hd.c optional inet cc_hd tcp_hhook | \ + inet6 cc_hd tcp_hhook netinet/cc/cc_htcp.c optional inet cc_htcp | inet6 cc_htcp netinet/cc/cc_newreno.c optional inet cc_newreno | inet6 cc_newreno -netinet/cc/cc_vegas.c optional inet cc_vegas tcp_hhook -netinet/khelp/h_ertt.c optional inet tcp_hhook +netinet/cc/cc_vegas.c optional inet cc_vegas tcp_hhook | \ + inet6 cc_vegas tcp_hhook +netinet/khelp/h_ertt.c optional inet tcp_hhook cc_cdg | \ + inet tcp_hhook cc_chd | inet tcp_hhook cc_hd | \ + inet tcp_hhook cc_vegas | inet6 tcp_hhook cc_cdg | \ + inet6 tcp_hhook cc_chd | inet6 tcp_hhook cc_hd | \ + inet6 tcp_hhook cc_vegas netinet/sctp_asconf.c optional inet sctp | inet6 sctp netinet/sctp_auth.c optional inet sctp | inet6 sctp netinet/sctp_bsd_addr.c optional inet sctp | inet6 sctp