Fix TCP BBR setting
I previously set the TCP queuing discipline to BBR without actually compiling in BBR.
See T943. This actually builds in BBR and sets it as default in the kernel config, thus removing
the need to manually set it in userspace.
Test Plan: CI
Bug: T943
X-Origin-Diff: phab/D760
GitOrigin-RevId: 779a709e4298ec59bfdcf462fe2f3563952204b6
diff --git a/metropolis/node/core/network/main.go b/metropolis/node/core/network/main.go
index fe71634..9284b30 100644
--- a/metropolis/node/core/network/main.go
+++ b/metropolis/node/core/network/main.go
@@ -225,9 +225,6 @@
// Disable source routing
"net.ipv4.conf.all.accept_source_route": "0",
- // Set congestion control to Google BBR
- "net.ipv4.tcp_congestion_control": "bbr",
-
// Increase Linux socket kernel buffer sizes to 16MiB (needed for fast datacenter networks)
"net.core.rmem_max": "16777216",
"net.core.wmem_max": "16777216",
diff --git a/third_party/linux/linux-metropolis.config b/third_party/linux/linux-metropolis.config
index 965ef8b..410463d 100644
--- a/third_party/linux/linux-metropolis.config
+++ b/third_party/linux/linux-metropolis.config
@@ -928,9 +928,27 @@
CONFIG_INET_UDP_DIAG=y
CONFIG_INET_RAW_DIAG=y
CONFIG_INET_DIAG_DESTROY=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_CUBIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_NV is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+CONFIG_TCP_CONG_DCTCP=y
+# CONFIG_TCP_CONG_CDG is not set
+CONFIG_TCP_CONG_BBR=y
+# CONFIG_DEFAULT_DCTCP is not set
+CONFIG_DEFAULT_BBR=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="bbr"
# CONFIG_TCP_MD5SIG is not set
CONFIG_IPV6=y
# CONFIG_IPV6_ROUTER_PREF is not set