Commit 860b45da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.11-2021-02-05' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:
 "Two small fixes that should go into 5.11:

   - task_work resource drop fix (Pavel)

   - identity COW fix (Xiaoguang)"

* tag 'io_uring-5.11-2021-02-05' of git://git.kernel.dk/linux-block:
  io_uring: drop mm/files between task_work_submit
  io_uring: don't modify identity's files uncess identity is cowed
parents 1e0d27fc aec18a57

fs/io_uring.c

+3 −6
Original line number Diff line number Diff line
@@ -2205,6 +2205,9 @@ static void __io_req_task_submit(struct io_kiocb *req) 
	else

		__io_req_task_cancel(req, -EFAULT);

	mutex_unlock(&ctx->uring_lock);



	if (ctx->flags & IORING_SETUP_SQPOLL)

		io_sq_thread_drop_mm_files();

}



static void io_req_task_submit(struct callback_head *cb)
@@ -8982,12 +8985,6 @@ static void io_uring_cancel_task_requests(struct io_ring_ctx *ctx, 


	if ((ctx->flags & IORING_SETUP_SQPOLL) && ctx->sq_data) {

		atomic_dec(&task->io_uring->in_idle);

		/*

		 * If the files that are going away are the ones in the thread

		 * identity, clear them out.

		 */

		if (task->io_uring->identity->files == files)

			task->io_uring->identity->files = NULL;

		io_sq_thread_unpark(ctx->sq_data);

	}

}