Unverified Commit be25759c authored Oct 11, 2023 by openeuler-ci-bot Committed by Gitee Oct 11, 2023

!2313 fixed the repeated setting logic of memcg_swap_qos_enable

Merge Pull Request from: @zhangwei123171

Now when echo 1 > /proc/sys/vm/memcg_swap_qos_enable multiple times, memcg_swap_qos_reset will be called every time.

In a production environment, when memcg swap qos is working normally, operations Engineer may execute sysctl -p for other reasons, destroying the relationship between each container and its corresponding swapfile.

Link:https://gitee.com/openeuler/kernel/pulls/2313

Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parents 2a66dad6 4e6a126f

mm/memcontrol.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -4084,11 +4084,13 @@ static int sysctl_memcg_swap_qos_handler(struct ctl_table *table, int write,
		if (ret)
		return ret;
		if (write) {
		if (sysctl_memcg_swap_qos_stat) {
		if (sysctl_memcg_swap_qos_stat &&
		!static_branch_likely(&memcg_swap_qos_key)) {
		memcg_swap_qos_reset();
		static_branch_enable(&memcg_swap_qos_key);
		enable_swap_slots_cache_max();
		} else {
		} else if (!sysctl_memcg_swap_qos_stat &&
		static_branch_likely(&memcg_swap_qos_key)) {
		static_branch_disable(&memcg_swap_qos_key);
		}
		}