From nobody Mon Sep 22 19:31: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 4cVtWX0ZGHz68Kh7; Mon, 22 Sep 2025 19:31:04 +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 4cVtWX04X2z45tC; Mon, 22 Sep 2025 19:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758569464; 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=EcO3Z7ZL2gC/pPAUHOOGB5dmJmFDzRnYpwDOuGljVOQ=; b=KgHMEmXYVSRRw8wj9RYSw9o2tO7yeGzT9eiPTbYJQbBJuTolXkrmsKx7Lgi+XlFqPX7Nxb HqBwTthHNbD88rHmsd3ao582ByPADu41q1fEhMj9CtDn/YD05XH6fCf0QKuwOYraKfStyv PhkLct/MjMkuXvcveaoyl+TpJdYlD7yIPq7aqtkxIigjDg2JCL1GYtBR1nzLQfj86IvozT 2j28xALL800AK82s9XdQWuVLouQv7gUIiZ+kdminFomcxM2WZjRXByzdQqJXIjW/qvBA+5 5He+FB85Ib4j5djEZ0n2rGyB+GSpkEUSLgpXO7UUq01+2yN9M+eM8jNnmRcMXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758569464; 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=EcO3Z7ZL2gC/pPAUHOOGB5dmJmFDzRnYpwDOuGljVOQ=; b=Ef1ch4rVwrn9jBz9LOfB4zz5wSXA9+DKOcV/puT7QY9kNjTGiZwsG/fJV3SI+2BtS7nvZE vF85oDKHUelrUM1ebPqNu1um4/EuD2oaR9PuDV1DXXSTPlFZSRPjokIwNQMZayb+sEUxDB aLbCFdgvXSKJAPxzNuanRCVldMQe48zAw+eObjc7Ai0hMYkv9P4h4OlZ/hJJQycJm4Fyhe 0mKPI8vU80+oeY8KPsXHCKcmPhSYpZgZJxPdb99cV+ieEQ8g9OoCSc6e/qRph8Np61l/Kh 6XwBceZphZC1aDkqAfTzBhRtfgTg/u6E932bu8ebdzBJuYjjzMfNvK6szVkWCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758569464; a=rsa-sha256; cv=none; b=FbBXuQAyc0fPqRgmD8VOxBhNVi9IgbrCUM/LuPbYWBoZDjaiWBhzewFeQcTQeYg4+af+S0 RewJ7kcZ3ZP9CH6HEbk2PeZBO+mDH8LW0r5a/JEqlbZ/9TAQXKMUZg5d2osU0ipWoIV8Ex G8nIpBvGlED4voWeFBkCHybF+jcsZOfxSCVYCuejdFQlMpw5E9CpaAvZH2AHlpWXkP4Aqx B9DtK0TTHQWG58df6z619YiOyEPi50vlL1xPfq8ZyytnOpBrZHkf35UnUdml09ZlirWz9u d8yT8dBLAbjVXjeplWjnCEoYCgzPxd/KB/rVNZPbJkl+rbhv6lfmx+TorQOusw== 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 4cVtWW6nnMz1C9d; Mon, 22 Sep 2025 19:31: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 58MJV3kK041565; Mon, 22 Sep 2025 19:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58MJV340041562; Mon, 22 Sep 2025 19:31:03 GMT (envelope-from git) Date: Mon, 22 Sep 2025 19:31:03 GMT Message-Id: <202509221931.58MJV340041562@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: bf2391ee2ef2 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: bf2391ee2ef274dd24b27a67c0a850b1d6cc2df9 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2391ee2ef274dd24b27a67c0a850b1d6cc2df9 commit bf2391ee2ef274dd24b27a67c0a850b1d6cc2df9 Author: Michael Tuexen AuthorDate: 2025-09-16 21:30:40 +0000 Commit: Michael Tuexen CommitDate: 2025-09-22 19:30:19 +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 66d2916ed174..12ddadf62154 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4327,15 +4327,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