diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2020-12-20 10:45:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-12-20 10:45:02 -0700 |
| commit | 00c18640c2430c4bafaaeede1f9dd6f7ec0e4b25 (patch) | |
| tree | 3f6d2c580df111ebd1cd54b339cb5efdb8336212 /fs/io_uring.c | |
| parent | io_uring: fix 0-iov read buffer select (diff) | |
| download | linux-dev-00c18640c2430c4bafaaeede1f9dd6f7ec0e4b25.tar.xz linux-dev-00c18640c2430c4bafaaeede1f9dd6f7ec0e4b25.zip | |
io_uring: make ctx cancel on exit targeted to actual ctx
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>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index f3690dfdd564..48b9332c2354 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8637,6 +8637,13 @@ static void io_ring_exit_work(struct work_struct *work) 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); @@ -8651,7 +8658,7 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx) io_poll_remove_all(ctx, NULL, 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); |