From nobody Tue Sep 16 21:35:08 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 4cRFYS4nZzz6867j; Tue, 16 Sep 2025 21:35:08 +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 4cRFYS3y1Qz3cLk; Tue, 16 Sep 2025 21:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758058508; 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=bKszHXa26KEjHkJdQrEOj5WZAB3cwniQvKre6ceRo7k=; b=Ebx46YN28rkC+BLdPUsDoo/Zy3YSPiHh7E8iW1rxtiKGvN10AzzUCGu0jhaYcD1Gclxzf0 Kh5vIkUH/iH0H5RpUm/VUqTlGMo9ekRLrN68KOAAOls85DYVUGffYtRM1fKb35v+x0eRoN Ip1B9vkcTNchnQg6/qpB+WneRrPV2pebmeeF3KJBTsLBd4gH2Wl7hYM9LeYN+FYWwP6nmr iMXhqqG26o9vUuNQVJjfKxYAz8rKJJ0HshsBon4xdMjJPOYcChKTu5IRxotOp92ST+80uG p9S6Z9k1lkHk0Pr7Sc7G1mBGeIoy8SiuEFcV/Hg63agfbtW0fkbTW2nk/bSayw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758058508; 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=bKszHXa26KEjHkJdQrEOj5WZAB3cwniQvKre6ceRo7k=; b=KPQWXAYc2MfWyhha0HEMPSEIqOXTFgEDcmb3h+LKWSGB0BdWR+kxZs5C2Fzq8CifGd8i+Q Aioq+WYJFz/Zel2e/xEBf3wI8d+1Tfec/Y/yu6MCD2FOwke9CogTqrBsZcThr4CsA6ceSY JiEm5kUnGhcTnJjN53xip7w+HDCsnSXnLhCYdRZs2zEdG7Fa3fefBCckbFmSZy3aC2euQD AjE/Duh6Egtjx2ESoXSVfzGorvPM12q1DzV1nU5QlHWdNSStNTjK/AFAzIOCrWWA8kn2eM fvPKAxk/tn7i9mDqnnMIAQO4XF/4K9vOuyOWSxX1ySnVjjgJg1edgnl8Eutllg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758058508; a=rsa-sha256; cv=none; b=Ls2us5jtRL5lr+QYLGxbYx2Oq8kA9ohy3QJkUqZoqnynbdQj1FdXuOfIabYH8AeXM18Kva /DB+uMNoi98x4mIGLetGoSfJj2MUhpwjcJAQVyEe/DluNo+w1wg5XfBi496PJAou4/2RFK kxwKbYEL6kJmS2m7Vs1bXUSDI0ZPAa06wpEwgJaItqPTJ9eVLMeKvfrNEVvjmLXPcPguCd IH1VhtJAPFoTxsGjOYRCfqSpSJpTZt2UzUTQ6Ur3XcN0gxgOJBQxd0wD73cR00RLSqo/fU UZ2f8H82544OnUXWIa0CeaxWa0POIJVMK+ra0JWaNQZQ69bY5WA2SrhH1wfqGw== 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 4cRFYS3950zxxB; Tue, 16 Sep 2025 21:35:08 +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 58GLZ8rc029591; Tue, 16 Sep 2025 21:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GLZ8BZ029588; Tue, 16 Sep 2025 21:35:08 GMT (envelope-from git) Date: Tue, 16 Sep 2025 21:35:08 GMT Message-Id: <202509162135.58GLZ8BZ029588@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: 1bb72d3d6eee - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1bb72d3d6eee50232b6d6acbc201f9aaac93e2b5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1bb72d3d6eee50232b6d6acbc201f9aaac93e2b5 commit 1bb72d3d6eee50232b6d6acbc201f9aaac93e2b5 Author: Michael Tuexen AuthorDate: 2025-09-16 21:30:40 +0000 Commit: Michael Tuexen CommitDate: 2025-09-16 21:30:40 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52547 --- 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