Skip to content

Commit

Permalink
io_uring: remove index from sqe_submit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pavel Begunkov authored and Jens Axboe committed Oct 29, 2019
1 parent c826bd7 commit fa45622
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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++;
Expand Down

0 comments on commit fa45622

Please sign in to comment.