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

!8143 add kconfig for OLK-5.10 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lu Jialin <lujialin4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PHFLDY3XMMARV5XULJPY6UDQTSBLNMLC/ 
Lu Jialin (3):
  cgroup: add config isolation for cgroup_kill in cgroupv1
  kabi: use CONFIG_KABI_RESERVE to isolate bpf cgroup reserve flags
  memcg: Introduce CONFIG_MEMCG_V1_THRESHOLD_QOS


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I9K8D1 
 
Link:https://gitee.com/openeuler/kernel/pulls/8143

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f9e394a2 69f04ace

arch/arm64/configs/openeuler_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -145,8 +145,10 @@ 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_V1_THRESHOLD_QOS=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_MEMCG_MEMFS_INFO=y

arch/x86/configs/openeuler_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -150,8 +150,10 @@ 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_V1_THRESHOLD_QOS=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_MEMCG_MEMFS_INFO=y

include/linux/bpf-cgroup.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ enum cgroup_bpf_attach_type { 
	CGROUP_INET4_GETSOCKNAME,

	CGROUP_INET6_GETSOCKNAME,

	CGROUP_INET_SOCK_RELEASE,

#ifdef CONFIG_KABI_RESERVE

	CGROUP_ATTACH_TYPE_KABI_RESERVE_1,

	CGROUP_ATTACH_TYPE_KABI_RESERVE_2,

	CGROUP_ATTACH_TYPE_KABI_RESERVE_3,
@@ -57,6 +58,7 @@ enum cgroup_bpf_attach_type { 
	CGROUP_ATTACH_TYPE_KABI_RESERVE_6,

	CGROUP_ATTACH_TYPE_KABI_RESERVE_7,

	CGROUP_ATTACH_TYPE_KABI_RESERVE_8,

#endif

	MAX_CGROUP_BPF_ATTACH_TYPE

};

include/linux/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ struct bpf_prog_offload { 
enum bpf_cgroup_storage_type {

	BPF_CGROUP_STORAGE_SHARED,

	BPF_CGROUP_STORAGE_PERCPU,

#ifdef CONFIG_KABI_RESERVE

	BPF_CGROUP_STORAGE_KABI_RESERVE_1,

	BPF_CGROUP_STORAGE_KABI_RESERVE_2,

	BPF_CGROUP_STORAGE_KABI_RESERVE_3,
@@ -570,6 +571,7 @@ enum bpf_cgroup_storage_type { 
	BPF_CGROUP_STORAGE_KABI_RESERVE_6,

	BPF_CGROUP_STORAGE_KABI_RESERVE_7,

	BPF_CGROUP_STORAGE_KABI_RESERVE_8,

#endif

	__BPF_CGROUP_STORAGE_MAX

};

include/linux/memcontrol.h

+8 −4
Original line number Diff line number Diff line
@@ -390,9 +390,8 @@ struct mem_cgroup { 
#if defined(CONFIG_DYNAMIC_HUGETLB) && defined(CONFIG_X86_64)

	struct dhugetlb_pool *hpool;

#endif

#ifndef __GENKSYMS__

	int high_async_ratio;

	bool high_async_reclaim;

#ifdef CONFIG_MEMCG_V1_THRESHOLD_QOS

	KABI_USE2(1, int high_async_ratio, bool high_async_reclaim)

#else

	KABI_RESERVE(1)

#endif
@@ -1260,8 +1259,10 @@ static bool memcg_event_add(struct mem_cgroup *memcg, 
	if (!mem_cgroup_is_root(memcg))

		return true;



#ifdef CONFIG_MEMCG_V1_THRESHOLD_QOS

	if (event == MEMCG_OOM_KILL && !cgroup_subsys_on_dfl(memory_cgrp_subsys))

		return true;

#endif



	return false;

}
@@ -1282,7 +1283,10 @@ static inline void memcg_memory_event(struct mem_cgroup *memcg, 
			cgroup_file_notify(&memcg->swap_events_file);

		else

			cgroup_file_notify(&memcg->events_file);



#ifndef CONFIG_MEMCG_V1_THRESHOLD_QOS

		if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))

			break;

#endif

		if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS)

			break;

	} while ((memcg = parent_mem_cgroup(memcg)) &&