From f8f4cb2b2665c9bc6aecb143f96c49034df46299 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 17 Sep 2023 14:15:07 +0200 Subject: linux_xanmod: remove explicit pstate flag It's default now when >= 5.17 which all xanmod kernels are --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 4a97d8f6ecf..9a95522df84 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -26,9 +26,6 @@ let }; structuredExtraConfig = with lib.kernel; { - # AMD P-state driver - X86_AMD_PSTATE = lib.mkOverride 60 yes; - # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; DEFAULT_BBR = yes; -- cgit 1.4.1 From 5cd89013b60fb433324d8e0a823ef10a8c45de10 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 17 Sep 2023 14:17:45 +0200 Subject: linux_xanmod: remove explicit FUTEX flags These control the regular futex functionality which always on by default in any sane distro kernel config because almost everything uses futexes. Futex2 (which we actually want) is enabled by default when CONFIG_FUTEX. --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 9a95522df84..a3a603caa4a 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -34,10 +34,6 @@ let NET_SCH_DEFAULT = yes; DEFAULT_FQ_PIE = yes; - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine WINESYNC = module; -- cgit 1.4.1 From 04f543f913aa82d710def9af06572e34b30b1e4b Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 17 Sep 2023 15:29:34 +0200 Subject: linux_xanmod: don't enable FQ_PIE Upstream xanmod doesn't and we don't have it on by default either. --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a3a603caa4a..0372c6ba0da 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -30,10 +30,6 @@ let TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; - # WineSync driver for fast kernel-backed Wine WINESYNC = module; -- cgit 1.4.1 From 1400b6e9ece28ae97362f85188362b942e70dc32 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 17 Sep 2023 15:38:46 +0200 Subject: linux_xanmod: add note about xanmod-specific kconfig flags --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 0372c6ba0da..6b644148897 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,6 +2,9 @@ let # These names are how they are designated in https://xanmod.org. + + # NOTE: When updating these, please also take a look at the changes done to + # kernel config in the xanmod version commit ltsVariant = { version = "6.1.47"; hash = "sha256-yF05EkQ/sAvmoNW2waxNJRGGB0gnL85fFdl6pc6U8Eo="; -- cgit 1.4.1 From 45c01771fb4644601bb21b5da82856500e468a3f Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 17 Sep 2023 15:19:23 +0200 Subject: linux/common-config: enable FSCACHE_STATS Exposes /proc/fs/fscache/stats that shows some handy stats about fs caching. Can be useful for debugging, so why not. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c8ae911c128..951cc3b9f08 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -903,6 +903,8 @@ let CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; + FSCACHE_STATS = yes; + DVB_DYNAMIC_MINORS = option yes; # we use udev EFI_STUB = yes; # EFI bootloader in the bzImage itself -- cgit 1.4.1