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

Commit 5fa8af2b authored by Minchan Kim's avatar Minchan Kim
Browse files

Add system_server to system group only if per_app_memcg is true 

P18 or other high-performance devices shouldn't use per-memcg so
it was disabled on those devices[1]. However, we didn't turn off
for system_server memcg so those devices still have two seperate
LRU groups which would have less efficient memory reclaim.

Therefore, this patch makes memcg use for system_server only if
per_app_memcg is enabled.

[1] https://googleplex-android-review.git.corp.google.com/c/platform/system/core/+/4178592



Bug: 110858093
Test: confirm via cat /dev/memcg/system/tasks is none
Change-Id: Ic0e3157bf8ff5de69767797b5508946ca3efeb68
Signed-off-by: default avatarMinchan Kim <minchan@google.com>
parent f83e814b

core/jni/com_android_internal_os_Zygote.cpp

+11 −5
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <unistd.h>



#include "android-base/logging.h"

#include <android-base/properties.h>

#include <android-base/file.h>

#include <android-base/stringprintf.h>

#include <cutils/fs.h>
@@ -70,6 +71,7 @@ namespace { 
using android::String8;

using android::base::StringPrintf;

using android::base::WriteStringToFile;

using android::base::GetBoolProperty;



#define CREATE_ERROR(...) StringPrintf("%s:%d: ", __FILE__, __LINE__). \

                              append(StringPrintf(__VA_ARGS__))
@@ -889,6 +891,9 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer( 
          RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!");

      }



      bool low_ram_device = GetBoolProperty("ro.config.low_ram", false);

      bool per_app_memcg = GetBoolProperty("ro.config.per_app_memcg", low_ram_device);

      if (per_app_memcg) {

          // Assign system_server to the correct memory cgroup.

          // Not all devices mount /dev/memcg so check for the file first

          // to avoid unnecessarily printing errors and denials in the logs.
@@ -897,6 +902,7 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer( 
              ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid);

          }

      }

  }

  return pid;

}