Skip to content

Commit

Permalink
io_uring: optimise hot path restricted checks
Browse files Browse the repository at this point in the history
Move likely/unlikely from io_check_restriction() to specifically
ctx->restricted check, because doesn't do what it supposed to and make
the common path take an extra jump.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/22bf70d0a543dfc935d7276bdc73081784e30698.1624739600.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Pavel Begunkov authored and Jens Axboe committed Jun 30, 2021
1 parent e5dc480 commit 4cfb25b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -6506,7 +6506,7 @@ static inline bool io_check_restriction(struct io_ring_ctx *ctx,
struct io_kiocb *req,
unsigned int sqe_flags)
{
if (!ctx->restricted)
if (likely(!ctx->restricted))
return true;

if (!test_bit(req->opcode, ctx->restrictions.sqe_op))
Expand Down Expand Up @@ -6549,7 +6549,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
return -EINVAL;
if (unlikely(req->opcode >= IORING_OP_LAST))
return -EINVAL;
if (unlikely(!io_check_restriction(ctx, req, sqe_flags)))
if (!io_check_restriction(ctx, req, sqe_flags))
return -EACCES;

if ((sqe_flags & IOSQE_BUFFER_SELECT) &&
Expand Down

0 comments on commit 4cfb25b

Please sign in to comment.