From nobody Wed Oct 18 14:44:07 2023 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 4S9YWs51YYz4x6wr; Wed, 18 Oct 2023 14:44:09 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YWs4QWtz3ZBt; Wed, 18 Oct 2023 14:44:09 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640249; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=oO3DccGcplq+sNVR/y0ZjV68DkXeCRrq3eMxmQn0/Do=; b=pp3zoiBAeQpknlG/dH57w8Y38dMSkYt6kZC7ULV6bjHxXMNdv3g7/hnZpSNI+64JEP3xQC UNVDaAlCfiYIPSlPz3crIxiVnETVcBuetA8P1gsr+RWXAsC4OxKSoimWPgIWocnYVnujup za0nwVtFWfnmwY17Km+lgBlJB7pQURPE7ajSWlMEBbTl/EaGdjW/KXW4kMiRO450DukBBZ nQK+Lyp8gK0Go8FDxKDynIwlVAIefsPyD2KA/kHZDOjpRywsPk4tCkygJe4Cqfm1Oif/Gb 1OsKe3UGOM44pSF435FhAx6wbgg8yp2m91yAZySUQH5wTYurlAYw7jiKathNqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640249; a=rsa-sha256; cv=none; b=t44Mv1wvqxlofx1EkDHR7V/krA3TD8Sd7u4Hge0Vwm2F1vWdQvz8WWxhPY0aOAuHQegwDC WG9m9DycmluHaNko/PVEAvCaMfv+7y/mGTCy0X2UffcHPyLX/K4IP7L9d2kdUmnejPUjLr 2iw6QSlp84Vw8OH9J4aMPBhfkslkF9mM6EpRSU1ElCeE0xqeZQjFIzPukQQ6OxaFGy9G3Y OLGOkP9RjjY/Do1DkT7rZDDfYQFW0YaUO4SuP18kdRKXHVACFq6sg/DrLNN1lsazX/n7G5 BYMDuJX0NGhUz4Rj5ZuCCY+AFLfwxjmlSUQSQWUNXN8cc3im6HTehMj0ijvoGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640249; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=oO3DccGcplq+sNVR/y0ZjV68DkXeCRrq3eMxmQn0/Do=; b=iDB4DQFs1sRuNuxSigZpiwzhlasgglIsLNlE7x5MD+VOyIYnGEHSAWrh1ObmpwyqyoTAYH CPg41lVSsTe6ajJj0JRQ6W+eTPwiK1fTOIWVnchKBSyNTkDm4ys/fs/zlbPk0rsDavC/rM ac+Jk2Caw7amUhD8tf+BYlnUpgZd/kW1k2J4+8yZLvj27mJGw/UuyQfbpJTmhhpIKV+IQJ e/Ez4NciocPdO1l1F6aojuDY6LpGEKY+gWmPRLm8upI0hI+glOI48lo2HmNtS4YLy19TfV kV/Egksly+SbaNsBcdHOJJrSyGW4p11vXIeSF48GQ0e5oEMFuFZoW0LK0/uAPw== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S9YWr6Zb0z94N; Wed, 18 Oct 2023 14:44:08 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <587cce35-35d1-4e5e-8ab0-5df8cc8fa670@freebsd.org> Date: Wed, 18 Oct 2023 11:44:07 -0300 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3a338c534154 - main - Add the BBR and RACK stacks to the LINT kernel. Content-Language: en-CA To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310181413.39IEDXce057484@gitrepo.freebsd.org> From: Mitchell Horne Autocrypt: addr=mhorne@freebsd.org; keydata= xsBNBFyS2dQBCADdiXBG8hBVLmYbxu7aSzbwLwUf3HkGFz3rooS1kwyy+SfmjZ4UKNnl9WMx WKrJ7OAZpiNH6bLQ5nsqfx09OnpWL8c/QuPbhNdUywQoqqYpRI0K8GEn//nS9Gs0KTYwVpWb XlrzP+jf3Uh/9L5mcQmStLIH4zaaqMYHW+pMuPrvBmLIHTvLj2QjOkxslrcUdord9uvxe5Ht LU8RuTpQpHOKz705Z9/v7twFdi2HtKzpLwO6SzVyu351di1J+GihsVpcT5josQV5cHbIP3Un x+kmtKBEEc/jl/zBglF7ruWUtwgbryID+2ZPEaO1Mj+RResX4LFVMusq3uUpWRb5WJXxABEB AAHNI01pdGNoZWxsIEhvcm5lIDxtaG9ybmVARnJlZUJTRC5vcmc+wsCUBBMBCgA+AhsDBQsJ CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDpUFCQtC z0EACgkQi/gnTOdUid8IsQf+N8IptrrCgifT5Z0/WUVFfnHThFOKf4zBjaGswsIM8+VKsKnF 15jCWHODUHP6s+dcQ4nQi81PHPsnMfBSkGPvN/X3ess2/1KUVkH+6tAJbqXDjXhD8HT+i0NM QEFIXlLnotpgIKW3yOHjKv3ZvKw9LCvUjyNY9vOJmLk/6AbbkFh+INo65nXtQWb/hM5FVEHW S+zUoU8AqZRJoVAQfj9wmIfg/HdsxeDGKL0zkv5AwKpccvb8VJNGJbCVMgoy5uQYcUeXxcie cg0VlbFLshNQTfyhVQ85vyuHahARrUWs/k8KiYODoBnW1ChtyF8yM6VZTzSYx7pINqPq2YZy i/Htd87ATQRcktnUAQgA3zt4M4ecoQqfxpjliNLujt9klDqvmkJvWmzMuMXdzlPgGRJ0doio 9YIeEdkOt6xN0pPTK/ReCZ8WqFQ8zo23u1pwGuo0CnR58XF19wyxyUuKu/PHbt+56mC8tNHm AXsMyXQmlDqWvn/WzLY7euNRtNS4QQIwtxfM5EC4GGa5KQwxn0kM7dkUSOE/cxr+/kNbHHzb gagZR4cnNUqtPPr3dYXcibCTzgz96Lyt3/qMLXX9RTBRzu+O6E+byxWOe8ar/ZlwY2b4wTQG mhgNttkSxKtxMpZnd8+DGV/bI1P5Ct/K2GeCwNyupQGON5ymn6o7jTch+qmFX0ItkBWO4zn4 9QARAQABwsB8BBgBCgAmAhsMFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDtwFCQtCz4gA CgkQi/gnTOdUid/i5gf/aQ75pJR4TJFM2vVVr6PDIwTdl0b5EchB4w4s4g/zE84XNbMOQanb BginLYEhAacLQVAvM3XdvUEhwrhaMQdjdSEB1krResL3/mbxrtKwdHSMbHA3IS3XdvxFWTB7 P5JjUSPsW6hqgoidbn4w3OxaNHhs45H2b0Nx5QiKcSyepmCZuB52gCEHnEnrdaz8TFQMXOLq 94WbTmZeIjChW3FB61m1gTf0UEFjoZAfTAUB+pbwoCa4AykIeZnDC19vjsruVU9Gy5rLglwd bjsZNfXIJGOZNEvdF8FOBwM7DlXx7SYvTJcUNoNJjOKtQ0bYGVgGqYOB/y2mTjVuKeU0eOkN Uw== In-Reply-To: <202310181413.39IEDXce057484@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/18/23 11:13, Dag-Erling Smørgrav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3a338c534154164504005beb00a3c6feb03756cc > > commit 3a338c534154164504005beb00a3c6feb03756cc > Author: Dag-Erling Smørgrav > AuthorDate: 2023-10-18 14:13:12 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2023-10-18 14:13:12 +0000 > > Add the BBR and RACK stacks to the LINT kernel. > > While here, drop the EXTRA_TCP_STACKS option, which serves no purpose and > should never have been added. Instead, build bbr and rack as long as > either or both of INET and INET6 is enabled. There is no risk to anyone > who doesn't load one or both and then twiddle the relevant sysctls. > > Differential Revision: https://reviews.freebsd.org/D42088 > --- > share/man/man5/src.conf.5 | 2 -- > sys/conf/NOTES | 4 +++- > sys/conf/files | 7 +++++++ > sys/conf/kern.opts.mk | 1 - > sys/conf/kern.post.mk | 4 ---- > sys/conf/options | 2 ++ > sys/modules/tcp/Makefile | 7 ++----- > 7 files changed, 14 insertions(+), 13 deletions(-) Hi, There is a leftover description file, tools/build/options/WITH_EXTRA_TCP_STACKS. Mitchell > > diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 > index 9d26531e515b..bc94d5c62234 100644 > --- a/share/man/man5/src.conf.5 > +++ b/share/man/man5/src.conf.5 > @@ -641,8 +641,6 @@ Avoid installing examples to > .Pa /usr/share/examples/ . > .It Va WITH_EXPERIMENTAL > Include experimental features in the build. > -.It Va WITH_EXTRA_TCP_STACKS > -Build extra TCP stack modules. > .It Va WITHOUT_FDT > Do not build Flattened Device Tree support as part of the base system. > This includes the device tree compiler (dtc) and libfdt support library. > diff --git a/sys/conf/NOTES b/sys/conf/NOTES > index a5ed60792a1f..b12d5def2d57 100644 > --- a/sys/conf/NOTES > +++ b/sys/conf/NOTES > @@ -681,7 +681,6 @@ options TCP_OFFLOAD # TCP offload support. > options TCP_RFC7413 # TCP Fast Open > > options TCPHPTS > -makeoptions WITH_EXTRA_TCP_STACKS=1 # RACK and BBR TCP kernel modules > > # In order to enable IPSEC you MUST also add device crypto to > # your kernel configuration > @@ -693,6 +692,9 @@ options IPSEC #IP security (requires device crypto) > options IPSEC_SUPPORT > #options IPSEC_DEBUG #debug for IP security > > +# Alternative TCP stacks > +options TCP_BBR > +options TCP_RACK > > # TLS framing and encryption/decryption of data over TCP sockets. > options KERN_TLS # TLS transmit and receive offload > diff --git a/sys/conf/files b/sys/conf/files > index 8c3bdca61905..c127ce7e7103 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -4361,6 +4361,13 @@ netinet/tcp_pcap.c optional inet tcppcap | inet6 tcppcap \ > compile-with "${NORMAL_C} ${NO_WNONNULL}" > netinet/tcp_reass.c optional inet | inet6 > netinet/tcp_sack.c optional inet | inet6 > +netinet/tcp_stacks/bbr.c optional inet tcp_bbr | inet6 tcp_bbr \ > + compile-with "${NORMAL_C} -DMODNAME=tcp_bbr -DSTACKNAME=bbr" > +netinet/tcp_stacks/rack.c optional inet tcp_bbr | inet6 tcp_bbr \ > + compile-with "${NORMAL_C} -DMODNAME=tcp_rack -DSTACKNAME=rack" > +netinet/tcp_stacks/rack_bbr_common.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > +netinet/tcp_stacks/sack_filter.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > +netinet/tcp_stacks/tailq_hash.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > netinet/tcp_stats.c optional stats inet | stats inet6 > netinet/tcp_subr.c optional inet | inet6 > netinet/tcp_syncache.c optional inet | inet6 > diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk > index f908f761b21e..cc6f8a1d8755 100644 > --- a/sys/conf/kern.opts.mk > +++ b/sys/conf/kern.opts.mk > @@ -56,7 +56,6 @@ __DEFAULT_YES_OPTIONS = \ > > __DEFAULT_NO_OPTIONS = \ > BHYVE_SNAPSHOT \ > - EXTRA_TCP_STACKS \ > KERNEL_RETPOLINE \ > RATELIMIT \ > REPRODUCIBLE_BUILD \ > diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk > index a4eb2e94a47b..bea29507a736 100644 > --- a/sys/conf/kern.post.mk > +++ b/sys/conf/kern.post.mk > @@ -33,10 +33,6 @@ MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}" > MKMODULESENV+= WITH_CTF="${WITH_CTF}" > .endif > > -.if defined(WITH_EXTRA_TCP_STACKS) > -MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" > -.endif > - > .if !empty(KCSAN_ENABLED) > MKMODULESENV+= KCSAN_ENABLED="yes" > .endif > diff --git a/sys/conf/options b/sys/conf/options > index 4e74c4ab3a70..d2f31272d189 100644 > --- a/sys/conf/options > +++ b/sys/conf/options > @@ -231,6 +231,8 @@ SW_WATCHDOG opt_watchdog.h > TCPHPTS opt_inet.h > TCP_REQUEST_TRK opt_global.h > TCP_ACCOUNTING opt_global.h > +TCP_BBR opt_inet.h > +TCP_RACK opt_inet.h > # > # TCP SaD Detection is an experimental Sack attack Detection (SaD) > # algorithm that uses "normal" behaviour with SACK's to detect > diff --git a/sys/modules/tcp/Makefile b/sys/modules/tcp/Makefile > index 8f89977b5b69..364c0326c40d 100644 > --- a/sys/modules/tcp/Makefile > +++ b/sys/modules/tcp/Makefile > @@ -8,13 +8,10 @@ SUBDIR= \ > ${_tcp_rack} \ > ${_tcpmd5} \ > > -.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES) > -_tcp_bbr= bbr > -_tcp_rack= rack > -.endif > - > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > defined(ALL_MODULES) > +_tcp_bbr= bbr > +_tcp_rack= rack > .if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} > _tcpmd5= tcpmd5 > .endif