Deduplicate fd-to-ctx conversions
Subsystems (2)
Jens Axboe
maintainercover Deduplicate fd-to-ctx conversions
Hi,
io_uring_register_get_file() exists to return a file associated with a struct io_ring_ctx, dealing with both registered ring descriptors and with normal file descriptors. There are a few users of this, but the main io_uring_enter(2) syscall handrolls its own.
Deduplicate that by avoiding the fget/fput for the registered ring descriptor, as that cannot go away since it's private to the task doing the operation. Unify how the file is put because of that, and then we can convert io_uring_enter(2) to use this helper too and move it closer to the hot path of the actual syscall. Then we only have a single way of doing the ctx retrieval, rather than two separate ones.
io_uring/bpf-ops.c | 2 +- io_uring/io_uring.c | 57 ++++++++++++++++++++++++++++----------------- io_uring/io_uring.h | 1 + io_uring/register.c | 39 +++---------------------------- io_uring/register.h | 1 - io_uring/rsrc.c | 5 ++-- 6 files changed, 44 insertions(+), 61 deletions(-)
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring/register: don't get a reference to the registered ring fd
This isn't necessary and was only done because the register path isn't a hot path and hence the extra ref/put doesn't matter, and to have the exit path be able to unconditionally put whatever file was gotten regardless of the type.
In preparation for sharing this code with the main io_uring_enter(2) syscall, drop the reference and have the caller conditionally put the file if it was a normal file descriptor.
--- io_uring/register.c | 8 ++++---- io_uring/rsrc.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-)
io_uring/register.c +4 -4
@@ -941,7 +941,8 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,/* * Given an 'fd' value, return the ctx associated with if. If 'registered' is * true, then the registered index is used. Otherwise, the normal fd table. -* Caller must call fput() on the returned file, unless it's an ERR_PTR. +* Caller must call fput() on the returned file if it isn't a registered file, +* unless it's an ERR_PTR. */ struct file *io_uring_register_get_file (unsigned int fd,bool registered) {
@@ -958,8 +959,6 @@ struct file *io_uring_register_get_file(unsigned int fd, bool registered)return ERR_PTR (-EINVAL ); fd =array_index_nospec (fd,IO_RINGFD_REG_MAX ); file = tctx->registered_rings[fd]; -if (file) -get_file (file); }else { file =fget (fd); }
@@ -1038,6 +1037,7 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode, ctx->buf_table.nr, ret);mutex_unlock (&ctx->uring_lock); -fput (file); +if (!use_registered_ring) +fput (file);return ret; }
io_uring/rsrc.c +2 -1
@@ -1291,7 +1291,8 @@ int io_register_clone_buffers(struct io_ring_ctx *ctx, void __user *arg)if (src_ctx != ctx)mutex_unlock (&src_ctx->uring_lock); -fput (file); +if (!registered_src) +fput (file);return ret; }
Signature · 1 line
2.53.0
Jens Axboe
maintainerPATCH 2/2 io_uring: unify getting ctx from passed in file descriptor
In reply to Jens Axboeio_uring_enter() and io_uring_register() end up having duplicated code for getting a ctx from a passed in file descriptor, for either a registered ring descriptor or a normal file descriptor. Move the io_uring_register_get_file() into io_uring.c and name it a bit more generically, and use it from both callsites rather than have that logic and handling duplicated.
--- io_uring/bpf-ops.c | 2 +- io_uring/io_uring.c | 57 ++++++++++++++++++++++++++++----------------- io_uring/io_uring.h | 1 + io_uring/register.c | 35 +--------------------------- io_uring/register.h | 1 - io_uring/rsrc.c | 2 +- 6 files changed, 40 insertions(+), 58 deletions(-)
io_uring/bpf-ops.c +1 -1
@@ -181,7 +181,7 @@ static int bpf_io_reg(void *kdata, struct bpf_link *link)struct file *file;int ret = -EBUSY ; - file =io_uring_register_get_file (ops->ring_fd, false); + file =io_uring_ctx_get_file (ops->ring_fd, false);if (IS_ERR (file))return PTR_ERR (file); ctx = file->private_data;
io_uring/io_uring.c +36 -21
75 lines not on this page · raw message
io_uring/io_uring.h +1 -0
@@ -173,6 +173,7 @@ void io_req_track_inflight(struct io_kiocb *req);struct file *io_file_get_normal (struct io_kiocb *req,int fd);struct file *io_file_get_fixed (struct io_kiocb *req,int fd,unsigned issue_flags); +struct file *io_uring_ctx_get_file (unsigned int fd,bool registered);void io_req_task_queue (struct io_kiocb *req);void io_req_task_complete (struct io_tw_req tw_req,io_tw_token_t tw);
io_uring/register.c +1 -34
@@ -938,39 +938,6 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,return ret; } -/* -* Given an 'fd' value, return the ctx associated with if. If 'registered' is -* true, then the registered index is used. Otherwise, the normal fd table. -* Caller must call fput() on the returned file if it isn't a registered file, -* unless it's an ERR_PTR. -*/ -struct file *io_uring_register_get_file (unsigned int fd,bool registered) -{ -struct file *file; - -if (registered) { -/* -* Ring fd has been registered via IORING_REGISTER_RING_FDS, we -* need only dereference our task private array to find it. -*/ -struct io_uring_task *tctx = current->io_uring; - -if (unlikely (!tctx || fd >=IO_RINGFD_REG_MAX )) -return ERR_PTR (-EINVAL ); - fd =array_index_nospec (fd,IO_RINGFD_REG_MAX ); - file = tctx->registered_rings[fd]; - }else { - file =fget (fd); - } - -if (unlikely (!file)) -return ERR_PTR (-EBADF ); -if (io_is_uring_fops (file)) -return file; -fput (file); -return ERR_PTR (-EOPNOTSUPP ); -} -static int io_uring_register_send_msg_ring (void __user *arg,unsigned int nr_args) {struct io_uring_sqe sqe;
@@ -1025,7 +992,7 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode,if (fd ==-1 )return io_uring_register_blind (opcode, arg, nr_args); - file =io_uring_register_get_file (fd, use_registered_ring); + file =io_uring_ctx_get_file (fd, use_registered_ring);if (IS_ERR (file))return PTR_ERR (file); ctx = file->private_data;
io_uring/register.h +0 -1
@@ -4,6 +4,5 @@int io_eventfd_unregister (struct io_ring_ctx *ctx);int io_unregister_personality (struct io_ring_ctx *ctx,unsigned id); -struct file *io_uring_register_get_file (unsigned int fd,bool registered);#endif
io_uring/rsrc.c +1 -1
@@ -1269,7 +1269,7 @@ int io_register_clone_buffers(struct io_ring_ctx *ctx, void __user *arg)return -EINVAL ; registered_src = (buf.flags &IORING_REGISTER_SRC_REGISTERED ) !=0 ; - file =io_uring_register_get_file (buf.src_fd, registered_src); + file =io_uring_ctx_get_file (buf.src_fd, registered_src);if (IS_ERR (file))return PTR_ERR (file);
Signature · 1 line
2.53.0