diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2019-10-27 18:52:20 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-10-29 10:24:21 -0600 |
| commit | fa4562280889ad372dfb1413833a8b8675721b17 (patch) | |
| tree | e6ede89d2964d4347e68b32df37999fc7f80957f | |
| parent | c826bd7a743f275e2b68c16d595534063b400deb (diff) | |
| download | lwn-fa4562280889ad372dfb1413833a8b8675721b17.tar.gz lwn-fa4562280889ad372dfb1413833a8b8675721b17.zip | |
io_uring: remove index from sqe_submit
submit->index is used only for inbound check in submission path (i.e.
head < ctx->sq_entries). However, it always will be true, as
1. it's already validated by io_get_sqring()
2. ctx->sq_entries can't be changedd in between, because of held
ctx->uring_lock and ctx->refs.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index f83465fc1ed1..545efd89a1f9 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -271,7 +271,6 @@ struct io_ring_ctx { struct sqe_submit { const struct io_uring_sqe *sqe; - unsigned short index; u32 sequence; bool has_user; bool in_async; @@ -2168,9 +2167,6 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, req->user_data = READ_ONCE(s->sqe->user_data); - if (unlikely(s->index >= ctx->sq_entries)) - return -EINVAL; - opcode = READ_ONCE(s->sqe->opcode); switch (opcode) { case IORING_OP_NOP: @@ -2716,7 +2712,6 @@ static bool io_get_sqring(struct io_ring_ctx *ctx, struct sqe_submit *s) head = READ_ONCE(sq_array[head & ctx->sq_mask]); if (head < ctx->sq_entries) { - s->index = head; s->sqe = &ctx->sq_sqes[head]; s->sequence = ctx->cached_sq_head; ctx->cached_sq_head++; |