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

!1688 mm/ksm: Remove the ksm_merge_any status 

Merge Pull Request from: @ci-robot 
 
PR sync from: Longlong Xia <xialonglong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HYJNSHBPAKYVT2IBIZOY6SE3CDKNGGQ4/ 
 
https://gitee.com/openeuler/kernel/issues/I7R48G 
 
Link:https://gitee.com/openeuler/kernel/pulls/1688

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 838714f6 c461cbbf

include/linux/memcontrol.h

+0 −4
Original line number Diff line number Diff line
@@ -402,11 +402,7 @@ struct mem_cgroup { 
	KABI_RESERVE(3)

	KABI_RESERVE(4)

#endif

#ifdef CONFIG_KSM

	KABI_USE(5, bool ksm_merge_any)

#else

	KABI_RESERVE(5)

#endif

#if defined(CONFIG_DYNAMIC_HUGETLB) && defined(CONFIG_ARM64)

	KABI_USE(6, struct dhugetlb_pool *hpool)

#else

mm/memcontrol.c

+0 −9
Original line number Diff line number Diff line
@@ -5724,9 +5724,6 @@ static int memcg_set_ksm_for_tasks(struct mem_cgroup *memcg, bool enable) 
	struct css_task_iter it;

	int ret = 0;



	if (enable == READ_ONCE(memcg->ksm_merge_any))

		return 0;



	css_task_iter_start(&memcg->css, CSS_TASK_ITER_PROCS, &it);

	while (!ret && (task = css_task_iter_next(&it))) {

		if (__task_is_dying(task))
@@ -5781,7 +5778,6 @@ static int memory_ksm_show(struct seq_file *m, void *v) 
	}

	css_task_iter_end(&it);



	seq_printf(m, "merge any state: %d\n", READ_ONCE(memcg->ksm_merge_any));

	seq_printf(m, "merge any tasks: %u\n", tasks);

	seq_printf(m, "ksm_rmap_items %lu\n", ksm_rmap_items);

	seq_printf(m, "ksm_merging_pages %lu\n", ksm_merging_pages);
@@ -5808,8 +5804,6 @@ static ssize_t memory_ksm_write(struct kernfs_open_file *of, char *buf, 
	if (err)

		return err;



	WRITE_ONCE(memcg->ksm_merge_any, enable);



	return nbytes;

}

#endif /* CONFIG_KSM */
@@ -6374,9 +6368,6 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) 
		if (parent != root_mem_cgroup)

			memory_cgrp_subsys.broken_hierarchy = true;

	}

#ifdef CONFIG_KSM

	memcg->ksm_merge_any = false;

#endif

	/* The following stuff does not apply to the root */

	if (!parent) {

		root_mem_cgroup = memcg;