diff options
| author | Michal Hocko <mhocko@suse.com> | 2016-05-23 16:26:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 17:04:14 -0700 |
| commit | 17b0573d77fbd547cbf1d711b90d269bdcc1efd3 (patch) | |
| tree | eb332e479b74f5379078079f1f47b7ac7b319531 /kernel/sys.c | |
| parent | f268dfe905d4682150d4acbb25f59adc04cd9398 (diff) | |
| download | linux-stable-17b0573d77fbd547cbf1d711b90d269bdcc1efd3.tar.gz linux-stable-17b0573d77fbd547cbf1d711b90d269bdcc1efd3.tar.bz2 linux-stable-17b0573d77fbd547cbf1d711b90d269bdcc1efd3.zip | |
prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
PR_SET_THP_DISABLE requires mmap_sem for write. If the waiting task
gets killed by the oom killer it would block oom_reaper from
asynchronous address space reclaim and reduce the chances of timely OOM
resolving. Wait for the lock in the killable mode and return with EINTR
if the task got killed while waiting.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Alex Thorlton <athorlton@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index cf8ba545c7d3..89d5be418157 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2246,7 +2246,8 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, case PR_SET_THP_DISABLE: if (arg3 || arg4 || arg5) return -EINVAL; - down_write(&me->mm->mmap_sem); + if (down_write_killable(&me->mm->mmap_sem)) + return -EINTR; if (arg2) me->mm->def_flags |= VM_NOHUGEPAGE; else |