wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd: Add support for cgroups v2 memcg hierarchy am: 759943643f am: 39cde77892 am: 3b00650675 am: 9b467fd0f9 am: b05a63e610 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1972106

Change-Id: I7265fa84c709d19013b24c27107445c136b7b3b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2022-04-19 19:48:46 +00:00 committed by Automerger Merge Worker
parent 4c65da8696 b05a63e610
commit eaaaf890c8
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lmkd.cpp
View File

@ -3171,14 +3171,44 @@ static void destroy_mp_psi(enum vmpressure_level level) {
mpevfd[level] = -1; mpevfd[level] = -1;
} }
enum class MemcgVersion {
kNotFound,
kV1,
kV2,
};
static MemcgVersion __memcg_version() {
std::string cgroupv2_path, memcg_path;
if (!CgroupGetControllerPath("memory", &memcg_path)) {
return MemcgVersion::kNotFound;
}
return CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cgroupv2_path) &&
cgroupv2_path == memcg_path
? MemcgVersion::kV2
: MemcgVersion::kV1;
}
static MemcgVersion memcg_version() {
static MemcgVersion version = __memcg_version();
return version;
}
static bool init_psi_monitors() { static bool init_psi_monitors() {
/* /*
* When PSI is used on low-ram devices or on high-end devices without memfree levels * When PSI is used on low-ram devices or on high-end devices without memfree levels
* use new kill strategy based on zone watermarks, free swap and thrashing stats * use new kill strategy based on zone watermarks, free swap and thrashing stats.
* Also use the new strategy if memcg has not been mounted in the v1 cgroups hiearchy since
* the old strategy relies on memcg attributes that are available only in the v1 cgroups
* hiearchy.
*/ */
bool use_new_strategy = bool use_new_strategy =
GET_LMK_PROPERTY(bool, "use_new_strategy", low_ram_device || !use_minfree_levels); GET_LMK_PROPERTY(bool, "use_new_strategy", low_ram_device || !use_minfree_levels);
if (!use_new_strategy && memcg_version() != MemcgVersion::kV1) {
ALOGE("Old kill strategy can only be used with v1 cgroup hierarchy");
return false;
}
/* In default PSI mode override stall amounts using system properties */ /* In default PSI mode override stall amounts using system properties */
if (use_new_strategy) { if (use_new_strategy) {
/* Do not use low pressure level */ /* Do not use low pressure level */
@ -3203,6 +3233,13 @@ static bool init_psi_monitors() {
} }
static bool init_mp_common(enum vmpressure_level level) { static bool init_mp_common(enum vmpressure_level level) {
// The implementation of this function relies on memcg statistics that are only available in the
// v1 cgroup hierarchy.
if (memcg_version() != MemcgVersion::kV1) {
ALOGE("%s: global monitoring is only available for the v1 cgroup hierarchy", __func__);
return false;
}
int mpfd; int mpfd;
int evfd; int evfd;
int evctlfd; int evctlfd;