From 0d054fc5d7775a7b38e33fe243fdabdf4fada8fa Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 22 Jun 2021 10:35:43 -0700 Subject: [PATCH] Revert "ANDROID: make per-cgroup PSI tracking configurable" This reverts commit bd3983c8a85b5e69e0e7596449824d8b419af746. Bug: 178872719 Bug: 191734423 Signed-off-by: Suren Baghdasaryan Change-Id: Iae7997d518693f09fcc0bf8a3ee5caac6145ada5 --- init/Kconfig | 15 --------------- kernel/sched/psi.c | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index fc95d832e0a9..4413af4302ea 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -635,21 +635,6 @@ config PSI_DEFAULT_DISABLED Say N if unsure. -config PSI_PER_CGROUP_ACCT - bool "Enable per-cgroup pressure stall information tracking" - default n - depends on PSI - depends on CGROUPS - help - If set, pressure stall information will be tracked for each - individual cgroup. Otherwise, pressure stall information will - be tracked only at the system level under /proc/pressure/. - - This feature generates overhead that depends on the number of - cgroups in the cgroup v2 hierarchy. - - Say N if unsure. - endmenu # "CPU/Task time and stats accounting" config CPU_ISOLATION diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index ecd0618dcaad..5047c17e39a1 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -750,7 +750,7 @@ static void psi_group_change(struct psi_group *group, int cpu, static struct psi_group *iterate_groups(struct task_struct *task, void **iter) { -#if defined CONFIG_CGROUPS && defined CONFIG_PSI_PER_CGROUP_ACCT +#ifdef CONFIG_CGROUPS struct cgroup *cgroup = NULL; if (!*iter)