Commit 6224590d authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: add flag to not fail link after timeout 



For some reason non-off IORING_OP_TIMEOUT always fails links, it's
pretty inconvenient and unnecessary limits chaining after it to hard
linking, which is far from ideal, e.g. doesn't pair well with timeout
cancellation. Add a flag forcing it to not fail links on -ETIME.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/17c7ec0fb7a6113cc6be8cdaedcada0ba836ac0e.1633199723.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 30d51dd4

fs/io_uring.c

+6 −2
Original line number Diff line number Diff line
@@ -5857,6 +5857,9 @@ static int io_poll_update(struct io_kiocb *req, unsigned int issue_flags) 


static void io_req_task_timeout(struct io_kiocb *req, bool *locked)

{

	struct io_timeout_data *data = req->async_data;



	if (!(data->flags & IORING_TIMEOUT_ETIME_SUCCESS))

		req_set_fail(req);

	io_req_complete_post(req, -ETIME, 0);

}
@@ -6063,7 +6066,8 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
	if (off && is_timeout_link)

		return -EINVAL;

	flags = READ_ONCE(sqe->timeout_flags);

	if (flags & ~(IORING_TIMEOUT_ABS | IORING_TIMEOUT_CLOCK_MASK))

	if (flags & ~(IORING_TIMEOUT_ABS | IORING_TIMEOUT_CLOCK_MASK |

		      IORING_TIMEOUT_ETIME_SUCCESS))

		return -EINVAL;

	/* more than one clock specified is invalid, obviously */

	if (hweight32(flags & IORING_TIMEOUT_CLOCK_MASK) > 1)

include/uapi/linux/io_uring.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ enum { 
#define IORING_TIMEOUT_BOOTTIME		(1U << 2)

#define IORING_TIMEOUT_REALTIME		(1U << 3)

#define IORING_LINK_TIMEOUT_UPDATE	(1U << 4)

#define IORING_TIMEOUT_ETIME_SUCCESS	(1U << 5)

#define IORING_TIMEOUT_CLOCK_MASK	(IORING_TIMEOUT_BOOTTIME | IORING_TIMEOUT_REALTIME)

#define IORING_TIMEOUT_UPDATE_MASK	(IORING_TIMEOUT_UPDATE | IORING_LINK_TIMEOUT_UPDATE)

/*