Unverified Commit 920b8334 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #238459 from SuperSamus/vm.max_map_count

parents f5532199 e1a6c85c

nixos/modules/config/malloc.nix

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ in 
  };



  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}

    '';

nixos/modules/config/sysctl.nix

+3 −0
Original line number Diff line number Diff line
@@ -72,5 +72,8 @@ in 
    # 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;

  };

}

nixos/modules/virtualisation/lxd.nix

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ in { 
      "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;

pkgs/applications/networking/browsers/firefox/common.nix

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ buildStdenv.mkDerivation ({ 
    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

  '';