Commit 4b11775c authored by Lu Jialin's avatar Lu Jialin
Browse files

cgroup: add config isolation for cgroup_kill in cgroupv1 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9K8D1



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

Introduce CONFIG_CGROUP_V1_KILL to isolate cgroup_kill feature in
cgroupv1.

Signed-off-by: default avatarLu Jialin <lujialin4@huawei.com>
parent f300accf

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y 
CONFIG_NUMA_BALANCING=y

CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_V1_KILL=y

CONFIG_PAGE_COUNTER=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y 
CONFIG_NUMA_BALANCING=y

CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_V1_KILL=y

CONFIG_PAGE_COUNTER=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

init/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,11 @@ config CGROUP_FILES 
	  This supports catching misbehaving processes and

	  return EMFILE instead of ENOMEM for kernel memory limits.



config CGROUP_V1_KILL

	bool "Kill All Tasks In Cgroup"

	default n

	depends on CGROUPS



endif # CGROUPS



menuconfig NAMESPACES

kernel/cgroup/cgroup-v1.c

+2 −0
Original line number Diff line number Diff line
@@ -659,11 +659,13 @@ struct cftype cgroup1_base_files[] = { 
		.write = cgroup_release_agent_write,

		.max_write_len = PATH_MAX - 1,

	},

#ifdef CONFIG_CGROUP_V1_KILL

	{

		.name = "cgroup.kill",

		.flags = CFTYPE_NOT_ON_ROOT,

		.write = cgroup_kill_write,

	},

#endif

	{ }	/* terminate */

};