[Devel] [PATCH vz10] cgroup: allow cpuacct to be enabled in v2 hierarchy

[Aleksei Oladko]

In cgroup v2 the cpuacct controller cannot be explicitly enabled or
disabled by user space. This patch allows cpuacct to be managed through
cgroup.subtree_control.

https://virtuozzo.atlassian.net/browse/VSTOR-100092

Signed-off-by: Aleksei Oladko <aleksey.oladko at virtuozzo.com>
---
 kernel/sched/core.c    | 1 +
 kernel/sched/cpuacct.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 0480e68d6812..b7248ee2119b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -10536,6 +10536,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
 	.dfl_cftypes	= cpu_files,
 	.early_init	= true,
 	.threaded	= true,
+	.depends_on	= 1 << cpuacct_cgrp_id,
 };
 
 #endif	/* CONFIG_CGROUP_SCHED */
diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
index f1fe372de094..98d5ee89a3af 100644
--- a/kernel/sched/cpuacct.c
+++ b/kernel/sched/cpuacct.c
@@ -366,7 +366,6 @@ struct cgroup_subsys cpuacct_cgrp_subsys = {
 	.dfl_cftypes	= files, /* Same files for v1 and v2 */
 	.early_init	= true,
 
-	.implicit_on_dfl = true,
 	.threaded       = true,
 };
 
-- 
2.43.0