mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

io_uring: don't check PF_EXITING from syscall

Browse source 
io_sq_thread_acquire_mm_files() can find a PF_EXITING task only when
it's called from task_work context. Don't check it in all other cases,
that are when we're in io_uring_enter().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-02-12 18:41:15 +00:00 committed by Jens Axboe
parent 4fccfcbb73
commit dc0eced5d9
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/io_uring.c
View file

@ -1213,8 +1213,6 @@ static int __io_sq_thread_acquire_mm_files(struct io_ring_ctx *ctx,
static inline int io_sq_thread_acquire_mm_files(struct io_ring_ctx *ctx, static inline int io_sq_thread_acquire_mm_files(struct io_ring_ctx *ctx,
struct io_kiocb *req) struct io_kiocb *req)
{ {
if (unlikely(current->flags & PF_EXITING))
return -EFAULT;
if (!(ctx->flags & IORING_SETUP_SQPOLL)) if (!(ctx->flags & IORING_SETUP_SQPOLL))
return 0; return 0;
return __io_sq_thread_acquire_mm_files(ctx, req); return __io_sq_thread_acquire_mm_files(ctx, req);
@ -2338,7 +2336,8 @@ static void __io_req_task_submit(struct io_kiocb *req)
/* ctx stays valid until unlock, even if we drop all ours ctx->refs */ /* ctx stays valid until unlock, even if we drop all ours ctx->refs */
mutex_lock(&ctx->uring_lock); mutex_lock(&ctx->uring_lock);
if (!ctx->sqo_dead && !io_sq_thread_acquire_mm_files(ctx, req)) if (!ctx->sqo_dead && !(current->flags & PF_EXITING) &&
!io_sq_thread_acquire_mm_files(ctx, req))
__io_queue_sqe(req); __io_queue_sqe(req);
else else
__io_req_task_cancel(req, -EFAULT); __io_req_task_cancel(req, -EFAULT);