On 11/21/22 3:03 AM, Dylan Yudaken wrote:
> Use the just introduced deferred post cqe completion state when possible
> in io_post_aux_cqe.
>
> Signed-off-by: Dylan Yudaken <dylany@xxxxxxxx>
> ---
> io_uring/io_uring.c | 21 ++++++++++++++++++++-
> io_uring/io_uring.h | 2 +-
> io_uring/msg_ring.c | 10 ++++++----
> io_uring/net.c | 15 ++++++++-------
> io_uring/poll.c | 2 +-
> io_uring/rsrc.c | 4 ++--
> 6 files changed, 38 insertions(+), 16 deletions(-)
>
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index c797f9a75dfe..5c240d01278a 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -845,11 +845,30 @@ static void __io_flush_post_cqes(struct io_ring_ctx *ctx)
> state->cqes_count = 0;
> }
>
> -bool io_post_aux_cqe(struct io_ring_ctx *ctx,
> +bool io_post_aux_cqe(struct io_ring_ctx *ctx, bool defer,
> u64 user_data, s32 res, u32 cflags)
> {
> bool filled;
>
> + if (defer) {
> + unsigned int length = ARRAY_SIZE(ctx->submit_state.cqes);
> + struct io_uring_cqe *cqe;
> +
> + lockdep_assert_held(&ctx->uring_lock);
> +
> + if (ctx->submit_state.cqes_count == length) {
> + io_cq_lock(ctx);
> + __io_flush_post_cqes(ctx);
> + /* no need to flush - flush is deferred */
> + spin_unlock(&ctx->completion_lock);
> + }
> +
> + cqe = ctx->submit_state.cqes + ctx->submit_state.cqes_count++;
> + cqe->user_data = user_data;
> + cqe->res = res;
> + cqe->flags = cflags;
> + return true;
> + }
> io_cq_lock(ctx);
> filled = io_fill_cqe_aux(ctx, user_data, res, cflags);
> io_cq_unlock_post(ctx);
Seems like this would be cleaner with a separate helper and make that
decision in the caller. For the ones that just pass false that is
trivial of course, then just gate it on the locked nature of the ring in
the other spots?
--
Jens Axboe
