io_uring: reduce one unnecessary io_sqring_entries() call
PATCH 1/1 io_uring: reduce one unnecessary io_sqring_entries() call
In __io_sq_thread(), we have gotten the number of sqes to submit, then in io_submit_sqes(), we can use this number directly, no need to call io_sqring_entries() again in io_submit_sqes().
Signed-off-by Xiaoguang Wang <[email protected]>
--- fs/io_uring.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/io_uring.c +2 -3
@@ -6830,9 +6830,6 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr)return -EBUSY ; } -/* make sure SQ entry isn't read before tail */ - nr =min3 (nr, ctx->sq_entries,io_sqring_entries (ctx)); -if (!percpu_ref_tryget_many (&ctx->refs, nr))return -EAGAIN ;
@@ -9211,6 +9208,8 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,if (unlikely (ret)) goto out;mutex_lock (&ctx->uring_lock); +/* make sure SQ entry isn't read before tail */ + to_submit =min3 (to_submit, ctx->sq_entries,io_sqring_entries (ctx)); submitted =io_submit_sqes (ctx, to_submit);mutex_unlock (&ctx->uring_lock);
Signature · 1 line
2.17.2
Quoted 14 lines · Xiaoguang Wang
In
__io_sq_thread(), we have gotten the number of sqes to submit, then inio_submit_sqes(), we can use this number directly, no need to callio_sqring_entries()again inio_submit_sqes().Signed-off-by Xiaoguang Wang <[email protected]>--- fs/io_uring.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)fs/io_uring.c +0
-0
fs/io_uring.c static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) · line 6834
Quoted 5 lines
fs/io_uring.c +0
-2@@ -6830,9 +6830,6 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr)return -EBUSY ; } -/* make sure SQ entry isn't read before tail */ - nr =min3 (nr, ctx->sq_entries,io_sqring_entries (ctx));
the userspace can modify rings->sq.tail, and so io_sqring_entries() can turn out to be very large. sqpoll still needs min(ctx->sq_entries, ...)
Quoted 14 lines
fs/io_uring.c +2
-1-if (!percpu_ref_tryget_many (&ctx->refs, nr))return -EAGAIN ;@@ -9211,6 +9208,8 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,if (unlikely (ret)) goto out;mutex_lock (&ctx->uring_lock); +/* make sure SQ entry isn't read before tail */ + to_submit =min3 (to_submit, ctx->sq_entries,io_sqring_entries (ctx)); submitted =io_submit_sqes (ctx, to_submit);mutex_unlock (&ctx->uring_lock);
Signature · 1 line
Pavel Begunkov