Commit dbd0f6d6 authored Jul 13, 2019 by Zhengyuan Liu Committed by Jens Axboe Jul 16, 2019

io_uring: fix the sequence comparison in io_sequence_defer



sq->cached_sq_head and cq->cached_cq_tail are both unsigned int. If
cached_sq_head overflows before cached_cq_tail, then we may miss a
barrier req. As cached_cq_tail always follows cached_sq_head, the NQ
should be enough.

Cc: stable@vger.kernel.org
Fixes: de0617e4 ("io_uring: add support for marking commands as draining")
Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 9637d517

fs/io_uring.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -429,7 +429,7 @@ static inline bool io_sequence_defer(struct io_ring_ctx *ctx,
		if ((req->flags & (REQ_F_IO_DRAIN\|REQ_F_IO_DRAINED)) != REQ_F_IO_DRAIN)
		return false;

		return req->sequence > ctx->cached_cq_tail + ctx->sq_ring->dropped;
		return req->sequence != ctx->cached_cq_tail + ctx->sq_ring->dropped;
		}

		static struct io_kiocb io_get_deferred_req(struct io_ring_ctx ctx)

Admin message