memcg: revert gfp mask fix

My patch, memcg-fix-gfp_mask-of-callers-of-charge.patch changed gfp_mask
of callers of charge to be GFP_HIGHUSER_MOVABLE for showing what will
happen at memory reclaim.

But in recent discussion, it's NACKed because it sounds ugly.

This patch is for reverting it and add some clean up to gfp_mask of
callers of charge.  No behavior change but need review before generating
HUNK in deep queue.

This patch also adds explanation to meaning of gfp_mask passed to charge
functions in memcontrol.h.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9bf5d7c8ede7..b9cd57b667d6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1248,7 +1248,7 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
         unlock_page_cgroup(pc);
 
         if (mem) {
-                ret = mem_cgroup_try_charge(NULL, GFP_HIGHUSER_MOVABLE, &mem);
+                ret = mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem);
                 css_put(&mem->css);
         }
         *ptr = mem;
@@ -1378,7 +1378,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
                         break;
 
                 progress = try_to_free_mem_cgroup_pages(memcg,
-                                GFP_HIGHUSER_MOVABLE, false);
+                                GFP_KERNEL, false);
                 if (!progress)                  retry_count--;
         }
         return ret;
@@ -1418,7 +1418,7 @@ int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
                         break;
 
                 oldusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);
-                try_to_free_mem_cgroup_pages(memcg, GFP_HIGHUSER_MOVABLE, true);
+                try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL, true);
                 curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);
                 if (curusage >= oldusage)
                         retry_count--;
@@ -1464,7 +1464,7 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *mem,
                 }
                 spin_unlock_irqrestore(&zone->lru_lock, flags);
 
-                ret = mem_cgroup_move_parent(pc, mem, GFP_HIGHUSER_MOVABLE);
+                ret = mem_cgroup_move_parent(pc, mem, GFP_KERNEL);
                 if (ret == -ENOMEM)
                         break;
 
@@ -1550,7 +1550,7 @@ try_to_free:
                         goto out;
                 }
                 progress = try_to_free_mem_cgroup_pages(mem,
-                                                  GFP_HIGHUSER_MOVABLE, false);
+                                                  GFP_KERNEL, false);
                 if (!progress) {
                         nr_retries--;
                         /* maybe some writeback is necessary */