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

io_uring: consolidate *_check_overflow accounting 



Add a helper to mark ctx->{cq,sq}_check_overflow to get rid of
duplicates, and it's clearer to check cq_overflow_list directly anyway.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dd9dfcdf

fs/io_uring.c

+13 −10
Original line number Diff line number Diff line
@@ -1303,6 +1303,15 @@ static void io_cqring_ev_posted(struct io_ring_ctx *ctx) 
		eventfd_signal(ctx->cq_ev_fd, 1);

}



static void io_cqring_mark_overflow(struct io_ring_ctx *ctx)

{

	if (list_empty(&ctx->cq_overflow_list)) {

		clear_bit(0, &ctx->sq_check_overflow);

		clear_bit(0, &ctx->cq_check_overflow);

		ctx->rings->sq_flags &= ~IORING_SQ_CQ_OVERFLOW;

	}

}



/* Returns true if there are no backlogged entries after the flush */

static bool io_cqring_overflow_flush(struct io_ring_ctx *ctx, bool force)

{
@@ -1347,11 +1356,8 @@ static bool io_cqring_overflow_flush(struct io_ring_ctx *ctx, bool force) 
	}



	io_commit_cqring(ctx);

	if (cqe) {

		clear_bit(0, &ctx->sq_check_overflow);

		clear_bit(0, &ctx->cq_check_overflow);

		ctx->rings->sq_flags &= ~IORING_SQ_CQ_OVERFLOW;

	}

	io_cqring_mark_overflow(ctx);



	spin_unlock_irqrestore(&ctx->completion_lock, flags);

	io_cqring_ev_posted(ctx);
@@ -7842,11 +7848,8 @@ static void io_uring_cancel_files(struct io_ring_ctx *ctx, 
			spin_lock_irq(&ctx->completion_lock);

			list_del(&cancel_req->compl.list);

			cancel_req->flags &= ~REQ_F_OVERFLOW;

			if (list_empty(&ctx->cq_overflow_list)) {

				clear_bit(0, &ctx->sq_check_overflow);

				clear_bit(0, &ctx->cq_check_overflow);

				ctx->rings->sq_flags &= ~IORING_SQ_CQ_OVERFLOW;

			}



			io_cqring_mark_overflow(ctx);

			WRITE_ONCE(ctx->rings->cq_overflow,

				atomic_inc_return(&ctx->cached_cq_overflow));

			io_commit_cqring(ctx);