linux_cachyos: update config

chaotic-cx · Nov 1, 2023 · 71a3096 · 71a3096
1 parent bc1b071
commit 71a3096
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/pkgs/linux-cachyos/config-x86_64-linux-hardened.nix b/pkgs/linux-cachyos/config-x86_64-linux-hardened.nix
@@ -774,6 +774,8 @@
   "CONFIG_BLK_PM" = "y";
   "CONFIG_BLOCK_HOLDER_DEPRECATED" = "y";
   "CONFIG_BLK_MQ_STACKING" = "y";
+  "CONFIG_MQ_IOSCHED_DEADLINE" = "y";
+  "CONFIG_MQ_IOSCHED_KYBER" = "y";
   "CONFIG_IOSCHED_BFQ" = "y";
   "CONFIG_BFQ_GROUP_IOSCHED" = "y";
   "CONFIG_PREEMPT_NOTIFIERS" = "y";
@@ -978,7 +980,7 @@
   "CONFIG_TCP_CONG_CDG" = "m";
   "CONFIG_TCP_CONG_BBR" = "y";
   "CONFIG_DEFAULT_BBR" = "y";
-  "CONFIG_DEFAULT_TCP_CONG" = "bbr2";
+  "CONFIG_DEFAULT_TCP_CONG" = "bbr";
   "CONFIG_TCP_MD5SIG" = "y";
   "CONFIG_IPV6" = "y";
   "CONFIG_IPV6_ROUTER_PREF" = "y";
@@ -1420,18 +1422,18 @@
   "CONFIG_NET_SCH_CHOKE" = "m";
   "CONFIG_NET_SCH_QFQ" = "m";
   "CONFIG_NET_SCH_CODEL" = "m";
-  "CONFIG_NET_SCH_FQ_CODEL" = "y";
+  "CONFIG_NET_SCH_FQ_CODEL" = "m";
   "CONFIG_NET_SCH_CAKE" = "m";
-  "CONFIG_NET_SCH_FQ" = "m";
+  "CONFIG_NET_SCH_FQ" = "y";
   "CONFIG_NET_SCH_HHF" = "m";
   "CONFIG_NET_SCH_PIE" = "m";
   "CONFIG_NET_SCH_FQ_PIE" = "m";
   "CONFIG_NET_SCH_INGRESS" = "m";
   "CONFIG_NET_SCH_PLUG" = "m";
   "CONFIG_NET_SCH_ETS" = "m";
   "CONFIG_NET_SCH_DEFAULT" = "y";
-  "CONFIG_DEFAULT_FQ_CODEL" = "y";
-  "CONFIG_DEFAULT_NET_SCH" = "fq_codel";
+  "CONFIG_DEFAULT_FQ" = "y";
+  "CONFIG_DEFAULT_NET_SCH" = "fq";
   "CONFIG_NET_CLS" = "y";
   "CONFIG_NET_CLS_BASIC" = "m";
   "CONFIG_NET_CLS_ROUTE4" = "m";
@@ -8647,6 +8649,4 @@
   "CONFIG_ARCH_USE_MEMTEST" = "y";
   "CONFIG_MEMTEST" = "y";
   "CONFIG_NO_HZ_FULL_NODEF" = "y";
-  "CONFIG_TCP_CONG_BBR2" = "y";
-  "CONFIG_DEFAULT_BBR2" = "y";
 }
diff --git a/pkgs/linux-cachyos/config-x86_64-linux.nix b/pkgs/linux-cachyos/config-x86_64-linux.nix
@@ -809,6 +809,8 @@
   "CONFIG_BLK_PM" = "y";
   "CONFIG_BLOCK_HOLDER_DEPRECATED" = "y";
   "CONFIG_BLK_MQ_STACKING" = "y";
+  "CONFIG_MQ_IOSCHED_DEADLINE" = "y";
+  "CONFIG_MQ_IOSCHED_KYBER" = "y";
   "CONFIG_IOSCHED_BFQ" = "y";
   "CONFIG_BFQ_GROUP_IOSCHED" = "y";
   "CONFIG_PREEMPT_NOTIFIERS" = "y";
@@ -1023,7 +1025,7 @@
   "CONFIG_TCP_CONG_CDG" = "m";
   "CONFIG_TCP_CONG_BBR" = "y";
   "CONFIG_DEFAULT_BBR" = "y";
-  "CONFIG_DEFAULT_TCP_CONG" = "bbr2";
+  "CONFIG_DEFAULT_TCP_CONG" = "bbr";
   "CONFIG_TCP_MD5SIG" = "y";
   "CONFIG_IPV6" = "y";
   "CONFIG_IPV6_ROUTER_PREF" = "y";
@@ -1476,18 +1478,18 @@
   "CONFIG_NET_SCH_CHOKE" = "m";
   "CONFIG_NET_SCH_QFQ" = "m";
   "CONFIG_NET_SCH_CODEL" = "m";
-  "CONFIG_NET_SCH_FQ_CODEL" = "y";
+  "CONFIG_NET_SCH_FQ_CODEL" = "m";
   "CONFIG_NET_SCH_CAKE" = "m";
-  "CONFIG_NET_SCH_FQ" = "m";
+  "CONFIG_NET_SCH_FQ" = "y";
   "CONFIG_NET_SCH_HHF" = "m";
   "CONFIG_NET_SCH_PIE" = "m";
   "CONFIG_NET_SCH_FQ_PIE" = "m";
   "CONFIG_NET_SCH_INGRESS" = "m";
   "CONFIG_NET_SCH_PLUG" = "m";
   "CONFIG_NET_SCH_ETS" = "m";
   "CONFIG_NET_SCH_DEFAULT" = "y";
-  "CONFIG_DEFAULT_FQ_CODEL" = "y";
-  "CONFIG_DEFAULT_NET_SCH" = "fq_codel";
+  "CONFIG_DEFAULT_FQ" = "y";
+  "CONFIG_DEFAULT_NET_SCH" = "fq";
   "CONFIG_NET_CLS" = "y";
   "CONFIG_NET_CLS_BASIC" = "m";
   "CONFIG_NET_CLS_ROUTE4" = "m";
@@ -8940,6 +8942,4 @@
   "CONFIG_ARCH_USE_MEMTEST" = "y";
   "CONFIG_MEMTEST" = "y";
   "CONFIG_NO_HZ_FULL_NODEF" = "y";
-  "CONFIG_TCP_CONG_BBR2" = "y";
-  "CONFIG_DEFAULT_BBR2" = "y";
 }
diff --git a/pkgs/linux-cachyos/configfile-raw.nix b/pkgs/linux-cachyos/configfile-raw.nix
@@ -33,24 +33,30 @@ let
     # _cpusched, defaults to "cachyos"
     "-e SCHED_BORE"
 
-    # _HZ_ticks, defaults to "500"
-    "-d HZ_300"
-    "--set-val HZ 500"
-    "-e HZ_500"
-
     # _nr_cpus, defaults to empty, which later set this
     "--set-val NR_CPUS 320"
 
-    # _mq_deadline_disable, defaults to "y"
-    "-d MQ_IOSCHED_DEADLINE"
-
-    # _mq_deadline_disable, defaults to "y"
-    "-d MQ_IOSCHED_KYBER"
-
-    # _per_gov, defaults to "y"
+    # _per_gov, defaults to empty [but PERSONAL CHANGE to "y"]
     "-d CPU_FREQ_DEFAULT_GOV_SCHEDUTIL"
     "-e CPU_FREQ_DEFAULT_GOV_PERFORMANCE"
 
+    # _tcp_bbr3, defaults to "y"
+    "-m TCP_CONG_CUBIC"
+    "-d DEFAULT_CUBIC"
+    "-e TCP_CONG_BBR"
+    "-e DEFAULT_BBR"
+    "--set-str DEFAULT_TCP_CONG bbr"
+    "-m NET_SCH_FQ_CODEL"
+    "-e NET_SCH_FQ"
+    "-d DEFAULT_FQ_CODEL"
+    "-e DEFAULT_FQ"
+    "--set-str DEFAULT_NET_SCH fq"
+
+    # _HZ_ticks, defaults to "500"
+    "-d HZ_300"
+    "--set-val HZ 500"
+    "-e HZ_500"
+
     # _tickrate defaults to "full"
     "-d HZ_PERIODIC"
     "-d NO_HZ_IDLE"
@@ -74,13 +80,6 @@ let
     "-d CC_OPTIMIZE_FOR_PERFORMANCE"
     "-e CC_OPTIMIZE_FOR_PERFORMANCE_O3"
 
-    # _tcp_bbr2, defaults to "y"
-    "-m TCP_CONG_CUBIC"
-    "-d DEFAULT_CUBIC"
-    "-e TCP_CONG_BBR2"
-    "-e DEFAULT_BBR2"
-    "--set-val DEFAULT_TCP_CONG bbr2"
-
     # _lru_config, defaults to "standard"
     "-e LRU_GEN"
     "-e LRU_GEN_ENABLED"
@@ -93,6 +92,8 @@ let
     # _hugepage, defaults to "always"
     "-d TRANSPARENT_HUGEPAGE_MADVISE"
     "-e TRANSPARENT_HUGEPAGE_ALWAYS"
+
+    #_use_auto_optimization, defaults to "y" [but GENERIC to ""]
   ];
 in
 stdenv.mkDerivation {

diff --git a/pkgs/linux-cachyos/default.nix b/pkgs/linux-cachyos/default.nix
@@ -43,8 +43,7 @@ in
     })
     [
       "${patches-src}/${major}/all/0001-cachyos-base-all.patch"
-      "${patches-src}/${major}/sched/0001-EEVDF-cachy.patch"
-      "${patches-src}/${major}/sched/0001-bore-eevdf.patch"
+      "${patches-src}/${major}/sched/0001-bore-cachy.patch"
       "${patches-src}/${major}/misc/0001-Add-extra-version-CachyOS.patch"
       "${patches-src}/${major}/misc/0001-bcachefs.patch"
     ];