lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 521/717] io_uring: make ctx cancel on exit targeted to actual ctx
    Date
    From: Jens Axboe <axboe@kernel.dk>

    commit 00c18640c2430c4bafaaeede1f9dd6f7ec0e4b25 upstream.

    Before IORING_SETUP_ATTACH_WQ, we could just cancel everything on the
    io-wq when exiting. But that's not the case if they are shared, so
    cancel for the specific ctx instead.

    Cc: stable@vger.kernel.org
    Fixes: 24369c2e3bb0 ("io_uring: add io-wq workqueue sharing")
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/io_uring.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    --- a/fs/io_uring.c
    +++ b/fs/io_uring.c
    @@ -8401,6 +8401,13 @@ static void io_ring_exit_work(struct wor
    io_ring_ctx_free(ctx);
    }

    +static bool io_cancel_ctx_cb(struct io_wq_work *work, void *data)
    +{
    + struct io_kiocb *req = container_of(work, struct io_kiocb, work);
    +
    + return req->ctx == data;
    +}
    +
    static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
    {
    mutex_lock(&ctx->uring_lock);
    @@ -8415,7 +8422,7 @@ static void io_ring_ctx_wait_and_kill(st
    io_poll_remove_all(ctx, NULL);

    if (ctx->io_wq)
    - io_wq_cancel_all(ctx->io_wq);
    + io_wq_cancel_cb(ctx->io_wq, io_cancel_ctx_cb, ctx, true);

    /* if we failed setting up the ctx, we might not have any rings */
    io_iopoll_try_reap_events(ctx);

    \
     
     \ /
      Last update: 2020-12-28 15:47    [W:4.464 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site