system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-15 07:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "io_uring: rename IORING_OP_FILES_UPDATE"

Browse source 
This reverts commit 4379d5f15b.

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

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/89edc3905350f91e1b6e26d9dbf42ee44fd451a2.1662027856.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2022-09-01 11:54:02 +01:00 committed by Jens Axboe
parent 23c12d5fc0
commit d9808ceb31
4 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/uapi/linux/io_uring.h
View file

@ -178,8 +178,7 @@ enum io_uring_op {
IORING_OP_FALLOCATE, IORING_OP_FALLOCATE,
IORING_OP_OPENAT, IORING_OP_OPENAT,
IORING_OP_CLOSE, IORING_OP_CLOSE,
IORING_OP_RSRC_UPDATE, IORING_OP_FILES_UPDATE,
IORING_OP_FILES_UPDATE = IORING_OP_RSRC_UPDATE,
IORING_OP_STATX, IORING_OP_STATX,
IORING_OP_READ, IORING_OP_READ,
IORING_OP_WRITE, IORING_OP_WRITE,
@ -228,7 +227,6 @@ enum io_uring_op {
#define IORING_TIMEOUT_ETIME_SUCCESS (1U << 5) #define IORING_TIMEOUT_ETIME_SUCCESS (1U << 5)
#define IORING_TIMEOUT_CLOCK_MASK (IORING_TIMEOUT_BOOTTIME | IORING_TIMEOUT_REALTIME) #define IORING_TIMEOUT_CLOCK_MASK (IORING_TIMEOUT_BOOTTIME | IORING_TIMEOUT_REALTIME)
#define IORING_TIMEOUT_UPDATE_MASK (IORING_TIMEOUT_UPDATE | IORING_LINK_TIMEOUT_UPDATE) #define IORING_TIMEOUT_UPDATE_MASK (IORING_TIMEOUT_UPDATE | IORING_LINK_TIMEOUT_UPDATE)
/* /*
* sqe->splice_flags * sqe->splice_flags
* extends splice(2) flags * extends splice(2) flags
@ -295,14 +293,6 @@ enum io_uring_op {
*/ */
#define IORING_ACCEPT_MULTISHOT (1U << 0) #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 * IORING_OP_MSG_RING command types, stored in sqe->addr
*/ */

9
io_uring/opdef.c
View file

@ -246,13 +246,12 @@ const struct io_op_def io_op_defs[] = {
.prep = io_close_prep, .prep = io_close_prep,
.issue = io_close, .issue = io_close,
}, },
[IORING_OP_RSRC_UPDATE] = { [IORING_OP_FILES_UPDATE] = {
.audit_skip = 1, .audit_skip = 1,
.iopoll = 1, .iopoll = 1,
.name = "RSRC_UPDATE", .name = "FILES_UPDATE",
.prep = io_rsrc_update_prep, .prep = io_files_update_prep,
.issue = io_rsrc_update, .issue = io_files_update,
.ioprio = 1,
}, },
[IORING_OP_STATX] = { [IORING_OP_STATX] = {
.audit_skip = 1, .audit_skip = 1,

17
io_uring/rsrc.c
View file

@ -21,7 +21,6 @@ struct io_rsrc_update {
u64 arg; u64 arg;
u32 nr_args; u32 nr_args;
u32 offset; u32 offset;
int type;
}; };
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,
@ -654,7 +653,7 @@ __cold int io_register_rsrc(struct io_ring_ctx *ctx, void __user *arg,
return -EINVAL; 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); 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) if (!up->nr_args)
return -EINVAL; return -EINVAL;
up->arg = READ_ONCE(sqe->addr); up->arg = READ_ONCE(sqe->addr);
up->type = READ_ONCE(sqe->ioprio);
return 0; return 0;
} }
@ -711,7 +709,7 @@ static int io_files_update_with_index_alloc(struct io_kiocb *req,
return ret; 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_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);
struct io_ring_ctx *ctx = req->ctx; 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; 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, int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx,
struct io_rsrc_node *node, void *rsrc) struct io_rsrc_node *node, void *rsrc)
{ {

4
io_uring/rsrc.h
View file

@ -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]; return &data->tags[table_idx][off];
} }
int io_rsrc_update(struct io_kiocb *req, unsigned int issue_flags); int io_files_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_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
int __io_account_mem(struct user_struct *user, unsigned long nr_pages); int __io_account_mem(struct user_struct *user, unsigned long nr_pages);