openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

io_uring: synchronise IOPOLL on task_submit fail 

io_req_task_submit() might be called for IOPOLL, do the fail path under
uring_lock to comply with IOPOLL synchronisation based solely on it.

Cc: stable@vger.kernel.org # 5.5+
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-01-04 20:36:35 +00:00 committed by Jens Axboe
parent b1b6b5a30d
commit 81b6d05cca
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/io_uring.c
View File

@ -2126,15 +2126,16 @@ static void io_req_task_cancel(struct callback_head *cb)
static void __io_req_task_submit(struct io_kiocb *req)
{
struct io_ring_ctx *ctx = req->ctx;
bool fail;
if (!__io_sq_thread_acquire_mm(ctx) &&
!__io_sq_thread_acquire_files(ctx)) {
mutex_lock(&ctx->uring_lock);
fail = __io_sq_thread_acquire_mm(ctx) ||
__io_sq_thread_acquire_files(ctx);
mutex_lock(&ctx->uring_lock);
if (!fail)
__io_queue_sqe(req, NULL);
mutex_unlock(&ctx->uring_lock);
} else {
else
__io_req_task_cancel(req, -EFAULT);
}
mutex_unlock(&ctx->uring_lock);
}
static void io_req_task_submit(struct callback_head *cb)