feat: Use cubic as the default TCP congestion control

BBRv3 has been reported to cause slow network speeds on desktop systems, particularly when downloading in Steam. Research[1] has also showed that BBRv3 fails horribly with staggered network flows. [1] https://inet-bbrv3eval.mpi-inf.mpg.de/ Signed-off-by: Eric Naim <[email protected]>
CachyOS · Dec 7, 2024 · 7b9eee6 · 7b9eee6
1 parent 84a6510
commit 7b9eee6
Show file tree

Hide file tree

Showing 27 changed files with 63 additions and 63 deletions.
diff --git a/linux-cachyos-bmq/.SRCINFO b/linux-cachyos-bmq/.SRCINFO
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-bmq
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-prjc-cachy.patch
 	b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
-	b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
+	b2sums = a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d
 	b2sums = 807922244c2b4d07a1f12c381bf6ddc623dcc440b204c106476ec7f75e5ea3f5ee13316e2cdc9013db1301ce2aa7d01491048e95b6bca5dff890d3df91449e43

diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
@@ -67,7 +67,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -758,7 +758,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955'
-        '8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701'
+        'a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d'
         '807922244c2b4d07a1f12c381bf6ddc623dcc440b204c106476ec7f75e5ea3f5ee13316e2cdc9013db1301ce2aa7d01491048e95b6bca5dff890d3df91449e43')
diff --git a/linux-cachyos-bmq/config b/linux-cachyos-bmq/config
@@ -1427,7 +1427,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1441,10 +1441,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y

diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-bore
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch
 	b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
-	b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
+	b2sums = a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d
 	b2sums = d27f2bc3853f1136b111d8945f4476bfd0ed00e734c19c6d3edd51099ec1849cfc9149f83e4d029dd70b96048a36cfb95c6248f4d5178836f476faf69778ce38

diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
@@ -67,7 +67,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -758,7 +758,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955'
-        '8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701'
+        'a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d'
         'd27f2bc3853f1136b111d8945f4476bfd0ed00e734c19c6d3edd51099ec1849cfc9149f83e4d029dd70b96048a36cfb95c6248f4d5178836f476faf69778ce38')
diff --git a/linux-cachyos-bore/config b/linux-cachyos-bore/config
@@ -1427,7 +1427,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1441,10 +1441,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y

diff --git a/linux-cachyos-deckify/.SRCINFO b/linux-cachyos-deckify/.SRCINFO
@@ -26,7 +26,7 @@ pkgbase = linux-cachyos-deckify
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/misc/0001-handheld.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch
 	b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
-	b2sums = baedbdceaf1f875db8639dd3e7b000099ada6832f282dc65b400f4d521e2e5848db95f778de7e0c18188d0801c584172cc00ba278bc204017cb19b70853adcac
+	b2sums = b1e2ce3b2ddd55bf3949ad26598b70d3beaf8f5ddd5a98ee4b7714d822caf834e064c485f80faa5fd975890b59e516e037419e1506e6da509aeb6ac181194a33
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d
 	b2sums = be844475f453f79f5d892c2cc2a6843b32501e2a7c57dd0859ec0cba2262d9fa9a95fff77b6e3718dff449c0f3b428fce03bc35d8332081427feedd461388498

diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
@@ -67,7 +67,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -759,7 +759,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955'
-        'baedbdceaf1f875db8639dd3e7b000099ada6832f282dc65b400f4d521e2e5848db95f778de7e0c18188d0801c584172cc00ba278bc204017cb19b70853adcac'
+        'b1e2ce3b2ddd55bf3949ad26598b70d3beaf8f5ddd5a98ee4b7714d822caf834e064c485f80faa5fd975890b59e516e037419e1506e6da509aeb6ac181194a33'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d'
         'be844475f453f79f5d892c2cc2a6843b32501e2a7c57dd0859ec0cba2262d9fa9a95fff77b6e3718dff449c0f3b428fce03bc35d8332081427feedd461388498'

diff --git a/linux-cachyos-deckify/config b/linux-cachyos-deckify/config
@@ -1407,7 +1407,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1421,10 +1421,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y

diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO
@@ -23,7 +23,7 @@ pkgbase = linux-cachyos-eevdf
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
 	b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
-	b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
+	b2sums = a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d
 

diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
@@ -67,7 +67,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -758,6 +758,6 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955'
-        '8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701'
+        'a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d')
diff --git a/linux-cachyos-eevdf/config b/linux-cachyos-eevdf/config
@@ -1427,7 +1427,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1441,10 +1441,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y

diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO
@@ -25,7 +25,7 @@ pkgbase = linux-cachyos-hardened
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/sched/0001-bore-cachy.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/misc/0001-hardened.patch
 	b2sums = 97787b71bcf6a57872078e46917b3b6e339f25a0320dabe226fe5fe91e3eb829e3749b096eec4525fd1d6f25805f54f8a2d2b71a41bc94fd35c2b9c9140f25d7
-	b2sums = d42c94debcb16fa332e40b6d57c6e8c61756bf130e9cf5f5381cb59455ceaec23606bc01627df4031fa6cdc43a6d3fc02238de631e66f1a6cc6188a9bd17892b
+	b2sums = fddc2b5e191ae4b7d1dbfc75faf7b46297a1536c2bff8ef61c7f182fb99f8e49db43cff291aeec13b0855daa9621646f3aaea7226b09c42413049584126aa869
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = b147966760f2f8e5dbba84e1ee73a1d81baf938848eb22bf58f5644de264baf4c857abd32e754d57c181b633ea8bfbb6568fe1c3229ce1feb1c4b3295ba3f884
 	b2sums = fcaa167830bb9558668ad7be808511be8c877e74c2c29326f0b1eaa0f50bf56bae47cab61cb11087d9863d0ad790fdfee76d3fbce4e570f673f6c22322ca749d

diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
@@ -68,7 +68,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -763,7 +763,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('97787b71bcf6a57872078e46917b3b6e339f25a0320dabe226fe5fe91e3eb829e3749b096eec4525fd1d6f25805f54f8a2d2b71a41bc94fd35c2b9c9140f25d7'
-        'd42c94debcb16fa332e40b6d57c6e8c61756bf130e9cf5f5381cb59455ceaec23606bc01627df4031fa6cdc43a6d3fc02238de631e66f1a6cc6188a9bd17892b'
+        'fddc2b5e191ae4b7d1dbfc75faf7b46297a1536c2bff8ef61c7f182fb99f8e49db43cff291aeec13b0855daa9621646f3aaea7226b09c42413049584126aa869'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'b147966760f2f8e5dbba84e1ee73a1d81baf938848eb22bf58f5644de264baf4c857abd32e754d57c181b633ea8bfbb6568fe1c3229ce1feb1c4b3295ba3f884'
         'fcaa167830bb9558668ad7be808511be8c877e74c2c29326f0b1eaa0f50bf56bae47cab61cb11087d9863d0ad790fdfee76d3fbce4e570f673f6c22322ca749d'

diff --git a/linux-cachyos-hardened/config b/linux-cachyos-hardened/config
@@ -1367,7 +1367,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1381,10 +1381,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y

diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO
@@ -24,7 +24,7 @@ pkgbase = linux-cachyos-lts
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch
 	sha256sums = d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835
-	sha256sums = cb63f74e96e631012b61f26ba3e1212099a06455108160971a03ef60e8bea796
+	sha256sums = f4ddfbc0c375af5d8d9ca07f87513b874e019e4b84d9e05460fec05a667e6430
 	sha256sums = 1a7747d5b4ccd427d643e3f548cd99c09d0f05b108fc530a581e28a41c5533c9
 	sha256sums = 2706d935575e114210892b441671037ab96d5f70f084c391a23b43cd96afaa3e
 	sha256sums = 8b6a5ed6abb44346ef5f435d1e67a1f6c679eb15c4283015f81578622c4a1514

diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
@@ -70,7 +70,7 @@ _nr_cpus=${_nr_cpus-}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -859,7 +859,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 sha256sums=('d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835'
-            'cb63f74e96e631012b61f26ba3e1212099a06455108160971a03ef60e8bea796'
+            'f4ddfbc0c375af5d8d9ca07f87513b874e019e4b84d9e05460fec05a667e6430'
             '1a7747d5b4ccd427d643e3f548cd99c09d0f05b108fc530a581e28a41c5533c9'
             '2706d935575e114210892b441671037ab96d5f70f084c391a23b43cd96afaa3e'
             '8b6a5ed6abb44346ef5f435d1e67a1f6c679eb15c4283015f81578622c4a1514')
diff --git a/linux-cachyos-lts/config b/linux-cachyos-lts/config
@@ -1352,7 +1352,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1366,10 +1366,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y

diff --git a/linux-cachyos-rt-bore/.SRCINFO b/linux-cachyos-rt-bore/.SRCINFO
@@ -25,7 +25,7 @@ pkgbase = linux-cachyos-rt-bore
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/sched/0001-bore-cachy.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/misc/0001-rt.patch
 	b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
-	b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
+	b2sums = a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d
 	b2sums = d27f2bc3853f1136b111d8945f4476bfd0ed00e734c19c6d3edd51099ec1849cfc9149f83e4d029dd70b96048a36cfb95c6248f4d5178836f476faf69778ce38

diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
@@ -67,7 +67,7 @@ _cc_harder=${_cc_harder-y}
 _per_gov=${_per_gov-}
 
 ### Enable TCP_CONG_BBR3
-_tcp_bbr3=${_tcp_bbr3-y}
+_tcp_bbr3=${_tcp_bbr3-}
 
 ### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
@@ -758,7 +758,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955'
-        '8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701'
+        'a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
         'db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d'
         'd27f2bc3853f1136b111d8945f4476bfd0ed00e734c19c6d3edd51099ec1849cfc9149f83e4d029dd70b96048a36cfb95c6248f4d5178836f476faf69778ce38'

diff --git a/linux-cachyos-rt-bore/config b/linux-cachyos-rt-bore/config
@@ -1427,7 +1427,7 @@ CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
@@ -1441,10 +1441,10 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_SIGPOOL=y
 CONFIG_TCP_AO=y
 CONFIG_TCP_MD5SIG=y

diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO
@@ -23,7 +23,7 @@ pkgbase = linux-cachyos-server
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.12/all/0001-cachyos-base-all.patch
 	b2sums = 1caaf9aed83a69a0c8b17ca923a97848cbb3b042d023aaaa7462c24f66f0d1b8a4fa42e2f3b9248ab8c57000a0e68d185072b0c88be7bcd93175f3e88ac76955
-	b2sums = 8924e8e84d1a898fa14c8a14b5facc20fb44d5809d6eca45db9dd67ece7d233b9dfecd48181bc88392a227b63e757025e83a8709cace6fe55684c27b707ba701
+	b2sums = a69ecf1084f8d819d9aef3387541b275900dce010ab0d6d8f7ae9f3c4554a96d4f4c2d67b92ef6ea93e819043276a52c201c39d60dd38303d3a881d5c4bef873
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
 	b2sums = db7de8b6fad0fd781bc9469a456011438e1bce7a2f81b3169b44c532ab616a1a140c6bd6cfc0151d92213c10eb5a86101b9b7d8154051381f9e9d4947844ce8d