Unverified Commit 5014f0ab authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3843 [OLK-6.6] export cgroup.stat from cgroupv2 to cgroupv1 

Merge Pull Request from: @lujialin2 
 
Dying cgroups always exist in memory/io cgroup subsystems, which will affect the statistical result and kernel behavior. Therefore, export cgroup.stat from v2 to v1, which contains dying cgroup number and sub cgroup number. 
 
Link:https://gitee.com/openeuler/kernel/pulls/3843

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 206e37b7 8f9f9fbe

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ CONFIG_CGROUP_BPF=y 
# CONFIG_CGROUP_DEBUG is not set

CONFIG_SOCK_CGROUP_DATA=y

CONFIG_CGROUP_V1_KILL=y

CONFIG_CGROUP_V1_STAT=y

CONFIG_CGROUP_FILES=y

CONFIG_NAMESPACES=y

CONFIG_UTS_NS=y

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ CONFIG_CGROUP_BPF=y 
# CONFIG_CGROUP_DEBUG is not set

CONFIG_SOCK_CGROUP_DATA=y

CONFIG_CGROUP_V1_KILL=y

CONFIG_CGROUP_V1_STAT=y

CONFIG_CGROUP_FILES=y

CONFIG_NAMESPACES=y

CONFIG_UTS_NS=y

init/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,11 @@ config CGROUP_V1_KILL 
	default n

	depends on CGROUPS



config CGROUP_V1_STAT

	bool "Getting Cgroup Stat in Cgroup V1"

	default n

	depends on CGROUPS



config CGROUP_FILES

	bool "Files Resource Controller for Control Groups"

	select PAGE_COUNTER

kernel/cgroup/cgroup-internal.h

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ int cgroup_task_count(const struct cgroup *cgrp); 


ssize_t cgroup_kill_write(struct kernfs_open_file *of, char *buf, size_t nbytes,

			  loff_t off);

int cgroup_stat_show(struct seq_file *seq, void *v);



/*

 * rstat.c

kernel/cgroup/cgroup-v1.c

+6 −0
Original line number Diff line number Diff line
@@ -666,6 +666,12 @@ struct cftype cgroup1_base_files[] = { 
		.flags = CFTYPE_NOT_ON_ROOT,

		.write = cgroup_kill_write,

	},

#endif

#ifdef CONFIG_CGROUP_V1_STAT

	{

		.name = "cgroup.stat",

		.seq_show = cgroup_stat_show,

	},

#endif

	{ }	/* terminate */

};