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

io_uring/rsrc: infer node from ctx on io_queue_rsrc_removal 



For io_queue_rsrc_removal() we should always use the current active rsrc
node, don't pass it directly but let the function grab it from the
context.

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


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

io_uring/filetable.c

+2 −3
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ static int io_install_fixed_file(struct io_ring_ctx *ctx, struct file *file, 
			return ret;



		old_file = (struct file *)(file_slot->file_ptr & FFS_MASK);

		ret = io_queue_rsrc_removal(ctx->file_data, slot_index,

					    ctx->rsrc_node, old_file);

		ret = io_queue_rsrc_removal(ctx->file_data, slot_index, old_file);

		if (ret)

			return ret;
@@ -163,7 +162,7 @@ int io_fixed_fd_remove(struct io_ring_ctx *ctx, unsigned int offset) 
		return -EBADF;



	file = (struct file *)(file_slot->file_ptr & FFS_MASK);

	ret = io_queue_rsrc_removal(ctx->file_data, offset, ctx->rsrc_node, file);

	ret = io_queue_rsrc_removal(ctx->file_data, offset, file);

	if (ret)

		return ret;

io_uring/rsrc.c

+5 −4
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx, 


		if (file_slot->file_ptr) {

			file = (struct file *)(file_slot->file_ptr & FFS_MASK);

			err = io_queue_rsrc_removal(data, i, ctx->rsrc_node, file);

			err = io_queue_rsrc_removal(data, i, file);

			if (err)

				break;

			file_slot->file_ptr = 0;
@@ -492,7 +492,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, 
		i = array_index_nospec(up->offset + done, ctx->nr_user_bufs);

		if (ctx->user_bufs[i] != ctx->dummy_ubuf) {

			err = io_queue_rsrc_removal(ctx->buf_data, i,

						    ctx->rsrc_node, ctx->user_bufs[i]);

						    ctx->user_bufs[i]);

			if (unlikely(err)) {

				io_buffer_unmap(ctx, &imu);

				break;
@@ -680,9 +680,10 @@ int io_files_update(struct io_kiocb *req, unsigned int issue_flags) 
	return IOU_OK;

}



int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx,

			  struct io_rsrc_node *node, void *rsrc)

int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx, void *rsrc)

{

	struct io_ring_ctx *ctx = data->ctx;

	struct io_rsrc_node *node = ctx->rsrc_node;

	u64 *tag_slot = io_get_tag_slot(data, idx);

	struct io_rsrc_put *prsrc;

io_uring/rsrc.h

+1 −2
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ void io_rsrc_put_work(struct work_struct *work); 
void io_rsrc_node_destroy(struct io_ring_ctx *ctx, struct io_rsrc_node *ref_node);

int __io_rsrc_node_switch_start(struct io_ring_ctx *ctx);

struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx);

int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx,

			  struct io_rsrc_node *node, void *rsrc);

int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx, void *rsrc);

void io_rsrc_node_switch(struct io_ring_ctx *ctx,

			 struct io_rsrc_data *data_to_kill);