Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6acc8b02 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

memcg: clean up swap accounting initialization code 



Memcg swap accounting is currently enabled by enable_swap_cgroup when
the root cgroup is created.  mem_cgroup_init acts as a memcg subsystem
initializer which sounds like a much better place for enable_swap_cgroup
as well.  We already register memsw files from there so it makes a lot
of sense to merge those two into a single enable_swap_cgroup function.

This patch doesn't introduce any semantic changes.

Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Zhouping Liu <zliu@redhat.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: CAI Qian <caiqian@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2d11085e

mm/memcontrol.c

+12 −18
Original line number Diff line number Diff line
@@ -6046,18 +6046,6 @@ struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg) 
}

EXPORT_SYMBOL(parent_mem_cgroup);



#ifdef CONFIG_MEMCG_SWAP

static void __init enable_swap_cgroup(void)

{

	if (!mem_cgroup_disabled() && really_do_swap_account)

		do_swap_account = 1;

}

#else

static void __init enable_swap_cgroup(void)

{

}

#endif



static int mem_cgroup_soft_limit_tree_init(void)

{

	struct mem_cgroup_tree_per_node *rtpn;
@@ -6111,7 +6099,6 @@ mem_cgroup_css_alloc(struct cgroup *cont) 
	/* root ? */

	if (cont->parent == NULL) {

		int cpu;

		enable_swap_cgroup();

		parent = NULL;

		if (mem_cgroup_soft_limit_tree_init())

			goto free_out;
@@ -6800,12 +6787,19 @@ __setup("swapaccount=", enable_swap_account); 


static void __init memsw_file_init(void)

{

	if (really_do_swap_account)

		WARN_ON(cgroup_add_cftypes(&mem_cgroup_subsys,

					memsw_cgroup_files));

	WARN_ON(cgroup_add_cftypes(&mem_cgroup_subsys, memsw_cgroup_files));

}



static void __init enable_swap_cgroup(void)

{

	if (!mem_cgroup_disabled() && really_do_swap_account) {

		do_swap_account = 1;

		memsw_file_init();

	}

}



#else

static void __init memsw_file_init(void)

static void __init enable_swap_cgroup(void)

{

}

#endif
@@ -6819,7 +6813,7 @@ static void __init memsw_file_init(void) 
static int __init mem_cgroup_init(void)

{

	hotcpu_notifier(memcg_cpu_hotplug_callback, 0);

	memsw_file_init();

	enable_swap_cgroup();

	return 0;

}

subsys_initcall(mem_cgroup_init);