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

io_uring/rsrc: devirtualise rsrc put callbacks 



We only have two rsrc types, buffers and files, replace virtual
callbacks for putting resources down with a switch..case.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/02ca727bf8e5f7f820c2f404e95ae88c8f472930.1681822823.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 29b26c55

io_uring/rsrc.c

+19 −6
Original line number Original line Diff line number Diff line
@@ -23,6 +23,8 @@ struct io_rsrc_update { 
	u32				offset;

	u32				offset;

};

};





static void io_rsrc_buf_put(struct io_ring_ctx *ctx, struct io_rsrc_put *prsrc);

static void io_rsrc_file_put(struct io_ring_ctx *ctx, struct io_rsrc_put *prsrc);

static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov,

static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov,

				  struct io_mapped_ubuf **pimu,

				  struct io_mapped_ubuf **pimu,

				  struct page **last_hpage);

				  struct page **last_hpage);
@@ -147,7 +149,18 @@ static void io_rsrc_put_work(struct io_rsrc_node *node) 




	if (prsrc->tag)

	if (prsrc->tag)

		io_post_aux_cqe(data->ctx, prsrc->tag, 0, 0);

		io_post_aux_cqe(data->ctx, prsrc->tag, 0, 0);

	data->do_put(data->ctx, prsrc);



	switch (data->rsrc_type) {

	case IORING_RSRC_FILE:

		io_rsrc_file_put(data->ctx, prsrc);

		break;

	case IORING_RSRC_BUFFER:

		io_rsrc_buf_put(data->ctx, prsrc);

		break;

	default:

		WARN_ON_ONCE(1);

		break;

	}

}

}





void io_rsrc_node_destroy(struct io_ring_ctx *ctx, struct io_rsrc_node *node)

void io_rsrc_node_destroy(struct io_ring_ctx *ctx, struct io_rsrc_node *node)
@@ -297,8 +310,8 @@ static __cold void **io_alloc_page_table(size_t size) 
	return table;

	return table;

}

}





__cold static int io_rsrc_data_alloc(struct io_ring_ctx *ctx,

__cold static int io_rsrc_data_alloc(struct io_ring_ctx *ctx, int type,

				     rsrc_put_fn *do_put, u64 __user *utags,

				     u64 __user *utags,

				     unsigned nr, struct io_rsrc_data **pdata)

				     unsigned nr, struct io_rsrc_data **pdata)

{

{

	struct io_rsrc_data *data;

	struct io_rsrc_data *data;
@@ -316,7 +329,7 @@ __cold static int io_rsrc_data_alloc(struct io_ring_ctx *ctx, 




	data->nr = nr;

	data->nr = nr;

	data->ctx = ctx;

	data->ctx = ctx;

	data->do_put = do_put;

	data->rsrc_type = type;

	if (utags) {

	if (utags) {

		ret = -EFAULT;

		ret = -EFAULT;

		for (i = 0; i < nr; i++) {

		for (i = 0; i < nr; i++) {
@@ -849,7 +862,7 @@ int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg, 
		return -EMFILE;

		return -EMFILE;

	if (nr_args > rlimit(RLIMIT_NOFILE))

	if (nr_args > rlimit(RLIMIT_NOFILE))

		return -EMFILE;

		return -EMFILE;

	ret = io_rsrc_data_alloc(ctx, io_rsrc_file_put, tags, nr_args,

	ret = io_rsrc_data_alloc(ctx, IORING_RSRC_FILE, tags, nr_args,

				 &ctx->file_data);

				 &ctx->file_data);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -1184,7 +1197,7 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, 
		return -EBUSY;

		return -EBUSY;

	if (!nr_args || nr_args > IORING_MAX_REG_BUFFERS)

	if (!nr_args || nr_args > IORING_MAX_REG_BUFFERS)

		return -EINVAL;

		return -EINVAL;

	ret = io_rsrc_data_alloc(ctx, io_rsrc_buf_put, tags, nr_args, &data);

	ret = io_rsrc_data_alloc(ctx, IORING_RSRC_BUFFER, tags, nr_args, &data);

	if (ret)

	if (ret)

		return ret;

		return ret;

	ret = io_buffers_map_alloc(ctx, nr_args);

	ret = io_buffers_map_alloc(ctx, nr_args);

io_uring/rsrc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ struct io_rsrc_data { 




	u64				**tags;

	u64				**tags;

	unsigned int			nr;

	unsigned int			nr;

	rsrc_put_fn			*do_put;

	u16				rsrc_type;

	bool				quiesce;

	bool				quiesce;

};

};