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

io_uring: refactor scheduling in io_cqring_wait 



schedule_timeout() with timeout=MAX_SCHEDULE_TIMEOUT is guaranteed to
work just as schedule(), so instead of hand-coding it based on arguments
always use the timeout version and simplify code.

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

fs/io_uring.c

+8 −11
Original line number Diff line number Diff line
@@ -7213,9 +7213,8 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, 
		.to_wait	= min_events,

	};

	struct io_rings *rings = ctx->rings;

	struct timespec64 ts;

	signed long timeout = 0;

	int ret = 0;

	signed long timeout = MAX_SCHEDULE_TIMEOUT;

	int ret;



	do {

		io_cqring_overflow_flush(ctx, false, NULL, NULL);
@@ -7239,6 +7238,8 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, 
	}



	if (uts) {

		struct timespec64 ts;



		if (get_timespec64(&ts, uts))

			return -EFAULT;

		timeout = timespec64_to_jiffies(&ts);
@@ -7264,15 +7265,11 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, 
			finish_wait(&ctx->wait, &iowq.wq);

			continue;

		}

		if (uts) {

		timeout = schedule_timeout(timeout);

		if (timeout == 0) {

			ret = -ETIME;

			break;

		}

		} else {

			schedule();

		}

	} while (1);

	finish_wait(&ctx->wait, &iowq.wq);