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

io_uring: move io_init_req() into io_submit_sqe() 



Behaves identically, just move io_init_req() call into the beginning of
io_submit_sqes(). That looks better unloads io_submit_sqes().

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

fs/io_uring.c

+15 −17
Original line number Diff line number Diff line
@@ -6751,12 +6751,23 @@ struct io_submit_link { 
	struct io_kiocb *last;

};



static int io_submit_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,

static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,

			 const struct io_uring_sqe *sqe,

			 struct io_submit_link *link)

{

	struct io_ring_ctx *ctx = req->ctx;

	int ret;



	ret = io_init_req(ctx, req, sqe);

	if (unlikely(ret)) {

fail_req:

		io_put_req(req);

		io_req_complete(req, ret);

		return ret;

	}



	trace_io_uring_submit_sqe(ctx, req->opcode, req->user_data,

				true, ctx->flags & IORING_SETUP_SQPOLL);



	/*

	 * If we already have a head request, queue this one for async

	 * submittal once the head completes. If we don't have a head but
@@ -6782,7 +6793,7 @@ static int io_submit_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
		if (unlikely(ret)) {

			/* fail even hard links since we don't submit */

			head->flags |= REQ_F_FAIL_LINK;

			return ret;

			goto fail_req;

		}

		trace_io_uring_link(ctx, req, head);

		link->last->link = req;
@@ -6904,7 +6915,6 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) 
	while (submitted < nr) {

		const struct io_uring_sqe *sqe;

		struct io_kiocb *req;

		int err;



		req = io_alloc_req(ctx);

		if (unlikely(!req)) {
@@ -6919,22 +6929,10 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) 
		}

		/* will complete beyond this point, count as submitted */

		submitted++;



		err = io_init_req(ctx, req, sqe);

		if (unlikely(err)) {

fail_req:

			io_put_req(req);

			io_req_complete(req, err);

		if (io_submit_sqe(ctx, req, sqe, &link))

			break;

	}



		trace_io_uring_submit_sqe(ctx, req->opcode, req->user_data,

					true, ctx->flags & IORING_SETUP_SQPOLL);

		err = io_submit_sqe(req, sqe, &link);

		if (err)

			goto fail_req;

	}



	if (unlikely(submitted != nr)) {

		int ref_used = (submitted == -EAGAIN) ? 0 : submitted;

		struct io_uring_task *tctx = current->io_uring;