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

Commit 827a03d2 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcg: move swapin charge functions above callsites 



Charging cache pages may require swapin in the shmem case.  Save the
forward declaration and just move the swapin functions above the cache
charging functions.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Wanpeng Li <liwp.linux@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7d188958

mm/memcontrol.c

+32 −36
Original line number Original line Diff line number Diff line
@@ -2796,37 +2796,6 @@ int mem_cgroup_newpage_charge(struct page *page, 
					MEM_CGROUP_CHARGE_TYPE_ANON);

					MEM_CGROUP_CHARGE_TYPE_ANON);

}

}





static void

__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,

					enum charge_type ctype);



int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,

				gfp_t gfp_mask)

{

	struct mem_cgroup *memcg = NULL;

	enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;

	int ret;



	if (mem_cgroup_disabled())

		return 0;

	if (PageCompound(page))

		return 0;



	if (unlikely(!mm))

		mm = &init_mm;

	if (!page_is_file_cache(page))

		type = MEM_CGROUP_CHARGE_TYPE_SHMEM;



	if (!PageSwapCache(page))

		ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);

	else { /* page is swapcache/shmem */

		ret = mem_cgroup_try_charge_swapin(mm, page, gfp_mask, &memcg);

		if (!ret)

			__mem_cgroup_commit_charge_swapin(page, memcg, type);

	}

	return ret;

}



/*

/*

 * While swap-in, try_charge -> commit or cancel, the page is locked.

 * While swap-in, try_charge -> commit or cancel, the page is locked.

 * And when try_charge() successfully returns, one refcnt to memcg without

 * And when try_charge() successfully returns, one refcnt to memcg without
@@ -2873,6 +2842,15 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm, 
	return ret;

	return ret;

}

}





void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)

{

	if (mem_cgroup_disabled())

		return;

	if (!memcg)

		return;

	__mem_cgroup_cancel_charge(memcg, 1);

}



static void

static void

__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *memcg,

__mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *memcg,

					enum charge_type ctype)

					enum charge_type ctype)
@@ -2910,13 +2888,31 @@ void mem_cgroup_commit_charge_swapin(struct page *page, 
					  MEM_CGROUP_CHARGE_TYPE_ANON);

					  MEM_CGROUP_CHARGE_TYPE_ANON);

}

}





void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)

int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,

				gfp_t gfp_mask)

{

{

	struct mem_cgroup *memcg = NULL;

	enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;

	int ret;



	if (mem_cgroup_disabled())

	if (mem_cgroup_disabled())

		return;

		return 0;

	if (!memcg)

	if (PageCompound(page))

		return;

		return 0;

	__mem_cgroup_cancel_charge(memcg, 1);



	if (unlikely(!mm))

		mm = &init_mm;

	if (!page_is_file_cache(page))

		type = MEM_CGROUP_CHARGE_TYPE_SHMEM;



	if (!PageSwapCache(page))

		ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);

	else { /* page is swapcache/shmem */

		ret = mem_cgroup_try_charge_swapin(mm, page, gfp_mask, &memcg);

		if (!ret)

			__mem_cgroup_commit_charge_swapin(page, memcg, type);

	}

	return ret;

}

}





static void mem_cgroup_do_uncharge(struct mem_cgroup *memcg,

static void mem_cgroup_do_uncharge(struct mem_cgroup *memcg,