Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: switch struct ext_arg from __kernel_timespec to timespec64

Browse Source 
This avoids intermediate storage for turning a __kernel_timespec
user pointer into an on-stack struct timespec64, only then to turn it
into a ktime_t.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-10-22 13:37:00 -06:00
parent b898b8c99e
commit 0a54a7dd0a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
io_uring/io_uring.c
View File

@ -2495,9 +2495,10 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
struct ext_arg { struct ext_arg {
size_t argsz; size_t argsz;
struct __kernel_timespec __user *ts; struct timespec64 ts;
const sigset_t __user *sig; const sigset_t __user *sig;
ktime_t min_time; ktime_t min_time;
bool ts_set;
}; };
/* /*
@ -2535,13 +2536,8 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, u32 flags,
iowq.timeout = KTIME_MAX; iowq.timeout = KTIME_MAX;
start_time = io_get_time(ctx); start_time = io_get_time(ctx);
if (ext_arg->ts) { if (ext_arg->ts_set) {
struct timespec64 ts; iowq.timeout = timespec64_to_ktime(ext_arg->ts);
if (get_timespec64(&ts, ext_arg->ts))
return -EFAULT;
iowq.timeout = timespec64_to_ktime(ts);
if (!(flags & IORING_ENTER_ABS_TIMER)) if (!(flags & IORING_ENTER_ABS_TIMER))
iowq.timeout = ktime_add(iowq.timeout, start_time); iowq.timeout = ktime_add(iowq.timeout, start_time);
} }
@ -3252,7 +3248,6 @@ static int io_get_ext_arg(unsigned flags, const void __user *argp,
*/ */
if (!(flags & IORING_ENTER_EXT_ARG)) { if (!(flags & IORING_ENTER_EXT_ARG)) {
ext_arg->sig = (const sigset_t __user *) argp; ext_arg->sig = (const sigset_t __user *) argp;
ext_arg->ts = NULL;
return 0; return 0;
} }
@ -3267,7 +3262,11 @@ static int io_get_ext_arg(unsigned flags, const void __user *argp,
ext_arg->min_time = arg.min_wait_usec * NSEC_PER_USEC; ext_arg->min_time = arg.min_wait_usec * NSEC_PER_USEC;
ext_arg->sig = u64_to_user_ptr(arg.sigmask); ext_arg->sig = u64_to_user_ptr(arg.sigmask);
ext_arg->argsz = arg.sigmask_sz; ext_arg->argsz = arg.sigmask_sz;
ext_arg->ts = u64_to_user_ptr(arg.ts); if (arg.ts) {
if (get_timespec64(&ext_arg->ts, u64_to_user_ptr(arg.ts)))
return -EFAULT;
ext_arg->ts_set = true;
}
return 0; return 0;
} }