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

[Konstantin Khorenko]

The commit is pushed to "branch-rh10-6.12.0-55.13.1.2.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-55.13.1.2.21.vz10
------>
commit 02423123f402a85faee38f6fa186741ebf412f35
Author: Aleksei Oladko <aleksey.oladko at virtuozzo.com>
Date:   Wed Nov 26 20:04:38 2025 +0000

    cgroup: allow cpuacct to be enabled in v2 hierarchy
    
    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>
    
    Feature: sched: emulate virtual cpus for Containers
---
 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 6c1abc40b5ef5..28fb5d0ecd898 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -10537,6 +10537,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 f1fe372de0941..98d5ee89a3afc 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,
 };