mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 06:01:57 +00:00
io_uring/register: provide helper to get io_ring_ctx from 'fd'
Can be done in one of two ways: 1) Regular file descriptor, just fget() 2) Registered ring, index our own table for that In preparation for adding another register use of needing to get a ctx from a file descriptor, abstract out this helper and use it in the main register syscall as well. Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
bfc0aa7a51
commit
0b6d253e08
@ -550,6 +550,38 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
|
|||||||
return ret;
|
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, unless it's an ERR_PTR.
|
||||||
|
*/
|
||||||
|
struct file *io_uring_register_get_file(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);
|
||||||
|
}
|
||||||
|
|
||||||
SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode,
|
SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode,
|
||||||
void __user *, arg, unsigned int, nr_args)
|
void __user *, arg, unsigned int, nr_args)
|
||||||
{
|
{
|
||||||
@ -564,35 +596,15 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode,
|
|||||||
if (opcode >= IORING_REGISTER_LAST)
|
if (opcode >= IORING_REGISTER_LAST)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (use_registered_ring) {
|
file = io_uring_register_get_file(fd, use_registered_ring);
|
||||||
/*
|
if (IS_ERR(file))
|
||||||
* Ring fd has been registered via IORING_REGISTER_RING_FDS, we
|
return PTR_ERR(file);
|
||||||
* 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 -EINVAL;
|
|
||||||
fd = array_index_nospec(fd, IO_RINGFD_REG_MAX);
|
|
||||||
file = tctx->registered_rings[fd];
|
|
||||||
if (unlikely(!file))
|
|
||||||
return -EBADF;
|
|
||||||
} else {
|
|
||||||
file = fget(fd);
|
|
||||||
if (unlikely(!file))
|
|
||||||
return -EBADF;
|
|
||||||
ret = -EOPNOTSUPP;
|
|
||||||
if (!io_is_uring_fops(file))
|
|
||||||
goto out_fput;
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx = file->private_data;
|
ctx = file->private_data;
|
||||||
|
|
||||||
mutex_lock(&ctx->uring_lock);
|
mutex_lock(&ctx->uring_lock);
|
||||||
ret = __io_uring_register(ctx, opcode, arg, nr_args);
|
ret = __io_uring_register(ctx, opcode, arg, nr_args);
|
||||||
mutex_unlock(&ctx->uring_lock);
|
mutex_unlock(&ctx->uring_lock);
|
||||||
trace_io_uring_register(ctx, opcode, ctx->nr_user_files, ctx->nr_user_bufs, ret);
|
trace_io_uring_register(ctx, opcode, ctx->nr_user_files, ctx->nr_user_bufs, ret);
|
||||||
out_fput:
|
|
||||||
if (!use_registered_ring)
|
if (!use_registered_ring)
|
||||||
fput(file);
|
fput(file);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -4,5 +4,6 @@
|
|||||||
|
|
||||||
int io_eventfd_unregister(struct io_ring_ctx *ctx);
|
int io_eventfd_unregister(struct io_ring_ctx *ctx);
|
||||||
int io_unregister_personality(struct io_ring_ctx *ctx, unsigned id);
|
int io_unregister_personality(struct io_ring_ctx *ctx, unsigned id);
|
||||||
|
struct file *io_uring_register_get_file(int fd, bool registered);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user