From dd9d8dc1008c222ec3fc4c7d4b00d0b3c51fb616 Mon Sep 17 00:00:00 2001 From: Edward Liaw Date: Wed, 28 Aug 2024 01:02:38 +0000 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_MEMCG_V1 Commit 1b1e13440c1c ("mm: memcg: introduce memcontrol-v1.c") added the MEMCG_V1 option that, when unset, will no longer build the memory cgroup v1 control knobs. Android optionally uses memcg v1, and leaving it unset broke some of the LTP tests that use these controls. Fixes: 1b1e13440c1c ("mm: memcg: introduce memcontrol-v1.c") Test: atest vts_ltp_test_x86_64:controllers.memcg_regression_64bit Change-Id: I56b3fb6974428fcf02af4845be99540db8c129cd Signed-off-by: Edward Liaw --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index ea0bbf35583c..08e7116a02b2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -27,6 +27,7 @@ CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_CGROUPS=y CONFIG_MEMCG=y +CONFIG_MEMCG_V1=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_UCLAMP_TASK_GROUP=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 390bd98425b4..3ffe4bc37ee3 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -28,6 +28,7 @@ CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_CGROUPS=y CONFIG_MEMCG=y +CONFIG_MEMCG_V1=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_UCLAMP_TASK_GROUP=y