Commit c66ae3ec authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: refactor __io_cq_unlock_post_flush() 



Separate ->task_complete path in __io_cq_unlock_post_flush().

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/baa9b8d822f024e4ee01c40209dbbe38d9c8c11d.1680782017.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8751d154

io_uring/io_uring.c

+12 −10
Original line number Diff line number Diff line
@@ -627,22 +627,24 @@ static inline void __io_cq_unlock_post(struct io_ring_ctx *ctx) 
	io_cqring_wake(ctx);

}



static inline void __io_cq_unlock_post_flush(struct io_ring_ctx *ctx)

static void __io_cq_unlock_post_flush(struct io_ring_ctx *ctx)

	__releases(ctx->completion_lock)

{

	io_commit_cqring(ctx);

	__io_cq_unlock(ctx);

	io_commit_cqring_flush(ctx);



	if (ctx->task_complete) {

		/*

	 * As ->task_complete implies that the ring is single tasked, cq_wait

	 * may only be waited on by the current in io_cqring_wait(), but since

	 * it will re-check the wakeup conditions once we return we can safely

	 * skip waking it up.

		 * ->task_complete implies that only current might be waiting

		 * for CQEs, and obviously, we currently don't. No one is

		 * waiting, wakeups are futile, skip them.

		 */

	if (!(ctx->flags & IORING_SETUP_DEFER_TASKRUN))

		io_commit_cqring_flush(ctx);

	} else {

		__io_cq_unlock(ctx);

		io_commit_cqring_flush(ctx);

		io_cqring_wake(ctx);

	}

}



void io_cq_unlock_post(struct io_ring_ctx *ctx)

	__releases(ctx->completion_lock)