summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@parallels.com>2015-06-10 11:14:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-10 16:43:43 -0700
commit7d638093d4b0e9ef15bd78f38f11f126e773cc14 (patch)
tree1b491946b967b573c0394c58032fcc38e8aeca1d /mm
parent85bd839983778fcd0c1c043327b14a046e979b39 (diff)
downloadop-kernel-dev-7d638093d4b0e9ef15bd78f38f11f126e773cc14.zip
op-kernel-dev-7d638093d4b0e9ef15bd78f38f11f126e773cc14.tar.gz
memcg: do not call reclaim if !__GFP_WAIT
When trimming memcg consumption excess (see memory.high), we call try_to_free_mem_cgroup_pages without checking if we are allowed to sleep in the current context, which can result in a deadlock. Fix this. Fixes: 241994ed8649 ("mm: memcontrol: default hierarchy interface for memory") Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 14c2f20..9da23a7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2323,6 +2323,8 @@ done_restock:
css_get_many(&memcg->css, batch);
if (batch > nr_pages)
refill_stock(memcg, batch - nr_pages);
+ if (!(gfp_mask & __GFP_WAIT))
+ goto done;
/*
* If the hierarchy is above the normal consumption range,
* make the charging task trim their excess contribution.
OpenPOWER on IntegriCloud