io_uring: Fix remove irrelevant req from the task_list

If the process 0 has been initialized io_uring is complete, and
then fork process 1. If process 1 exits and it leads to delete
all reqs from the task_list. If we kill process 0. We will not
send SIGINT signal to the kworker. So we can not remove the req
from the task_list. The io_sq_wq_submit_work() can do that for
us.

Fixes: 1c4404efcf2c ("io_uring: make sure async workqueue is canceled on exit")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 27770af20d240f4b5751e6ca2c1d5839b34e9573..242612fe9b4844b460277d9c20795f4e8ffd3da2 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2272,13 +2272,11 @@ restart:
                                        break;
                                cond_resched();
                        } while (1);
-end_req:
-                       if (!list_empty(&req->task_list)) {
-                               spin_lock_irq(&ctx->task_lock);
-                               list_del_init(&req->task_list);
-                               spin_unlock_irq(&ctx->task_lock);
-                       }
                }
+end_req:
+               spin_lock_irq(&ctx->task_lock);
+               list_del_init(&req->task_list);
+               spin_unlock_irq(&ctx->task_lock);
 
                /* drop submission reference */
                io_put_req(req);
@@ -3722,15 +3720,16 @@ static int io_uring_fasync(int fd, struct file *file, int on)
 static void io_cancel_async_work(struct io_ring_ctx *ctx,
                                 struct files_struct *files)
 {
+       struct io_kiocb *req;
+
        if (list_empty(&ctx->task_list))
                return;
 
        spin_lock_irq(&ctx->task_lock);
-       while (!list_empty(&ctx->task_list)) {
-               struct io_kiocb *req;
 
-               req = list_first_entry(&ctx->task_list, struct io_kiocb, task_list);
-               list_del_init(&req->task_list);
+       list_for_each_entry(req, &ctx->task_list, task_list) {
+               if (files && req->files != files)
+                       continue;
 
                /*
                 * The below executes an smp_mb(), which matches with the
@@ -3740,7 +3739,7 @@ static void io_cancel_async_work(struct io_ring_ctx *ctx,
                 */
                smp_store_mb(req->flags, req->flags | REQ_F_CANCEL); /* B */
 
-               if (req->work_task && (!files || req->files == files))
+               if (req->work_task)
                        send_sig(SIGINT, req->work_task, 1);
        }
        spin_unlock_irq(&ctx->task_lock);