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

Revert "io_uring: rename IORING_OP_FILES_UPDATE" 



This reverts commit 4379d5f1.

We removed notification flushing, also cleanup uapi preparation changes
to not pollute it.

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


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

include/uapi/linux/io_uring.h

+1 −11
Original line number Diff line number Diff line
@@ -178,8 +178,7 @@ enum io_uring_op { 
	IORING_OP_FALLOCATE,

	IORING_OP_OPENAT,

	IORING_OP_CLOSE,

	IORING_OP_RSRC_UPDATE,

	IORING_OP_FILES_UPDATE = IORING_OP_RSRC_UPDATE,

	IORING_OP_FILES_UPDATE,

	IORING_OP_STATX,

	IORING_OP_READ,

	IORING_OP_WRITE,
@@ -228,7 +227,6 @@ enum io_uring_op { 
#define IORING_TIMEOUT_ETIME_SUCCESS	(1U << 5)

#define IORING_TIMEOUT_CLOCK_MASK	(IORING_TIMEOUT_BOOTTIME | IORING_TIMEOUT_REALTIME)

#define IORING_TIMEOUT_UPDATE_MASK	(IORING_TIMEOUT_UPDATE | IORING_LINK_TIMEOUT_UPDATE)



/*

 * sqe->splice_flags

 * extends splice(2) flags
@@ -295,14 +293,6 @@ enum io_uring_op { 
 */

#define IORING_ACCEPT_MULTISHOT	(1U << 0)





/*

 * IORING_OP_RSRC_UPDATE flags

 */

enum {

	IORING_RSRC_UPDATE_FILES,

};



/*

 * IORING_OP_MSG_RING command types, stored in sqe->addr

 */

io_uring/opdef.c

+4 −5
Original line number Diff line number Diff line
@@ -246,13 +246,12 @@ const struct io_op_def io_op_defs[] = { 
		.prep			= io_close_prep,

		.issue			= io_close,

	},

	[IORING_OP_RSRC_UPDATE] = {

	[IORING_OP_FILES_UPDATE] = {

		.audit_skip		= 1,

		.iopoll			= 1,

		.name			= "RSRC_UPDATE",

		.prep			= io_rsrc_update_prep,

		.issue			= io_rsrc_update,

		.ioprio			= 1,

		.name			= "FILES_UPDATE",

		.prep			= io_files_update_prep,

		.issue			= io_files_update,

	},

	[IORING_OP_STATX] = {

		.audit_skip		= 1,

io_uring/rsrc.c

+2 −15
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct io_rsrc_update { 
	u64				arg;

	u32				nr_args;

	u32				offset;

	int				type;

};



static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov,
@@ -654,7 +653,7 @@ __cold int io_register_rsrc(struct io_ring_ctx *ctx, void __user *arg, 
	return -EINVAL;

}



int io_rsrc_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

int io_files_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);
@@ -668,7 +667,6 @@ int io_rsrc_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	if (!up->nr_args)

		return -EINVAL;

	up->arg = READ_ONCE(sqe->addr);

	up->type = READ_ONCE(sqe->ioprio);

	return 0;

}
@@ -711,7 +709,7 @@ static int io_files_update_with_index_alloc(struct io_kiocb *req, 
	return ret;

}



static int io_files_update(struct io_kiocb *req, unsigned int issue_flags)

int io_files_update(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);

	struct io_ring_ctx *ctx = req->ctx;
@@ -740,17 +738,6 @@ static int io_files_update(struct io_kiocb *req, unsigned int issue_flags) 
	return IOU_OK;

}



int io_rsrc_update(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);



	switch (up->type) {

	case IORING_RSRC_UPDATE_FILES:

		return io_files_update(req, issue_flags);

	}

	return -EINVAL;

}



int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx,

			  struct io_rsrc_node *node, void *rsrc)

{

io_uring/rsrc.h

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ static inline u64 *io_get_tag_slot(struct io_rsrc_data *data, unsigned int idx) 
	return &data->tags[table_idx][off];

}



int io_rsrc_update(struct io_kiocb *req, unsigned int issue_flags);

int io_rsrc_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);

int io_files_update(struct io_kiocb *req, unsigned int issue_flags);

int io_files_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);



int __io_account_mem(struct user_struct *user, unsigned long nr_pages);