diff options
| author | Vladimir Davydov <vdavydov@parallels.com> | 2015-06-10 20:14:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-11 01:43:43 +0200 |
| commit | 7d638093d4b0e9ef15bd78f38f11f126e773cc14 (patch) | |
| tree | 1b491946b967b573c0394c58032fcc38e8aeca1d /mm/memcontrol.c | |
| parent | mm/memory_hotplug.c: set zone->wait_table to null after freeing it (diff) | |
| download | linux-7d638093d4b0e9ef15bd78f38f11f126e773cc14.tar.xz linux-7d638093d4b0e9ef15bd78f38f11f126e773cc14.zip | |
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/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 14c2f2017e37..9da23a7ec4c0 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. |