|
@@ -35,8 +35,9 @@ struct timerfd_ctx {
|
|
|
ktime_t moffs;
|
|
|
wait_queue_head_t wqh;
|
|
|
u64 ticks;
|
|
|
- int expired;
|
|
|
int clockid;
|
|
|
+ short unsigned expired;
|
|
|
+ short unsigned settime_flags; /* to show in fdinfo */
|
|
|
struct rcu_head rcu;
|
|
|
struct list_head clist;
|
|
|
bool might_cancel;
|
|
@@ -196,6 +197,8 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
|
|
|
if (timerfd_canceled(ctx))
|
|
|
return -ECANCELED;
|
|
|
}
|
|
|
+
|
|
|
+ ctx->settime_flags = flags & TFD_SETTIME_FLAGS;
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -284,11 +287,40 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_PROC_FS
|
|
|
+static int timerfd_show(struct seq_file *m, struct file *file)
|
|
|
+{
|
|
|
+ struct timerfd_ctx *ctx = file->private_data;
|
|
|
+ struct itimerspec t;
|
|
|
+
|
|
|
+ spin_lock_irq(&ctx->wqh.lock);
|
|
|
+ t.it_value = ktime_to_timespec(timerfd_get_remaining(ctx));
|
|
|
+ t.it_interval = ktime_to_timespec(ctx->tintv);
|
|
|
+ spin_unlock_irq(&ctx->wqh.lock);
|
|
|
+
|
|
|
+ return seq_printf(m,
|
|
|
+ "clockid: %d\n"
|
|
|
+ "ticks: %llu\n"
|
|
|
+ "settime flags: 0%o\n"
|
|
|
+ "it_value: (%llu, %llu)\n"
|
|
|
+ "it_interval: (%llu, %llu)\n",
|
|
|
+ ctx->clockid, (unsigned long long)ctx->ticks,
|
|
|
+ ctx->settime_flags,
|
|
|
+ (unsigned long long)t.it_value.tv_sec,
|
|
|
+ (unsigned long long)t.it_value.tv_nsec,
|
|
|
+ (unsigned long long)t.it_interval.tv_sec,
|
|
|
+ (unsigned long long)t.it_interval.tv_nsec);
|
|
|
+}
|
|
|
+#else
|
|
|
+#define timerfd_show NULL
|
|
|
+#endif
|
|
|
+
|
|
|
static const struct file_operations timerfd_fops = {
|
|
|
.release = timerfd_release,
|
|
|
.poll = timerfd_poll,
|
|
|
.read = timerfd_read,
|
|
|
.llseek = noop_llseek,
|
|
|
+ .show_fdinfo = timerfd_show,
|
|
|
};
|
|
|
|
|
|
static int timerfd_fget(int fd, struct fd *p)
|