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

io_uring: fix miscounting ios_left 



io_req_init() doesn't decrement state->ios_left if a request doesn't
need ->file, it just returns before that on if(!needs_file). That's
not really a problem but may cause overhead for an additional fput().
Also inline and kill io_req_set_file() as it's of no use anymore.

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

fs/io_uring.c

+9 −12
Original line number Diff line number Diff line
@@ -6327,15 +6327,6 @@ static struct file *io_file_get(struct io_submit_state *state, 
	return file;

}



static int io_req_set_file(struct io_submit_state *state, struct io_kiocb *req,

			   int fd)

{

	req->file = io_file_get(state, req, fd, req->flags & REQ_F_FIXED_FILE);

	if (req->file || io_op_defs[req->opcode].needs_file_no_error)

		return 0;

	return -EBADF;

}



static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer)

{

	struct io_timeout_data *data = container_of(timer,
@@ -6748,10 +6739,16 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, 
		state->plug_started = true;

	}



	if (!io_op_defs[req->opcode].needs_file)

		return 0;

	ret = 0;

	if (io_op_defs[req->opcode].needs_file) {

		bool fixed = req->flags & REQ_F_FIXED_FILE;



		req->file = io_file_get(state, req, READ_ONCE(sqe->fd), fixed);

		if (unlikely(!req->file &&

		    !io_op_defs[req->opcode].needs_file_no_error))

			ret = -EBADF;

	}



	ret = io_req_set_file(state, req, READ_ONCE(sqe->fd));

	state->ios_left--;

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE