timerfd: add alarm timers
Add support for clocks CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM. Change-Id: Iafc8445d3d7ffb35110c860f1607bf03f1edb895 Signed-off-by: Todd Poynor <toddpoynor@google.com> Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
Todd Poynor
Francescodario Cuzzocrea
parent
d051f7de4f
commit
dfb1eb8bcf
122
fs/timerfd.c
122
fs/timerfd.c
|
|
@ -8,6 +8,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/alarmtimer.h>
|
||||
#include <linux/file.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/init.h>
|
||||
|
|
@ -25,7 +26,10 @@
|
|||
#include <linux/rcupdate.h>
|
||||
|
||||
struct timerfd_ctx {
|
||||
struct hrtimer tmr;
|
||||
union {
|
||||
struct hrtimer tmr;
|
||||
struct alarm alarm;
|
||||
} t;
|
||||
ktime_t tintv;
|
||||
ktime_t moffs;
|
||||
wait_queue_head_t wqh;
|
||||
|
|
@ -41,14 +45,19 @@ struct timerfd_ctx {
|
|||
static LIST_HEAD(cancel_list);
|
||||
static DEFINE_SPINLOCK(cancel_lock);
|
||||
|
||||
static inline bool isalarm(struct timerfd_ctx *ctx)
|
||||
{
|
||||
return ctx->clockid == CLOCK_REALTIME_ALARM ||
|
||||
ctx->clockid == CLOCK_BOOTTIME_ALARM;
|
||||
}
|
||||
|
||||
/*
|
||||
* This gets called when the timer event triggers. We set the "expired"
|
||||
* flag, but we do not re-arm the timer (in case it's necessary,
|
||||
* tintv.tv64 != 0) until the timer is accessed.
|
||||
*/
|
||||
static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)
|
||||
static void timerfd_triggered(struct timerfd_ctx *ctx)
|
||||
{
|
||||
struct timerfd_ctx *ctx = container_of(htmr, struct timerfd_ctx, tmr);
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&ctx->wqh.lock, flags);
|
||||
|
|
@ -56,10 +65,25 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)
|
|||
ctx->ticks++;
|
||||
wake_up_locked(&ctx->wqh);
|
||||
spin_unlock_irqrestore(&ctx->wqh.lock, flags);
|
||||
}
|
||||
|
||||
static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr)
|
||||
{
|
||||
struct timerfd_ctx *ctx = container_of(htmr, struct timerfd_ctx,
|
||||
t.tmr);
|
||||
timerfd_triggered(ctx);
|
||||
return HRTIMER_NORESTART;
|
||||
}
|
||||
|
||||
static enum alarmtimer_restart timerfd_alarmproc(struct alarm *alarm,
|
||||
ktime_t now)
|
||||
{
|
||||
struct timerfd_ctx *ctx = container_of(alarm, struct timerfd_ctx,
|
||||
t.alarm);
|
||||
timerfd_triggered(ctx);
|
||||
return ALARMTIMER_NORESTART;
|
||||
}
|
||||
|
||||
/*
|
||||
* Called when the clock was set to cancel the timers in the cancel
|
||||
* list. This will wake up processes waiting on these timers. The
|
||||
|
|
@ -134,7 +158,11 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx)
|
|||
{
|
||||
ktime_t remaining;
|
||||
|
||||
remaining = hrtimer_expires_remaining(&ctx->tmr);
|
||||
if (isalarm(ctx))
|
||||
remaining = alarm_expires_remaining(&ctx->t.alarm);
|
||||
else
|
||||
remaining = hrtimer_expires_remaining(&ctx->t.tmr);
|
||||
|
||||
return remaining.tv64 < 0 ? ktime_set(0, 0): remaining;
|
||||
}
|
||||
|
||||
|
|
@ -152,11 +180,28 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
|
|||
ctx->expired = 0;
|
||||
ctx->ticks = 0;
|
||||
ctx->tintv = timespec_to_ktime(ktmr->it_interval);
|
||||
hrtimer_init(&ctx->tmr, clockid, htmode);
|
||||
hrtimer_set_expires(&ctx->tmr, texp);
|
||||
ctx->tmr.function = timerfd_tmrproc;
|
||||
|
||||
if (isalarm(ctx)) {
|
||||
alarm_init(&ctx->t.alarm,
|
||||
ctx->clockid == CLOCK_REALTIME_ALARM ?
|
||||
ALARM_REALTIME : ALARM_BOOTTIME,
|
||||
timerfd_alarmproc);
|
||||
} else {
|
||||
hrtimer_init(&ctx->t.tmr, clockid, htmode);
|
||||
hrtimer_set_expires(&ctx->t.tmr, texp);
|
||||
ctx->t.tmr.function = timerfd_tmrproc;
|
||||
}
|
||||
|
||||
if (texp.tv64 != 0) {
|
||||
hrtimer_start(&ctx->tmr, texp, htmode);
|
||||
if (isalarm(ctx)) {
|
||||
if (flags & TFD_TIMER_ABSTIME)
|
||||
alarm_start(&ctx->t.alarm, texp);
|
||||
else
|
||||
alarm_start_relative(&ctx->t.alarm, texp);
|
||||
} else {
|
||||
hrtimer_start(&ctx->t.tmr, texp, htmode);
|
||||
}
|
||||
|
||||
if (timerfd_canceled(ctx))
|
||||
return -ECANCELED;
|
||||
}
|
||||
|
|
@ -168,7 +213,11 @@ static int timerfd_release(struct inode *inode, struct file *file)
|
|||
struct timerfd_ctx *ctx = file->private_data;
|
||||
|
||||
timerfd_remove_cancel(ctx);
|
||||
hrtimer_cancel(&ctx->tmr);
|
||||
|
||||
if (isalarm(ctx))
|
||||
alarm_cancel(&ctx->t.alarm);
|
||||
else
|
||||
hrtimer_cancel(&ctx->t.tmr);
|
||||
kfree_rcu(ctx, rcu);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -225,9 +274,15 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
|
|||
* callback to avoid DoS attacks specifying a very
|
||||
* short timer period.
|
||||
*/
|
||||
ticks += hrtimer_forward_now(&ctx->tmr,
|
||||
ctx->tintv) - 1;
|
||||
hrtimer_restart(&ctx->tmr);
|
||||
if (isalarm(ctx)) {
|
||||
ticks += alarm_forward_now(
|
||||
&ctx->t.alarm, ctx->tintv) - 1;
|
||||
alarm_restart(&ctx->t.alarm);
|
||||
} else {
|
||||
ticks += hrtimer_forward_now(&ctx->t.tmr,
|
||||
ctx->tintv) - 1;
|
||||
hrtimer_restart(&ctx->t.tmr);
|
||||
}
|
||||
}
|
||||
ctx->expired = 0;
|
||||
ctx->ticks = 0;
|
||||
|
|
@ -284,7 +339,15 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
|
|||
init_waitqueue_head(&ctx->wqh);
|
||||
spin_lock_init(&ctx->cancel_lock);
|
||||
ctx->clockid = clockid;
|
||||
hrtimer_init(&ctx->tmr, clockid, HRTIMER_MODE_ABS);
|
||||
|
||||
if (isalarm(ctx))
|
||||
alarm_init(&ctx->t.alarm,
|
||||
ctx->clockid == CLOCK_REALTIME_ALARM ?
|
||||
ALARM_REALTIME : ALARM_BOOTTIME,
|
||||
timerfd_alarmproc);
|
||||
else
|
||||
hrtimer_init(&ctx->t.tmr, clockid, HRTIMER_MODE_ABS);
|
||||
|
||||
ctx->moffs = ktime_get_monotonic_offset();
|
||||
|
||||
ufd = anon_inode_getfd("[timerfd]", &timerfd_fops, ctx,
|
||||
|
|
@ -325,8 +388,14 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
|
|||
*/
|
||||
for (;;) {
|
||||
spin_lock_irq(&ctx->wqh.lock);
|
||||
if (hrtimer_try_to_cancel(&ctx->tmr) >= 0)
|
||||
break;
|
||||
|
||||
if (isalarm(ctx)) {
|
||||
if (alarm_try_to_cancel(&ctx->t.alarm) >= 0)
|
||||
break;
|
||||
} else {
|
||||
if (hrtimer_try_to_cancel(&ctx->t.tmr) >= 0)
|
||||
break;
|
||||
}
|
||||
spin_unlock_irq(&ctx->wqh.lock);
|
||||
cpu_relax();
|
||||
}
|
||||
|
|
@ -337,8 +406,12 @@ SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
|
|||
* We do not update "ticks" and "expired" since the timer will be
|
||||
* re-programmed again in the following timerfd_setup() call.
|
||||
*/
|
||||
if (ctx->expired && ctx->tintv.tv64)
|
||||
hrtimer_forward_now(&ctx->tmr, ctx->tintv);
|
||||
if (ctx->expired && ctx->tintv.tv64) {
|
||||
if (isalarm(ctx))
|
||||
alarm_forward_now(&ctx->t.alarm, ctx->tintv);
|
||||
else
|
||||
hrtimer_forward_now(&ctx->t.tmr, ctx->tintv);
|
||||
}
|
||||
|
||||
kotmr.it_value = ktime_to_timespec(timerfd_get_remaining(ctx));
|
||||
kotmr.it_interval = ktime_to_timespec(ctx->tintv);
|
||||
|
|
@ -371,9 +444,18 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)
|
|||
spin_lock_irq(&ctx->wqh.lock);
|
||||
if (ctx->expired && ctx->tintv.tv64) {
|
||||
ctx->expired = 0;
|
||||
ctx->ticks +=
|
||||
hrtimer_forward_now(&ctx->tmr, ctx->tintv) - 1;
|
||||
hrtimer_restart(&ctx->tmr);
|
||||
|
||||
if (isalarm(ctx)) {
|
||||
ctx->ticks +=
|
||||
alarm_forward_now(
|
||||
&ctx->t.alarm, ctx->tintv) - 1;
|
||||
alarm_restart(&ctx->t.alarm);
|
||||
} else {
|
||||
ctx->ticks +=
|
||||
hrtimer_forward_now(&ctx->t.tmr, ctx->tintv)
|
||||
- 1;
|
||||
hrtimer_restart(&ctx->t.tmr);
|
||||
}
|
||||
}
|
||||
kotmr.it_value = ktime_to_timespec(timerfd_get_remaining(ctx));
|
||||
kotmr.it_interval = ktime_to_timespec(ctx->tintv);
|
||||
|
|
|
|||
Loading…
Reference in New Issue