io_uring: wait for cancelations on final ring put

We still offload the cancelation to a workqueue, as not to introduce
dependencies between the exiting task waiting on cleanup, and that
task needing to run task_work to complete the process.

This means that once the final ring put is done, any request that was
inflight and needed cancelation will be done as well. Notably requests
that hold references to files - once the ring fd close is done, we will
have dropped any of those references too.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h
index fc1e0e65d474fd40d4930b441953a20d8565cf8c..a6b5f041423f20868498ce87ad057213e2fc5a11 100644 (file)
--- a/include/linux/io_uring_types.h
+++ b/include/linux/io_uring_types.h
@@ -420,6 +420,8 @@ struct io_ring_ctx {
        unsigned short                  n_sqe_pages;
        struct page                     **ring_pages;
        struct page                     **sqe_pages;
+
+       struct completion               *exit_comp;
 };
 
 struct io_tw_state {

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 5a469917013619a654f783c98fd5e6e11dbcaeab..3000a865baec54417e77f9618f029c9771dc5a91 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2730,6 +2730,7 @@ static __cold void io_ring_exit_work(struct work_struct *work)
        struct io_ring_ctx *ctx = container_of(work, struct io_ring_ctx, exit_work);
        unsigned long timeout = jiffies + HZ * 60 * 5;
        unsigned long interval = HZ / 20;
+       struct completion *exit_comp;
        struct io_tctx_exit exit;
        struct io_tctx_node *node;
        int ret;
@@ -2788,6 +2789,10 @@ static __cold void io_ring_exit_work(struct work_struct *work)
 
        io_kworker_tw_end();
 
+       exit_comp = READ_ONCE(ctx->exit_comp);
+       if (exit_comp)
+               complete(exit_comp);
+
        init_completion(&exit.completion);
        init_task_work(&exit.task_work, io_tctx_exit_cb);
        exit.ctx = ctx;
@@ -2851,9 +2856,20 @@ static __cold void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
 static int io_uring_release(struct inode *inode, struct file *file)
 {
        struct io_ring_ctx *ctx = file->private_data;
+       DECLARE_COMPLETION_ONSTACK(exit_comp);
 
        file->private_data = NULL;
+       WRITE_ONCE(ctx->exit_comp, &exit_comp);
        io_ring_ctx_wait_and_kill(ctx);
+
+       /*
+        * Wait for cancel to run before exiting task
+        */
+       do {
+               if (current->io_uring)
+                       io_fallback_tw(current->io_uring, false);
+       } while (wait_for_completion_interruptible(&exit_comp));
+
        return 0;
 }