Merge pull request #238459 from SuperSamus/vm.max_map_count

Artturi 920b8334 f5532199

Changed files
+5 -2
nixos
modules
config
virtualisation
pkgs
applications
networking
browsers
firefox
-1
nixos/modules/config/malloc.nix
···
};
config = mkIf (cfg.provider != "libc") {
-
boot.kernel.sysctl."vm.max_map_count" = mkIf (cfg.provider == "graphene-hardened") (mkDefault 1048576);
environment.etc."ld-nix.so.preload".text = ''
${providerLibPath}
'';
+3
nixos/modules/config/sysctl.nix
···
# Disable YAMA by default to allow easy debugging.
boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
+
# Improve compatibility with applications that allocate
+
# a lot of memory, like modern games
+
boot.kernel.sysctl."vm.max_map_count" = mkDefault 1048576;
};
}
+1 -1
nixos/modules/virtualisation/lxd.nix
···
"fs.inotify.max_queued_events" = 1048576;
"fs.inotify.max_user_instances" = 1048576;
"fs.inotify.max_user_watches" = 1048576;
-
"vm.max_map_count" = 262144;
+
"vm.max_map_count" = 262144; # TODO: Default vm.max_map_count has been increased system-wide
"kernel.dmesg_restrict" = 1;
"net.ipv4.neigh.default.gc_thresh3" = 8192;
"net.ipv6.neigh.default.gc_thresh3" = 8192;
+1
pkgs/applications/networking/browsers/firefox/common.nix
···
export MOZILLA_OFFICIAL=1
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
# linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
+
# TODO: Default vm.max_map_count has been increased, retest without this
export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
'';