memcg, oom: notify on oom killer invocation from the charge path

[android-x86/kernel.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index e79cb59..9518aef 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1666,6 +1666,9 @@ enum oom_status {
 
 static enum oom_status mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
 {
+       enum oom_status ret;
+       bool locked;
+
        if (order > PAGE_ALLOC_COSTLY_ORDER)
                return OOM_SKIPPED;
 
@@ -1698,10 +1701,23 @@ static enum oom_status mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int
                return OOM_ASYNC;
        }
 
+       mem_cgroup_mark_under_oom(memcg);
+
+       locked = mem_cgroup_oom_trylock(memcg);
+
+       if (locked)
+               mem_cgroup_oom_notify(memcg);
+
+       mem_cgroup_unmark_under_oom(memcg);
        if (mem_cgroup_out_of_memory(memcg, mask, order))
-               return OOM_SUCCESS;
+               ret = OOM_SUCCESS;
+       else
+               ret = OOM_FAILED;
 
-       return OOM_FAILED;
+       if (locked)
+               mem_cgroup_oom_unlock(memcg);
+
+       return ret;
 }
 
 /**