Commit 26a61679 authored by Jens Axboe's avatar Jens Axboe

io_uring: read 'count' for IORING_OP_TIMEOUT in prep handler

Add the count field to struct io_timeout, and ensure the prep handler
has read it. Timeout also needs an async context always, set it up
in the prep handler if we don't have one.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e47293fd
...@@ -330,6 +330,7 @@ struct io_timeout { ...@@ -330,6 +330,7 @@ struct io_timeout {
struct file *file; struct file *file;
u64 addr; u64 addr;
int flags; int flags;
unsigned count;
}; };
struct io_rw { struct io_rw {
...@@ -2902,7 +2903,12 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io, ...@@ -2902,7 +2903,12 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io,
if (flags & ~IORING_TIMEOUT_ABS) if (flags & ~IORING_TIMEOUT_ABS)
return -EINVAL; return -EINVAL;
data = &io->timeout; req->timeout.count = READ_ONCE(sqe->off);
if (!io && io_alloc_async_ctx(req))
return -ENOMEM;
data = &req->io->timeout;
data->req = req; data->req = req;
req->flags |= REQ_F_TIMEOUT; req->flags |= REQ_F_TIMEOUT;
...@@ -2920,7 +2926,6 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io, ...@@ -2920,7 +2926,6 @@ static int io_timeout_prep(struct io_kiocb *req, struct io_async_ctx *io,
static int io_timeout(struct io_kiocb *req) static int io_timeout(struct io_kiocb *req)
{ {
const struct io_uring_sqe *sqe = req->sqe;
unsigned count; unsigned count;
struct io_ring_ctx *ctx = req->ctx; struct io_ring_ctx *ctx = req->ctx;
struct io_timeout_data *data; struct io_timeout_data *data;
...@@ -2942,7 +2947,7 @@ static int io_timeout(struct io_kiocb *req) ...@@ -2942,7 +2947,7 @@ static int io_timeout(struct io_kiocb *req)
* timeout event to be satisfied. If it isn't set, then this is * timeout event to be satisfied. If it isn't set, then this is
* a pure timeout request, sequence isn't used. * a pure timeout request, sequence isn't used.
*/ */
count = READ_ONCE(sqe->off); count = req->timeout.count;
if (!count) { if (!count) {
req->flags |= REQ_F_TIMEOUT_NOSEQ; req->flags |= REQ_F_TIMEOUT_NOSEQ;
spin_lock_irq(&ctx->completion_lock); spin_lock_irq(&ctx->completion_lock);
......
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