summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorQiang Huang <h.huangqiang@huawei.com>2013-11-12 15:07:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:04 +0900
commitb9921ecdee66984b00c38c00a358ef3f611d2b50 (patch)
treecaf420f152f6c8764f150ad336645deec9acaeb2 /mm
parent9c2606b77d6bffb422928bca66c8dc84d85089be (diff)
downloadop-kernel-dev-b9921ecdee66984b00c38c00a358ef3f611d2b50.zip
op-kernel-dev-b9921ecdee66984b00c38c00a358ef3f611d2b50.tar.gz
mm: add a helper function to check may oom condition
Use helper function to check if we need to deal with oom condition. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c9
-rw-r--r--mm/page_alloc.c2
2 files changed, 2 insertions, 9 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 13b9d0f..3427de98 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2984,21 +2984,14 @@ static int memcg_charge_kmem(struct mem_cgroup *memcg, gfp_t gfp, u64 size)
struct res_counter *fail_res;
struct mem_cgroup *_memcg;
int ret = 0;
- bool may_oom;
ret = res_counter_charge(&memcg->kmem, size, &fail_res);
if (ret)
return ret;
- /*
- * Conditions under which we can wait for the oom_killer. Those are
- * the same conditions tested by the core page allocator
- */
- may_oom = (gfp & __GFP_FS) && !(gfp & __GFP_NORETRY);
-
_memcg = memcg;
ret = __mem_cgroup_try_charge(NULL, gfp, size >> PAGE_SHIFT,
- &_memcg, may_oom);
+ &_memcg, oom_gfp_allowed(gfp));
if (ret == -EINTR) {
/*
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3d1d75a..e0412c0 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2593,7 +2593,7 @@ rebalance:
* running out of options and have to consider going OOM
*/
if (!did_some_progress) {
- if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) {
+ if (oom_gfp_allowed(gfp_mask)) {
if (oom_killer_disabled)
goto nopage;
/* Coredumps can quickly deplete all memory reserves */
OpenPOWER on IntegriCloud