Commit c76f0a33 authored Feb 05, 2025 by Chen Ridong

Revert "cgroup: Fix memory leak caused by missing cgroup_bpf_offline"

stable inclusion
from stable-v6.6.64
commit 92031d66015271e8e224d67cbabb925a63dd635b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBA6RL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=92031d66015271e8e224d67cbabb925a63dd635b

--------------------------------

[ Upstream commit feb301c60970bd2a1310a53ce2d6e4375397a51b ]

This reverts commit 04f8ef56.

Only cgroup v2 can be attached by cgroup by BPF programs. Revert this
commit and cgroup_bpf_inherit and cgroup_bpf_offline won't be called in
cgroup v1. The memory leak issue will be fixed with next patch.

Fixes: 04f8ef56 ("cgroup: Fix memory leak caused by missing cgroup_bpf_offline")
Link: https://lore.kernel.org/cgroups/aka2hk5jsel5zomucpwlxsej6iwnfw4qu5jkrmjhyfhesjlfdw@46zxhg5bdnr7/


Signed-off-by: Chen Ridong <chenridong@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>

parent e26aaac5

kernel/cgroup/cgroup.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2298,10 +2298,8 @@ static void cgroup_kill_sb(struct super_block *sb)
		* And don't kill the default root.
		*/
		if (list_empty(&root->cgrp.self.children) && root != &cgrp_dfl_root &&
		!percpu_ref_is_dying(&root->cgrp.self.refcnt)) {
		cgroup_bpf_offline(&root->cgrp);
		!percpu_ref_is_dying(&root->cgrp.self.refcnt))
		percpu_ref_kill(&root->cgrp.self.refcnt);
		}
		cgroup_put(&root->cgrp);
		kernfs_kill_sb(sb);
		}