lol

Merge pull request #238459 from SuperSamus/vm.max_map_count

authored by

Artturi and committed by
GitHub
920b8334 f5532199

+5 -2
-1
nixos/modules/config/malloc.nix
··· 97 97 }; 98 98 99 99 config = mkIf (cfg.provider != "libc") { 100 - boot.kernel.sysctl."vm.max_map_count" = mkIf (cfg.provider == "graphene-hardened") (mkDefault 1048576); 101 100 environment.etc."ld-nix.so.preload".text = '' 102 101 ${providerLibPath} 103 102 '';
+3
nixos/modules/config/sysctl.nix
··· 72 72 # Disable YAMA by default to allow easy debugging. 73 73 boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0; 74 74 75 + # Improve compatibility with applications that allocate 76 + # a lot of memory, like modern games 77 + boot.kernel.sysctl."vm.max_map_count" = mkDefault 1048576; 75 78 }; 76 79 }
+1 -1
nixos/modules/virtualisation/lxd.nix
··· 177 177 "fs.inotify.max_queued_events" = 1048576; 178 178 "fs.inotify.max_user_instances" = 1048576; 179 179 "fs.inotify.max_user_watches" = 1048576; 180 - "vm.max_map_count" = 262144; 180 + "vm.max_map_count" = 262144; # TODO: Default vm.max_map_count has been increased system-wide 181 181 "kernel.dmesg_restrict" = 1; 182 182 "net.ipv4.neigh.default.gc_thresh3" = 8192; 183 183 "net.ipv6.neigh.default.gc_thresh3" = 8192;
+1
pkgs/applications/networking/browsers/firefox/common.nix
··· 371 371 export MOZILLA_OFFICIAL=1 372 372 '' + lib.optionalString stdenv.hostPlatform.isMusl '' 373 373 # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator 374 + # TODO: Default vm.max_map_count has been increased, retest without this 374 375 export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so 375 376 ''; 376 377