zfs: add test fix for deadlock

2026-04-24 23:48:22 -04:00
parent 86cf624027
commit a177877ce3
2 changed files with 42 additions and 1 deletions
--- a/modules/zfs.nix
+++ b/modules/zfs.nix
@@ -20,7 +20,14 @@ let
  arcMaxBytes = (totalRamBytes - totalHugepageBytes) * 60 / 100;
 in
 {
-  boot.zfs.package = pkgs.zfs_2_4;
+  # remove inline dbuf_evict_one call so the dedicated eviction thread
+  # handles cache pressure instead of stalling txg_sync on 6.14+.
+  # https://github.com/openzfs/zfs/issues/18426
+  boot.zfs.package = pkgs.zfs_2_4.overrideAttrs (old: {
+    patches = (old.patches or [ ]) ++ [
+      ../patches/zfs/0001-remove-dbuf_evict_one-call.patch
+    ];
+  });
  boot.initrd.kernelModules = [ "zfs" ];

  boot.kernelParams = [