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

io_uring: add io_commit_cqring_flush() 



Since __io_commit_cqring_flush users moved to different files, introduce
io_commit_cqring_flush() helper and encapsulate all flags testing details
inside.

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


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

io_uring/io_uring.c

+1 −4
Original line number Diff line number Diff line
@@ -529,10 +529,7 @@ void __io_commit_cqring_flush(struct io_ring_ctx *ctx) 


static inline void io_cqring_ev_posted(struct io_ring_ctx *ctx)

{

	if (unlikely(ctx->off_timeout_used || ctx->drain_active ||

		     ctx->has_evfd))

		__io_commit_cqring_flush(ctx);



	io_commit_cqring_flush(ctx);

	io_cqring_wake(ctx);

}

io_uring/io_uring.h

+6 −0
Original line number Diff line number Diff line
@@ -229,4 +229,10 @@ static inline void io_req_add_compl_list(struct io_kiocb *req) 
	wq_list_add_tail(&req->comp_list, &state->compl_reqs);

}



static inline void io_commit_cqring_flush(struct io_ring_ctx *ctx)

{

	if (unlikely(ctx->off_timeout_used || ctx->drain_active || ctx->has_evfd))

		__io_commit_cqring_flush(ctx);

}



#endif

io_uring/rw.c

+1 −4
Original line number Diff line number Diff line
@@ -1016,10 +1016,7 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags) 


static void io_cqring_ev_posted_iopoll(struct io_ring_ctx *ctx)

{

	if (unlikely(ctx->off_timeout_used || ctx->drain_active ||

		     ctx->has_evfd))

		__io_commit_cqring_flush(ctx);



	io_commit_cqring_flush(ctx);

	if (ctx->flags & IORING_SETUP_SQPOLL)

		io_cqring_wake(ctx);

}