random fixes and patches for io_uring
cover random fixes and patches for io_uring
Patch 1 improves task exit cancellation. The problem is a mind experiment, I haven't seen it anywhere, and should be rare as it involves io_uring polling another io_uring.
Patch 2 fails netpolling with IOPOLL, as it's not supported
The rest is random cleanups.
Pavel Begunkov (6):
io_uring: tighten task exit cancellations
io_uring: don't allow netpolling with SETUP_IOPOLL
io_uring: fix io_match_task must_hold
io_uring: simplify io_uring_cmd return
io_uring: kill REQ_F_CANCEL_SEQ
io_uring: align iowq and task request error handling
include/linux/io_uring_types.h | 3 --- io_uring/io_uring.c | 7 +++++-- io_uring/napi.c | 2 ++ io_uring/timeout.c | 2 +- io_uring/uring_cmd.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-)
Signature · 1 line
2.44.0
PATCH 1/6 io_uring: tighten task exit cancellations
io_uring_cancel_generic() should retry if any state changes like a request is completed, however in case of a task exit it only goes for another loop and avoids schedule() if any tracked (i.e. REQ_F_INFLIGHT) request got completed.
Let's assume we have a non-tracked request executing in iowq and a tracked request linked to it. Let's also assume io_uring_cancel_generic() fails to find and cancel the request, i.e. via io_run_local_work(), which may happen as io-wq has gaps. Next, the request logically completes, io-wq still hold a ref but queues it for completion via tw, which happens in io_uring_try_cancel_requests(). After, right before prepare_to_wait() io-wq puts the request, grabs the linked one and tries executes it, e.g. arms polling. Finally the cancellation loop calls prepare_to_wait(), there are no tw to run, no tracked request was completed, so the tctx_inflight() check passes and the task is put to indefinite sleep.
--- io_uring/io_uring.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
io_uring/io_uring.c +4 -1
@@ -3031,8 +3031,11 @@ __cold void io_uring_cancel_generic(bool cancel_all, struct io_sq_data *sqd)bool loop = false;io_uring_drop_tctx_refs (current); +if (!tctx_inflight (tctx, !cancel_all)) +break ; +/* read completions before cancelations */ - inflight =tctx_inflight (tctx, !cancel_all); + inflight =tctx_inflight (tctx, false);if (!inflight)break ;
Signature · 1 line
2.44.0
PATCH 2/6 io_uring: don't allow netpolling with SETUP_IOPOLL
In reply to Pavel BegunkovIORING_SETUP_IOPOLL rings don't have any netpoll handling, let's fail attempts to register netpolling in this case, there might be people who will mix up IOPOLL and netpoll.
--- io_uring/napi.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/napi.c +2 -0
@@ -222,6 +222,8 @@ int io_register_napi(struct io_ring_ctx *ctx, void __user *arg) };struct io_uring_napi napi; +if (ctx->flags &IORING_SETUP_IOPOLL ) +return -EINVAL ;if (copy_from_user (&napi, arg,sizeof (napi)))return -EFAULT ;if (napi.pad[0 ] || napi.pad[1 ] || napi.pad[2 ] || napi.resv)
Signature · 1 line
2.44.0
PATCH 3/6 io_uring: fix io_match_task must_hold
In reply to Pavel BegunkovThe __must_hold annotation in io_match_task() uses a non existing parameter "req", fix it.
--- io_uring/timeout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/timeout.c +1 -1
@@ -639,7 +639,7 @@ void io_queue_linked_timeout(struct io_kiocb *req)static bool io_match_task (struct io_kiocb *head,struct task_struct *task,bool cancel_all) - __must_hold(&req->ctx->timeout_lock) + __must_hold(&head->ctx->timeout_lock) {struct io_kiocb *req;
Signature · 1 line
2.44.0
PATCH 4/6 io_uring: simplify io_uring_cmd return
In reply to Pavel BegunkovWe don't have to return error code from an op handler back to core io_uring, so once io_uring_cmd() sets the results and handles errors we can juts return IOU_OK and simplify the code.
Note, only valid with e0b23d9953b0c ("io_uring: optimise ltimeout for inline execution"), there was a problem with iopoll before.
--- io_uring/uring_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/uring_cmd.c +1 -1
@@ -265,7 +265,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags)req_set_fail (req);io_req_uring_cleanup (req, issue_flags);io_req_set_res (req, ret,0 ); -return ret <0 ? ret :IOU_OK ; +return IOU_OK ; } int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,
Signature · 1 line
2.44.0
PATCH 5/6 io_uring: kill REQ_F_CANCEL_SEQ
In reply to Pavel BegunkovWe removed the reliance on the flag by the cancellation path and now it's unused.
--- include/linux/io_uring_types.h | 3 --- 1 file changed, 3 deletions(-)
include/linux/io_uring_types.h +0 -3
@@ -461,7 +461,6 @@ enum {REQ_F_SUPPORT_NOWAIT_BIT ,REQ_F_ISREG_BIT ,REQ_F_POLL_NO_LAZY_BIT , -REQ_F_CANCEL_SEQ_BIT ,REQ_F_CAN_POLL_BIT ,REQ_F_BL_EMPTY_BIT , REQ_F_BL_NO_RECYCLE_BIT,
@@ -536,8 +535,6 @@ enum {REQ_F_HASH_LOCKED =IO_REQ_FLAG (REQ_F_HASH_LOCKED_BIT ),/* don't use lazy poll wake for this request */ REQ_F_POLL_NO_LAZY =IO_REQ_FLAG (REQ_F_POLL_NO_LAZY_BIT ), -/* cancel sequence is set and valid */ -REQ_F_CANCEL_SEQ =IO_REQ_FLAG (REQ_F_CANCEL_SEQ_BIT ),/* file is pollable */ REQ_F_CAN_POLL = IO_REQ_FLAG(REQ_F_CAN_POLL_BIT),/* buffer list was empty after selection of buffer */
Signature · 1 line
2.44.0
PATCH 6/6 io_uring: align iowq and task request error handling
In reply to Pavel BegunkovThere is a difference in how io_queue_sqe and io_wq_submit_work treat error codes they get from io_issue_sqe. The first one fails anything unknown but latter only fails when the code is negative.
It doesn't make sense to have this discrepancy, align them to the io_queue_sqe behaviour.
--- io_uring/io_uring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/io_uring.c +1 -1
@@ -1849,7 +1849,7 @@ void io_wq_submit_work(struct io_wq_work *work) }while (1 );/* avoid locking problems by failing it from a clean context */ -if (ret <0 ) +if (ret)io_req_task_queue_fail (req, ret); }
Signature · 1 line
2.44.0
Quoted 9 lines · Pavel Begunkov
Patch 1 improves task exit cancellation. The problem is a mind experiment, I haven't seen it anywhere, and should be rare as it involves
io_uringpolling anotherio_uring.Patch 2 fails netpolling with IOPOLL, as it's not supported
The rest is random cleanups.
[...]
Applied, thanks!
[1/6] io_uring: tighten task exit cancellations
(no commit info)
[2/6] io_uring: don't allow netpolling with SETUP_IOPOLL
(no commit info)
[3/6] io_uring: fix io_match_task must_hold
(no commit info)
[4/6] io_uring: simplify io_uring_cmd return
(no commit info)
[5/6] io_uring: kill REQ_F_CANCEL_SEQ
(no commit info)
[6/6] io_uring: align iowq and task request error handling
(no commit info)
Best regards,
Signature · 1 line
Jens Axboe