diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-09-09 13:56:27 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-09-09 09:41:02 -0600 |
| commit | 2ae2eb9dde18979b40629dd413b9adbd6c894cdf (patch) | |
| tree | 70c0501505bc053d6206de7ab0e4013002d9e8a0 /fs | |
| parent | 66e70be722886e4f134350212baa13f217e39e42 (diff) | |
| download | lwn-2ae2eb9dde18979b40629dd413b9adbd6c894cdf.tar.gz lwn-2ae2eb9dde18979b40629dd413b9adbd6c894cdf.zip | |
io_uring: fail links of cancelled timeouts
When we cancel a timeout we should mark it with REQ_F_FAIL, so
linked requests are cancelled as well, but not queued for further
execution.
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/fff625b44eeced3a5cae79f60e6acf3fbdf8f990.1631192135.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index b21a423a4de8..ffd91844b2e5 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1482,6 +1482,8 @@ static void io_kill_timeout(struct io_kiocb *req, int status) struct io_timeout_data *io = req->async_data; if (hrtimer_try_to_cancel(&io->timer) != -1) { + if (status) + req_set_fail(req); atomic_set(&req->ctx->cq_timeouts, atomic_read(&req->ctx->cq_timeouts) + 1); list_del_init(&req->timeout.list); |