From 07f65598afdafdbba60c41f19c92fe87966e1f9c Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Wed, 30 Jun 2021 15:55:28 -0700 Subject: [PATCH] ANDROID: GKI: Disable kmem cgroup accounting Disable cgroup kernel memory accounting to avoid unnecessary overhead. Bug: 191223209 Signed-off-by: Suren Baghdasaryan Change-Id: I483aa83c707996bf1d363c0dfc56e7816a5d8e2f --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 230fe3b32171..77216f65d4ee 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -60,7 +60,7 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure" +CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure cgroup.memory=nokmem" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index fe73eef03f0f..18c2c6f34b45 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -53,7 +53,7 @@ CONFIG_PARAVIRT=y CONFIG_NR_CPUS=32 CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure" +CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure cgroup.memory=nokmem" CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set