io_uring: split off IOPOLL argument verifiction
IOPOLL doesn't use additional arguments like sigsets, but it still needs some basic verification, which is currently done by io_get_ext_arg(). This patch adds a separate function for the IOPOLL path, which is a bit simpler and doesn't do extra. This prepares us for further patches, which would have hurt inlining in the hot path otherwise. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/71b23fca412e3374b74be7711cfd42a3d9d5dfe0.1647957378.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Родитель
57859f4d93
Коммит
f81440d33c
|
@ -10701,6 +10701,19 @@ static int io_sqpoll_wait_sq(struct io_ring_ctx *ctx)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int io_validate_ext_arg(unsigned flags, const void __user *argp, size_t argsz)
|
||||
{
|
||||
if (flags & IORING_ENTER_EXT_ARG) {
|
||||
struct io_uring_getevents_arg arg;
|
||||
|
||||
if (argsz != sizeof(arg))
|
||||
return -EINVAL;
|
||||
if (copy_from_user(&arg, argp, sizeof(arg)))
|
||||
return -EFAULT;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int io_get_ext_arg(unsigned flags, const void __user *argp, size_t *argsz,
|
||||
struct __kernel_timespec __user **ts,
|
||||
const sigset_t __user **sig)
|
||||
|
@ -10814,13 +10827,6 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
|
|||
goto out;
|
||||
}
|
||||
if (flags & IORING_ENTER_GETEVENTS) {
|
||||
const sigset_t __user *sig;
|
||||
struct __kernel_timespec __user *ts;
|
||||
|
||||
ret = io_get_ext_arg(flags, argp, &argsz, &ts, &sig);
|
||||
if (unlikely(ret))
|
||||
goto out;
|
||||
|
||||
min_complete = min(min_complete, ctx->cq_entries);
|
||||
|
||||
/*
|
||||
|
@ -10831,8 +10837,17 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
|
|||
*/
|
||||
if (ctx->flags & IORING_SETUP_IOPOLL &&
|
||||
!(ctx->flags & IORING_SETUP_SQPOLL)) {
|
||||
ret = io_validate_ext_arg(flags, argp, argsz);
|
||||
if (unlikely(ret))
|
||||
goto out;
|
||||
ret = io_iopoll_check(ctx, min_complete);
|
||||
} else {
|
||||
const sigset_t __user *sig;
|
||||
struct __kernel_timespec __user *ts;
|
||||
|
||||
ret = io_get_ext_arg(flags, argp, &argsz, &ts, &sig);
|
||||
if (unlikely(ret))
|
||||
goto out;
|
||||
ret = io_cqring_wait(ctx, min_complete, sig, argsz, ts);
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче