Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a956c5f authored by Mitch Phillips's avatar Mitch Phillips Committed by Gerrit Code Review
Browse files

Merge "[MemInit] Use new MemInit API."

parents b9c6a747 ed9955b6
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@
#include <bionic/malloc.h>
#include <bionic/mte.h>
#include <cutils/fs.h>
#include <cutils/memory.h>
#include <cutils/multiuser.h>
#include <cutils/sockets.h>
#include <private/android_filesystem_config.h>
@@ -638,13 +637,6 @@ static void PreApplicationInit() {

  // Set the jemalloc decay time to 1.
  mallopt(M_DECAY_TIME, 1);

  // Avoid potentially expensive memory mitigations, mostly meant for system
  // processes, in apps. These may cause app compat problems, use more memory,
  // or reduce performance. While it would be nice to have them for apps,
  // we will have to wait until they are proven out, have more efficient
  // hardware, and/or apply them only to new applications.
  process_disable_memory_mitigations();
}

static void SetUpSeccompFilter(uid_t uid, bool is_child_zygote) {
@@ -1811,6 +1803,14 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
      break;
  }
  mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL, heap_tagging_level);

  // Avoid heap zero initialization for applications without MTE. Zero init may
  // cause app compat problems, use more memory, or reduce performance. While it
  // would be nice to have them for apps, we will have to wait until they are
  // proven out, have more efficient hardware, and/or apply them only to new
  // applications.
  mallopt(M_BIONIC_ZERO_INIT, 0);

  // Now that we've used the flag, clear it so that we don't pass unknown flags to the ART runtime.
  runtime_flags &= ~RuntimeFlags::MEMORY_TAG_LEVEL_MASK;