fix deferred ->files cancel
cover fix deferred ->files cancel
io_uring_cancel_files() may hangs because it can't find requests with
->files in defer_list.
Pavel Begunkov (2):
io_uring: fix cancel of deferred reqs with ->files
io_uring: fix linked deferred ->files cancellation
fs/io_uring.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
Signature · 1 line
2.24.0
PATCH 1/2 io_uring: fix cancel of deferred reqs with ->files
While trying to cancel requests with ->files, it also should look for in ->defer_list, otherwise it might end up hanging a thread.
Cancel all requests in ->defer_list up to the last request there with matching ->files, that's needed to follow drain ordering semantics.
--- fs/io_uring.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
fs/io_uring.c +26 -0
@@ -8092,12 +8092,38 @@ static void io_attempt_cancel(struct io_ring_ctx *ctx, struct io_kiocb *req)io_timeout_remove_link (ctx, req); } +static void io_cancel_defer_files (struct io_ring_ctx *ctx, +struct files_struct *files) +{ +struct io_defer_entry *de =NULL ; +LIST_HEAD (list); + +spin_lock_irq (&ctx->completion_lock); +list_for_each_entry_reverse (de, &ctx->defer_list, list) +if ((de->req->flags &REQ_F_WORK_INITIALIZED ) + && de->req->work.files == files) { +list_cut_position (&list, &ctx->defer_list, &de->list); +break ; + } +spin_unlock_irq (&ctx->completion_lock); + +while (!list_empty (&list)) { + de = list_first_entry(&list, struct io_defer_entry, list); +list_del_init (&de->list); +req_set_fail_links (de->req); +io_put_req (de->req); +io_req_complete (de->req, -ECANCELED ); +kfree (de); + } +} +static void io_uring_cancel_files (struct io_ring_ctx *ctx,struct files_struct *files) {if (list_empty_careful (&ctx->inflight_list))return ; +io_cancel_defer_files (ctx, files);/* cancel all at once, should be faster than doing it one by one*/ io_wq_cancel_cb (ctx->io_wq, io_wq_files_match, files, true);
Signature · 1 line
2.24.0
PATCH 2/2 io_uring: fix linked deferred ->files cancellation
In reply to Pavel BegunkovWhile looking for ->files in ->defer_list, consider that requests there may actually be links.
--- fs/io_uring.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
fs/io_uring.c +21 -2
@@ -8018,6 +8018,26 @@ static bool io_match_link(struct io_kiocb *preq, struct io_kiocb *req)return false; } +static inline bool io_match_files (struct io_kiocb *req, +struct files_struct *file) +{ +return (req->flags &REQ_F_WORK_INITIALIZED ) && req->work.files == file; +} + +static bool io_match_link_files (struct io_kiocb *req, +struct files_struct *files) +{ +struct io_kiocb *link; + +if (io_match_files (req, files)) +return true; +if (req->flags &REQ_F_LINK_HEAD ) +list_for_each_entry (link, &req->link_list, link_list) +if (io_match_files (link, files)) +return true; +return false; +} +/* * We're looking to cancel 'req' because it's holding on to our files, but * 'req' could be a link to another request. See if it is, and cancel that
@@ -8100,8 +8120,7 @@ static void io_cancel_defer_files(struct io_ring_ctx *ctx,spin_lock_irq (&ctx->completion_lock);list_for_each_entry_reverse (de, &ctx->defer_list, list) -if ((de->req->flags &REQ_F_WORK_INITIALIZED ) - && de->req->work.files == files) { +if (io_match_link_files (de->req, files)) {list_cut_position (&list, &ctx->defer_list, &de->list);break ; }
Signature · 1 line
2.24.0
Quoted 2 lines · Pavel Begunkov
io_uring_cancel_files()may hangs because it can't find requests with
->files indefer_list.
Thanks! Applied with a few style changes.
Signature · 1 line
Jens Axboe