Revision 7d638093d4b0e9ef15bd78f38f11f126e773cc14 authored by Vladimir Davydov on 10 June 2015, 18:14:46 UTC, committed by Linus Torvalds on 10 June 2015, 23:43:43 UTC
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>
1 parent 85bd839
| File | Mode | Size |
|---|---|---|
| Documentation | ||
| arch | ||
| bench | ||
| config | ||
| python | ||
| scripts | ||
| tests | ||
| ui | ||
| util | ||
| .gitignore | -rw-r--r-- | 336 bytes |
| Build | -rw-r--r-- | 1.1 KB |
| CREDITS | -rw-r--r-- | 603 bytes |
| MANIFEST | -rw-r--r-- | 1.8 KB |
| Makefile | -rw-r--r-- | 1.9 KB |
| Makefile.perf | -rw-r--r-- | 17.3 KB |
| builtin-annotate.c | -rw-r--r-- | 9.9 KB |
| builtin-bench.c | -rw-r--r-- | 6.7 KB |
| builtin-buildid-cache.c | -rw-r--r-- | 10.5 KB |
| builtin-buildid-list.c | -rw-r--r-- | 2.9 KB |
| builtin-data.c | -rw-r--r-- | 2.6 KB |
| builtin-diff.c | -rw-r--r-- | 29.0 KB |
| builtin-evlist.c | -rw-r--r-- | 1.8 KB |
| builtin-help.c | -rw-r--r-- | 12.1 KB |
| builtin-inject.c | -rw-r--r-- | 12.1 KB |
| builtin-kmem.c | -rw-r--r-- | 27.8 KB |
| builtin-kvm.c | -rw-r--r-- | 36.6 KB |
| builtin-list.c | -rw-r--r-- | 2.1 KB |
| builtin-lock.c | -rw-r--r-- | 23.1 KB |
| builtin-mem.c | -rw-r--r-- | 7.2 KB |
| builtin-probe.c | -rw-r--r-- | 13.4 KB |
| builtin-record.c | -rw-r--r-- | 26.0 KB |
| builtin-report.c | -rw-r--r-- | 25.0 KB |
| builtin-sched.c | -rw-r--r-- | 45.1 KB |
| builtin-script.c | -rw-r--r-- | 44.0 KB |
| builtin-stat.c | -rw-r--r-- | 49.7 KB |
| builtin-timechart.c | -rw-r--r-- | 46.8 KB |
| builtin-top.c | -rw-r--r-- | 32.5 KB |
| builtin-trace.c | -rw-r--r-- | 74.4 KB |
| builtin.h | -rw-r--r-- | 2.2 KB |
| command-list.txt | -rw-r--r-- | 911 bytes |
| design.txt | -rw-r--r-- | 17.3 KB |
| perf-archive.sh | -rw-r--r-- | 1.3 KB |
| perf-completion.sh | -rw-r--r-- | 5.3 KB |
| perf-read-vdso.c | -rw-r--r-- | 510 bytes |
| perf-sys.h | -rw-r--r-- | 5.0 KB |
| perf-with-kcore.sh | -rw-r--r-- | 6.7 KB |
| perf.c | -rw-r--r-- | 14.5 KB |
| perf.h | -rw-r--r-- | 1.5 KB |
Computing file changes ...
