Commit 0435a2fd authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds

mm: memcg: split swapin charge function into private and public part

When shmem is charged upon swapin, it does not need to check twice whether
the memory controller is enabled.

Also, shmem pages do not have to be checked for everything that regular
anon pages have to be checked for, so let shmem use the internal version
directly and allow future patches to move around checks that are only
required when swapping in anon pages.
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 24467cac
...@@ -2801,18 +2801,14 @@ int mem_cgroup_newpage_charge(struct page *page, ...@@ -2801,18 +2801,14 @@ int mem_cgroup_newpage_charge(struct page *page,
* struct page_cgroup is acquired. This refcnt will be consumed by * struct page_cgroup is acquired. This refcnt will be consumed by
* "commit()" or removed by "cancel()" * "commit()" or removed by "cancel()"
*/ */
int mem_cgroup_try_charge_swapin(struct mm_struct *mm, static int __mem_cgroup_try_charge_swapin(struct mm_struct *mm,
struct page *page, struct page *page,
gfp_t mask, struct mem_cgroup **memcgp) gfp_t mask,
struct mem_cgroup **memcgp)
{ {
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
int ret; int ret;
*memcgp = NULL;
if (mem_cgroup_disabled())
return 0;
if (!do_swap_account) if (!do_swap_account)
goto charge_cur_mm; goto charge_cur_mm;
/* /*
...@@ -2839,6 +2835,15 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm, ...@@ -2839,6 +2835,15 @@ int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
return ret; return ret;
} }
int mem_cgroup_try_charge_swapin(struct mm_struct *mm, struct page *page,
gfp_t gfp_mask, struct mem_cgroup **memcgp)
{
*memcgp = NULL;
if (mem_cgroup_disabled())
return 0;
return __mem_cgroup_try_charge_swapin(mm, page, gfp_mask, memcgp);
}
void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg) void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
{ {
if (mem_cgroup_disabled()) if (mem_cgroup_disabled())
...@@ -2900,7 +2905,8 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, ...@@ -2900,7 +2905,8 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
if (!PageSwapCache(page)) if (!PageSwapCache(page))
ret = mem_cgroup_charge_common(page, mm, gfp_mask, type); ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);
else { /* page is swapcache/shmem */ else { /* page is swapcache/shmem */
ret = mem_cgroup_try_charge_swapin(mm, page, gfp_mask, &memcg); ret = __mem_cgroup_try_charge_swapin(mm, page,
gfp_mask, &memcg);
if (!ret) if (!ret)
__mem_cgroup_commit_charge_swapin(page, memcg, type); __mem_cgroup_commit_charge_swapin(page, memcg, type);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment