packages/linux-lava: bump to 6.0 and some config changes

- use lru patch
- try bore scheduler instead of pds
- use 1000hz

packages/linux-lava/default.nix

@@ -28,10 +28,12 @@ in buildLinux (args // {
     NO_HZ_FULL = yes;
     NO_HZ_FULL_NODEF = yes;
     NO_HZ_IDLE = no;
+    TICK_CPU_ACCOUNTING = no;
+    VIRT_CPU_ACCOUNTING_GEN = yes;
     CONTEXT_TRACKING = yes;
     CONTEXT_TRACKING_FORCE = no;
-    HZ_500 = yes;
-    HZ_500_NODEF = yes;
+    HZ_1000 = yes;
+    HZ_1000_NODEF = yes;
 
     # preempt
     PREEMPT = yes;
@@ -41,10 +43,7 @@ in buildLinux (args // {
     PREEMPT_DYNAMIC = yes;
 
     # scheduler
-    SCHED_ALT = yes;
-    SCHED_PDS = yes;
-    FAIR_GROUP_SCHED = no;
-    CFS_BANDWIDTH = no;
+    SCHED_BORE = yes;
 
     # disable numa
     NUMA = no;

packages/linux-lava/sources.nix

@@ -1,19 +1,20 @@
 { fetchFromGitHub, inputs, lib }:
 let
-  version = "5.17.2";
-  kernelHash = "1cdi43x4c3l4chznh57gm55szycj4wjlxl1dss1ilnfvvmhyypsm";
-  kernelPatchHash = "0rsril9dpvxy4afc6agx8gsyhmbicww43dzmjhmxa8c4h6wdj8bx";
+  version = "6.0";
+  kernelHash = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w";
+  #kernelPatchHash = "0y25zs7rlk9dz9ppyr76rv6id64j3f4hpby4wljmy7p9z9wba30s";
 
+  mm = lib.versions.majorMinor version;
   tkgPatches = [
     "0001-mm-Support-soft-dirty-flag-reset-for-VA-range"
     "0002-clear-patches"
     "0002-mm-Support-soft-dirty-flag-read-with-reset"
     "0003-glitched-base"
+    "0003-glitched-cfs"
+    "0003-glitched-cfs-additions"
     "0007-v${mm}-fsync1_via_futex_waitv"
     "0007-v${mm}-winesync"
-    "0009-prjc_v5.17-r0"
-    "0009-glitched-ondemand-bmq"
-    "0005-glitched-pds"
+    "0010-lru_${mm}"
     "0012-misc-additions"
   ];
 
@@ -21,14 +22,21 @@ let
     name = "patch-${path}";
     patch = path;
   };
-  kernelPatchSrc = {
-    name = "patch";
+  # kernelPatchSrc = {
+  #   name = "patch";
+  #   patch = builtins.fetchurl {
+  #     url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz";
+  #     sha256 = kernelPatchHash;
+  #   };
+  # };
+
+  borePatch = {
+    name = "bore-patch";
     patch = builtins.fetchurl {
-      url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz";
-      sha256 = kernelPatchHash;
+      url = "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${mm}/sched/0001-bore.patch";
+      sha256 = "1l7c1h3afd8080837x3a838bb7izz36mvzafpa4lsqkizsmyx1xl";
     };
   };
-  mm = lib.versions.majorMinor version;
 in {
   inherit version;
 
@@ -42,7 +50,8 @@ in {
   };
 
   kernelPatches = [
-    kernelPatchSrc
+    #kernelPatchSrc
+    borePatch
     (patch ./si-manual-clocking.patch)
   ]
   ++ builtins.map (name: {