UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

io_uring: add a helper timeout mode calculation 

Deduplicates translation of timeout flags into hrtimer_mode.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-01-19 13:32:44 +00:00 committed by Jens Axboe
parent eab30c4d20
commit 8662daec09
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/io_uring.c
View File

@ -5771,6 +5771,12 @@ static int io_timeout_remove_prep(struct io_kiocb *req,
return 0; return 0;
} }
static inline enum hrtimer_mode io_translate_timeout_mode(unsigned int flags)
{
return (flags & IORING_TIMEOUT_ABS) ? HRTIMER_MODE_ABS
: HRTIMER_MODE_REL;
}
/* /*
* Remove or update an existing timeout command * Remove or update an existing timeout command
*/ */
@ -5781,14 +5787,11 @@ static int io_timeout_remove(struct io_kiocb *req)
int ret; int ret;
spin_lock_irq(&ctx->completion_lock); spin_lock_irq(&ctx->completion_lock);
if (req->timeout_rem.flags & IORING_TIMEOUT_UPDATE) { if (!(req->timeout_rem.flags & IORING_TIMEOUT_UPDATE))
enum hrtimer_mode mode = (tr->flags & IORING_TIMEOUT_ABS)
? HRTIMER_MODE_ABS : HRTIMER_MODE_REL;
ret = io_timeout_update(ctx, tr->addr, &tr->ts, mode);
} else {
ret = io_timeout_cancel(ctx, tr->addr); ret = io_timeout_cancel(ctx, tr->addr);
} else
ret = io_timeout_update(ctx, tr->addr, &tr->ts,
io_translate_timeout_mode(tr->flags));
io_cqring_fill_event(req, ret); io_cqring_fill_event(req, ret);
io_commit_cqring(ctx); io_commit_cqring(ctx);
@ -5828,11 +5831,7 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
if (get_timespec64(&data->ts, u64_to_user_ptr(sqe->addr))) if (get_timespec64(&data->ts, u64_to_user_ptr(sqe->addr)))
return -EFAULT; return -EFAULT;
if (flags & IORING_TIMEOUT_ABS) data->mode = io_translate_timeout_mode(flags);
data->mode = HRTIMER_MODE_ABS;
else
data->mode = HRTIMER_MODE_REL;
hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode); hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode);
return 0; return 0;
} }