leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io_uring: make IORING_OP_TIMEOUT_REMOVE deferrable

Browse Source 
If we defer this command as part of a link, we have to make sure that
the SQE data has been read upfront. Integrate the timeout remove op into
the prep handling to make it safe for SQE reuse.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2019-12-17 18:50:29 -07:00
parent fbf23849b1
commit b29472ee7b
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fs/io_uring.c
View File

@ -326,6 +326,12 @@ struct io_cancel {
u64 addr; u64 addr;
}; };
struct io_timeout {
struct file *file;
u64 addr;
int flags;
};
struct io_async_connect { struct io_async_connect {
struct sockaddr_storage address; struct sockaddr_storage address;
}; };
@ -368,6 +374,7 @@ struct io_kiocb {
struct io_accept accept; struct io_accept accept;
struct io_sync sync; struct io_sync sync;
struct io_cancel cancel; struct io_cancel cancel;
struct io_timeout timeout;
}; };
const struct io_uring_sqe *sqe; const struct io_uring_sqe *sqe;
@ -2818,26 +2825,40 @@ static int io_timeout_cancel(struct io_ring_ctx *ctx, __u64 user_data)
return 0; return 0;
} }
static int io_timeout_remove_prep(struct io_kiocb *req)
{
const struct io_uring_sqe *sqe = req->sqe;
if (req->flags & REQ_F_PREPPED)
return 0;
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL;
if (sqe->flags || sqe->ioprio || sqe->buf_index || sqe->len)
return -EINVAL;
req->timeout.addr = READ_ONCE(sqe->addr);
req->timeout.flags = READ_ONCE(sqe->timeout_flags);
if (req->timeout.flags)
return -EINVAL;
req->flags |= REQ_F_PREPPED;
return 0;
}
/* /*
* Remove or update an existing timeout command * Remove or update an existing timeout command
*/ */
static int io_timeout_remove(struct io_kiocb *req) static int io_timeout_remove(struct io_kiocb *req)
{ {
const struct io_uring_sqe *sqe = req->sqe;
struct io_ring_ctx *ctx = req->ctx; struct io_ring_ctx *ctx = req->ctx;
unsigned flags;
int ret; int ret;
if (unlikely(ctx->flags & IORING_SETUP_IOPOLL)) ret = io_timeout_remove_prep(req);
return -EINVAL; if (ret)
if (sqe->flags || sqe->ioprio || sqe->buf_index || sqe->len) return ret;
return -EINVAL;
flags = READ_ONCE(sqe->timeout_flags);
if (flags)
return -EINVAL;
spin_lock_irq(&ctx->completion_lock); spin_lock_irq(&ctx->completion_lock);
ret = io_timeout_cancel(ctx, READ_ONCE(sqe->addr)); ret = io_timeout_cancel(ctx, req->timeout.addr);
io_cqring_fill_event(req, ret); io_cqring_fill_event(req, ret);
io_commit_cqring(ctx); io_commit_cqring(ctx);
@ -3108,6 +3129,9 @@ static int io_req_defer_prep(struct io_kiocb *req)
case IORING_OP_TIMEOUT: case IORING_OP_TIMEOUT:
ret = io_timeout_prep(req, io, false); ret = io_timeout_prep(req, io, false);
break; break;
case IORING_OP_TIMEOUT_REMOVE:
ret = io_timeout_remove_prep(req);
break;
case IORING_OP_ASYNC_CANCEL: case IORING_OP_ASYNC_CANCEL:
ret = io_async_cancel_prep(req); ret = io_async_cancel_prep(req);
break; break;