Commit decc704f authored by Jinjiang Tu's avatar Jinjiang Tu
Browse files

mm/memcontrol: enable KSM for tasks moving to new memcg 

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



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

When a task moves to a new memcg, enable KSM for the task if the
auto_ksm_enabled of the memcg is 1.

Signed-off-by: default avatarJinjiang Tu <tujinjiang@huawei.com>
parent 87a2560d

mm/memcontrol.c

+43 −0
Original line number Original line Diff line number Diff line
@@ -5886,6 +5886,39 @@ static ssize_t memory_ksm_write(struct kernfs_open_file *of, char *buf, 




	return nbytes;

	return nbytes;

}

}



static void memcg_attach_ksm(struct cgroup_taskset *tset)

{

	struct cgroup_subsys_state *css;

	struct mem_cgroup *memcg;

	struct task_struct *task;



	cgroup_taskset_first(tset, &css);

	memcg = mem_cgroup_from_css(css);

	if (!READ_ONCE(memcg->auto_ksm_enabled))

		return;



	cgroup_taskset_for_each(task, css, tset) {

		struct mm_struct *mm = get_task_mm(task);



		if (!mm)

			continue;



		if (mmap_write_lock_killable(mm)) {

			mmput(mm);

			continue;

		}



		ksm_enable_merge_any(mm);



		mmap_write_unlock(mm);

		mmput(mm);

	}

}

#else

static inline void memcg_attach_ksm(struct cgroup_taskset *tset)

{

}

#endif /* CONFIG_KSM */

#endif /* CONFIG_KSM */





#ifdef CONFIG_CGROUP_V1_WRITEBACK

#ifdef CONFIG_CGROUP_V1_WRITEBACK
@@ -7373,6 +7406,12 @@ static void mem_cgroup_move_charge(void) 
	atomic_dec(&mc.from->moving_account);

	atomic_dec(&mc.from->moving_account);

}

}





static void mem_cgroup_attach(struct cgroup_taskset *tset)

{

	if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))

		memcg_attach_ksm(tset);

}



static void mem_cgroup_move_task(void)

static void mem_cgroup_move_task(void)

{

{

	if (mc.to) {

	if (mc.to) {
@@ -7388,6 +7427,9 @@ static int mem_cgroup_can_attach(struct cgroup_taskset *tset) 
static void mem_cgroup_cancel_attach(struct cgroup_taskset *tset)

static void mem_cgroup_cancel_attach(struct cgroup_taskset *tset)

{

{

}

}

static void mem_cgroup_attach(struct cgroup_taskset *tset)

{

}

static void mem_cgroup_move_task(void)

static void mem_cgroup_move_task(void)

{

{

}

}
@@ -7651,6 +7693,7 @@ struct cgroup_subsys memory_cgrp_subsys = { 
	.css_rstat_flush = mem_cgroup_css_rstat_flush,

	.css_rstat_flush = mem_cgroup_css_rstat_flush,

	.can_attach = mem_cgroup_can_attach,

	.can_attach = mem_cgroup_can_attach,

	.cancel_attach = mem_cgroup_cancel_attach,

	.cancel_attach = mem_cgroup_cancel_attach,

	.attach = mem_cgroup_attach,

	.post_attach = mem_cgroup_move_task,

	.post_attach = mem_cgroup_move_task,

	.bind = mem_cgroup_bind,

	.bind = mem_cgroup_bind,

	.dfl_cftypes = memory_files,

	.dfl_cftypes = memory_files,