Commit 8776f3fa authored by Jackie Liu's avatar Jackie Liu Committed by Jens Axboe
Browse files

io_uring: fix wrong sequence setting logic 



Sqo_thread will get sqring in batches, which will cause
ctx->cached_sq_head to be added in batches. if one of these
sqes is set with the DRAIN flag, then he will never get a
chance to process, and finally sqo_thread will not exit.

Fixes: de0617e4 ("io_uring: add support for marking commands as draining")
Signed-off-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ac90f249

fs/io_uring.c

+3 −1
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ struct io_ring_ctx { 
struct sqe_submit {

	const struct io_uring_sqe	*sqe;

	unsigned short			index;

	u32				sequence;

	bool				has_user;

	bool				needs_lock;

	bool				needs_fixed_file;
@@ -2016,7 +2017,7 @@ static int io_req_set_file(struct io_ring_ctx *ctx, const struct sqe_submit *s, 


	if (flags & IOSQE_IO_DRAIN) {

		req->flags |= REQ_F_IO_DRAIN;

		req->sequence = ctx->cached_sq_head - 1;

		req->sequence = s->sequence;

	}



	if (!io_op_needs_file(s->sqe))
@@ -2224,6 +2225,7 @@ static bool io_get_sqring(struct io_ring_ctx *ctx, struct sqe_submit *s) 
	if (head < ctx->sq_entries) {

		s->index = head;

		s->sqe = &ctx->sq_sqes[head];

		s->sequence = ctx->cached_sq_head;

		ctx->cached_sq_head++;

		return true;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE