Skip to content

Commit 8bb0ab3

Browse files
Tong Tiangenpalmer-dabbelt
authored andcommitted
riscv/vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
riscv architectures 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: Tong Tiangen <[email protected]> Reviewed-by: Kefeng Wang <[email protected]> Fixes: 76d2a04 ("RISC-V: Init and Halt Code") Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 78a743c commit 8bb0ab3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/riscv/kernel/vdso.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
7777

7878
vdso_len = (vdso_pages + VVAR_NR_PAGES) << PAGE_SHIFT;
7979

80-
mmap_write_lock(mm);
80+
if (mmap_write_lock_killable(mm))
81+
return -EINTR;
82+
8183
vdso_base = get_unmapped_area(NULL, 0, vdso_len, 0, 0);
8284
if (IS_ERR_VALUE(vdso_base)) {
8385
ret = vdso_base;

0 commit comments

Comments
 (0)