Commit 9d54bd6a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/iopoll: fix unexpected returns 



We may propagate a positive return value of io_run_task_work() out of
io_iopoll_check(), which breaks our tests. io_run_task_work() doesn't
return anything useful for us, ignore the return value.

Fixes: c0e0d6ba ("io_uring: add IORING_SETUP_DEFER_TASKRUN")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarDylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/c442bb87f79cea10b3f857cbd4b9a4f0a0493fa3.1662652536.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6567506b

io_uring/io_uring.c

+1 −4
Original line number Diff line number Diff line
@@ -1435,12 +1435,9 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, long min) 
				u32 tail = ctx->cached_cq_tail;



				mutex_unlock(&ctx->uring_lock);

				ret = io_run_task_work();

				io_run_task_work();

				mutex_lock(&ctx->uring_lock);



				if (ret < 0)

					break;



				/* some requests don't go through iopoll_list */

				if (tail != ctx->cached_cq_tail ||

				    wq_list_empty(&ctx->iopoll_list))