From 0a242b15735b7375e9842d54545f3b8dd93c3ddf Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:21:58 +0000 Subject: [PATCH 1/6] linux_xanmod_tt: remove --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 14 -------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8ec761a701a3..34bf83b9dc46 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -20,13 +20,6 @@ let variant = "next"; }; - ttVariant = { - version = "5.15.54"; - suffix = "xanmod1-tt"; - hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis="; - variant = "tt"; - }; - xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; @@ -56,12 +49,6 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; - } // lib.optionalAttrs (variant == "tt") { - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); - SCHED_CORE = lib.mkForce (option no); }; extraMeta = { @@ -76,5 +63,4 @@ in lts = xanmodKernelFor ltsVariant; current = xanmodKernelFor currentVariant; next = xanmodKernelFor nextVariant; - tt = xanmodKernelFor ttVariant; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ac16901e15bd..81337dfb5784 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,6 +836,8 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 + linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef2108e841f..e1c581e0ca10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25148,8 +25148,6 @@ with pkgs; linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; - linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; - linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 766edb74b5e8..5faf6d0172a2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -234,7 +234,7 @@ in { linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = xanmodKernels.current; linux_xanmod_latest = xanmodKernels.next; - linux_xanmod_tt = xanmodKernels.tt; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -583,7 +583,7 @@ in { linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); - linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); From 94a1409703818f8fc7af81a1ff3bcfa97af1fe36 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:28:40 +0000 Subject: [PATCH 2/6] linux_xanmod_stable: remove --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 7 ------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 4 ++-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 34bf83b9dc46..8e1726693b66 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,12 +8,6 @@ let variant = "lts"; }; - currentVariant = { - version = "5.19.13"; - hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE="; - variant = "current"; - }; - nextVariant = { version = "6.0.0"; hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; @@ -61,6 +55,5 @@ let in { lts = xanmodKernelFor ltsVariant; - current = xanmodKernelFor currentVariant; next = xanmodKernelFor nextVariant; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 81337dfb5784..5e27e59594bd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,6 +836,8 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; + linuxPackages_xanmod_stable = throw "linuxPackages_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1c581e0ca10..b04e0245fd24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25144,8 +25144,6 @@ with pkgs; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linux_xanmod = linuxKernel.kernels.linux_xanmod; - linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable; - linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5faf6d0172a2..1cf7b5b02b99 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -232,7 +232,7 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_stable = xanmodKernels.current; + linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_latest = xanmodKernels.next; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -581,7 +581,7 @@ in { linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); - linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); + linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; From ebc901cc8eee5252d9a55dd8dcb2c4ad29d09bd9 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:46:51 +0000 Subject: [PATCH 3/6] linux_xanmod: 5.15.70 -> 5.15.75 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8e1726693b66..b3ed0b165778 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.70"; - hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs="; + version = "5.15.75"; + hash = "sha256-tgm5nmguEfRFq3OhmZgRgFLIW7E798Rv1basxnfdqLI="; variant = "lts"; }; From ec9b92c9f12f164af6edbd6cdadb1fa6822da637 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:57:16 +0000 Subject: [PATCH 4/6] linux_xanmod_latest: 6.0.0 -> 6.0.6 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 10 +++++----- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b3ed0b165778..d4c31e555f42 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -8,10 +8,10 @@ let variant = "lts"; }; - nextVariant = { - version = "6.0.0"; - hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU="; - variant = "next"; + mainVariant = { + version = "6.0.6"; + hash = "sha256-JMfAtiPDgoVF+ypeFXev06PL39ZM2H7m07IxpasjAoM="; + variant = "main"; }; xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { @@ -55,5 +55,5 @@ let in { lts = xanmodKernelFor ltsVariant; - next = xanmodKernelFor nextVariant; + main = xanmodKernelFor mainVariant; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 1cf7b5b02b99..2a075155e43f 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -233,7 +233,7 @@ in { linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; - linux_xanmod_latest = xanmodKernels.next; + linux_xanmod_latest = xanmodKernels.main; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; From 0b7786987ae955362ec83a3dc017f4eda9afa7b6 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 1 Nov 2022 05:49:18 +0000 Subject: [PATCH 5/6] linux_xanmod: add additional kconfig options --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d4c31e555f42..2ac516175f02 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -33,6 +33,10 @@ let TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; + # Google's Multigenerational LRU framework + LRU_GEN = yes; + LRU_GEN_ENABLED = yes; + # FQ-PIE Packet Scheduling NET_SCH_DEFAULT = yes; DEFAULT_FQ_PIE = yes; @@ -43,6 +47,11 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; + + # Preemptive Full Tickless Kernel at 500Hz + HZ = freeform "500"; + HZ_500 = yes; + HZ_1000 = no; }; extraMeta = { From 83d02e230fb0bc2a9695a2beae63bd8d486d888e Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 1 Nov 2022 10:10:28 +0000 Subject: [PATCH 6/6] linux_xanmod_stable: point to latest --- pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5e27e59594bd..81337dfb5784 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,8 +836,6 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; - linuxPackages_xanmod_stable = throw "linuxPackages_xanmod_stable was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b04e0245fd24..e1c581e0ca10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25144,6 +25144,8 @@ with pkgs; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linux_xanmod = linuxKernel.kernels.linux_xanmod; + linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable; + linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2a075155e43f..9309e38c4173 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -232,7 +232,7 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; + linux_xanmod_stable = xanmodKernels.main; linux_xanmod_latest = xanmodKernels.main; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -581,7 +581,7 @@ in { linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); - linux_xanmod_stable = throw "linux_xanmod_stable was removed because it has reached its end of life upstream"; + linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";