Commit 013373e8 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

aio: make aio_setup_ring killable

aio_setup_ring waits for mmap_sem in writable mode.  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.  This will also expedite the
return to the userspace and do_exit.
Signed-off-by: default avatarMichal Hocko <>
Acked-by: default avatarJeff Moyer <>
Acked-by: default avatarVlastimil Babka <>
Cc: Benamin LaHaise <>
Cc: Alexander Viro <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 4136c26b
......@@ -496,7 +496,12 @@ static int aio_setup_ring(struct kioctx *ctx)
ctx->mmap_size = nr_pages * PAGE_SIZE;
pr_debug("attempting mmap of %lu bytes\n", ctx->mmap_size);
if (down_write_killable(&mm->mmap_sem)) {
ctx->mmap_size = 0;
return -EINTR;
ctx->mmap_base = do_mmap_pgoff(ctx->aio_ring_file, 0, ctx->mmap_size,
MAP_SHARED, 0, &unused);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment