io_uring: always plug for any number of IOs (ac8691c4) · Commits · 戴 / test

fs/io_uring.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -676,7 +676,6 @@ struct io_kiocb {
		};
		};

		#define IO_PLUG_THRESHOLD 2
		#define IO_IOPOLL_BATCH 8

		struct io_submit_state {
		@@ -5914,7 +5913,7 @@ static int io_init_req(struct io_ring_ctx ctx, struct io_kiocb req,
		static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr,
		struct file *ring_file, int ring_fd)
		{
		struct io_submit_state state, *statep = NULL;
		struct io_submit_state state;
		struct io_kiocb *link = NULL;
		int i, submitted = 0;

		@@ -5931,10 +5930,7 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr,
		if (!percpu_ref_tryget_many(&ctx->refs, nr))
		return -EAGAIN;

		if (nr > IO_PLUG_THRESHOLD) {
		io_submit_state_start(&state, nr);
		statep = &state;
		}

		ctx->ring_fd = ring_fd;
		ctx->ring_file = ring_file;
		@@ -5949,14 +5945,14 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr,
		io_consume_sqe(ctx);
		break;
		}
		req = io_alloc_req(ctx, statep);
		req = io_alloc_req(ctx, &state);
		if (unlikely(!req)) {
		if (!submitted)
		submitted = -EAGAIN;
		break;
		}

		err = io_init_req(ctx, req, sqe, statep);
		err = io_init_req(ctx, req, sqe, &state);
		io_consume_sqe(ctx);
		/* will complete beyond this point, count as submitted */
		submitted++;
		@@ -5982,7 +5978,6 @@ fail_req:
		}
		if (link)
		io_queue_link_head(link);
		if (statep)
		io_submit_state_end(&state);

		/* Commit SQ ring head once we've consumed and submitted all SQEs */