Commit 4d13d1a4 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: simplify io_prep_linked_timeout

The link test in io_prep_linked_timeout() is pretty bulky, replace it
with a flag. It's better for normal path and linked requests, and also
will be used further for request failing.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/3703770bfae8bc1ff370e43ef5767940202cab42.1628981736.git.asml.silence@gmail.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b97e736a
...@@ -710,6 +710,7 @@ enum { ...@@ -710,6 +710,7 @@ enum {
REQ_F_DONT_REISSUE_BIT, REQ_F_DONT_REISSUE_BIT,
REQ_F_CREDS_BIT, REQ_F_CREDS_BIT,
REQ_F_REFCOUNT_BIT, REQ_F_REFCOUNT_BIT,
REQ_F_ARM_LTIMEOUT_BIT,
/* keep async read/write and isreg together and in order */ /* keep async read/write and isreg together and in order */
REQ_F_NOWAIT_READ_BIT, REQ_F_NOWAIT_READ_BIT,
REQ_F_NOWAIT_WRITE_BIT, REQ_F_NOWAIT_WRITE_BIT,
...@@ -765,6 +766,8 @@ enum { ...@@ -765,6 +766,8 @@ enum {
REQ_F_CREDS = BIT(REQ_F_CREDS_BIT), REQ_F_CREDS = BIT(REQ_F_CREDS_BIT),
/* skip refcounting if not set */ /* skip refcounting if not set */
REQ_F_REFCOUNT = BIT(REQ_F_REFCOUNT_BIT), REQ_F_REFCOUNT = BIT(REQ_F_REFCOUNT_BIT),
/* there is a linked timeout that has to be armed */
REQ_F_ARM_LTIMEOUT = BIT(REQ_F_ARM_LTIMEOUT_BIT),
}; };
struct async_poll { struct async_poll {
...@@ -1302,23 +1305,18 @@ static void io_req_track_inflight(struct io_kiocb *req) ...@@ -1302,23 +1305,18 @@ static void io_req_track_inflight(struct io_kiocb *req)
static struct io_kiocb *__io_prep_linked_timeout(struct io_kiocb *req) static struct io_kiocb *__io_prep_linked_timeout(struct io_kiocb *req)
{ {
struct io_kiocb *nxt = req->link; req->flags &= ~REQ_F_ARM_LTIMEOUT;
req->flags |= REQ_F_LINK_TIMEOUT;
if (req->flags & REQ_F_LINK_TIMEOUT)
return NULL;
/* linked timeouts should have two refs once prep'ed */ /* linked timeouts should have two refs once prep'ed */
io_req_set_refcount(req); io_req_set_refcount(req);
__io_req_set_refcount(nxt, 2); __io_req_set_refcount(req->link, 2);
return req->link;
nxt->timeout.head = req;
req->flags |= REQ_F_LINK_TIMEOUT;
return nxt;
} }
static inline struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req) static inline struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req)
{ {
if (likely(!req->link || req->link->opcode != IORING_OP_LINK_TIMEOUT)) if (likely(!(req->flags & REQ_F_ARM_LTIMEOUT)))
return NULL; return NULL;
return __io_prep_linked_timeout(req); return __io_prep_linked_timeout(req);
} }
...@@ -5700,6 +5698,8 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, ...@@ -5700,6 +5698,8 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
return -EINVAL; return -EINVAL;
if (link->last->opcode == IORING_OP_LINK_TIMEOUT) if (link->last->opcode == IORING_OP_LINK_TIMEOUT)
return -EINVAL; return -EINVAL;
req->timeout.head = link->last;
link->last->flags |= REQ_F_ARM_LTIMEOUT;
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment