summaryrefslogtreecommitdiff
path: root/arch/x86/um/vdso
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2016-05-24 02:25:54 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-24 03:04:14 +0300
commit69048176078adda4087a648c9b1812ddd800fad1 (patch)
tree7eba1558fe80c2d1de46f5d2f7cad404dc7da5ee /arch/x86/um/vdso
parent91f4f94ea3f2eabb4cee68149a31e30f84a993dd (diff)
downloadlinux-69048176078adda4087a648c9b1812ddd800fad1.tar.xz
vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
most architectures are relying on mmap_sem for write in their arch_setup_additional_pages. 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: Andy Lutomirski <luto@amacapital.net> [x86 vdso] Acked-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/um/vdso')
-rw-r--r--arch/x86/um/vdso/vma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/um/vdso/vma.c b/arch/x86/um/vdso/vma.c
index 237c6831e095..6be22f991b59 100644
--- a/arch/x86/um/vdso/vma.c
+++ b/arch/x86/um/vdso/vma.c
@@ -61,7 +61,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
if (!vdso_enabled)
return 0;
- down_write(&mm->mmap_sem);
+ if (down_write_killable(&mm->mmap_sem))
+ return -EINTR;
err = install_special_mapping(mm, um_vdso_addr, PAGE_SIZE,
VM_READ|VM_EXEC|