pyrox.dev / nixpkgs
lol
fork atom

Use looser 9pfs caching in VM tests/builds

This can give significant speed ups, see
https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.

Eelco Dolstra bbd03e23 87d5e27a

+14 -4
unified split
+2 -2
nixos/modules/virtualisation/qemu-vm.nix
··· 440 440 ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = 441 441 { device = "store"; 442 442 fsType = "9p"; 443 - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; 443 + options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; 444 444 neededForBoot = true; 445 445 }; 446 446 "/tmp/xchg" = 447 447 { device = "xchg"; 448 448 fsType = "9p"; 449 - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; 449 + options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; 450 450 neededForBoot = true; 451 451 }; 452 452 "/tmp/shared" =
+2 -2
pkgs/build-support/vm/default.nix
··· 130 130 131 131 echo "mounting Nix store..." 132 132 mkdir -p /fs${storeDir} 133 - mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose 133 + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose 134 134 135 135 mkdir -p /fs/tmp /fs/run /fs/var 136 136 mount -t tmpfs -o "mode=1777" none /fs/tmp ··· 139 139 140 140 echo "mounting host's temporary directory..." 141 141 mkdir -p /fs/tmp/xchg 142 - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose 142 + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose 143 143 144 144 mkdir -p /fs/proc 145 145 mount -t proc none /fs/proc
+9
pkgs/os-specific/linux/kernel/patches.nix
··· 175 175 }; 176 176 }; 177 177 178 + p9_caching_4_4 = rec 179 + { name = "9p-caching.patch"; 180 + patch = fetchpatch { 181 + inherit name; 182 + url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; 183 + sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; 184 + }; 185 + }; 186 + 178 187 }
+1
pkgs/top-level/all-packages.nix
··· 11069 11069 kernelPatches = 11070 11070 [ kernelPatches.bridge_stp_helper 11071 11071 kernelPatches.cpu-cgroup-v2."4.4" 11072 + kernelPatches.p9_caching_4_4 11072 11073 ] 11073 11074 ++ lib.optionals ((platform.kernelArch or null) == "mips") 11074 11075 [ kernelPatches.mips_fpureg_emu