lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 13/22] posix-timers:Convert to the 64bit methods for the clock_getres syscall function
Date
This patch introduces the clock_getres64 method with timespec64 type for k_clock
structure.

Convert to the 64bit method with timespec64 type for the clock_getres syscall
function, and change the clock_getres syscall implementation according the the
CONFIG_64BIT macro.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
include/linux/posix-timers.h | 1 +
kernel/time/posix-timers.c | 35 ++++++++++++++++++++++++++++-------
2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index c08a536..9a5a211 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -98,6 +98,7 @@ struct k_itimer {

struct k_clock {
int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
+ int (*clock_getres64) (const clockid_t which_clock, struct timespec64 *tp);
int (*clock_set) (const clockid_t which_clock,
const struct timespec *tp);
int (*clock_set64) (const clockid_t which_clock,
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 456c588..b93b637 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -555,6 +555,16 @@ static int default_clock_get64(const clockid_t which_clock,
return 0;
}

+static int default_clock_getres64(const clockid_t which_clock,
+ struct timespec64 *tp64)
+{
+ struct k_clock *kc = clockid_to_kclock(which_clock);
+ struct timespec tp;
+
+ kc->clock_getres(which_clock, &tp);
+ return 0;
+}
+
void posix_timers_register_clock(const clockid_t clock_id,
struct k_clock *new_clock)
{
@@ -569,8 +579,8 @@ void posix_timers_register_clock(const clockid_t clock_id,
clock_id);
return;
}
- if (!new_clock->clock_getres) {
- printk(KERN_WARNING "POSIX clock id %d lacks clock_getres()\n",
+ if (!new_clock->clock_getres && !new_clock->clock_getres64) {
+ printk(KERN_WARNING "POSIX clock id %d lacks clock_getres() and clock_getres64()\n",
clock_id);
return;
}
@@ -583,6 +593,8 @@ void posix_timers_register_clock(const clockid_t clock_id,
new_clock->clock_set64 = default_clock_set64;
if (new_clock->clock_get && !new_clock->clock_get64)
new_clock->clock_get64 = default_clock_get64;
+ if (new_clock->clock_getres && !new_clock->clock_getres64)
+ new_clock->clock_getres64 = default_clock_getres64;

posix_clocks[clock_id] = *new_clock;
}
@@ -630,7 +642,8 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
return (id & CLOCKFD_MASK) == CLOCKFD ?
&clock_posix_dynamic : &clock_posix_cpu;

- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
+ if (id >= MAX_CLOCKS || (!posix_clocks[id].clock_getres
+ && !posix_clocks[id].clock_getres64))
return NULL;
return &posix_clocks[id];
}
@@ -1182,23 +1195,31 @@ SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
return err;
}

-static int __clock_getres(clockid_t which_clock, struct timespec *ts)
+static int __clock_getres(clockid_t which_clock, struct timespec64 *ts)
{
struct k_clock *kc = clockid_to_kclock(which_clock);

if (!kc)
return -EINVAL;

- return kc->clock_getres(which_clock, ts);
+ return kc->clock_getres64(which_clock, ts);
}

SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
struct timespec __user *, tp)
{
- struct timespec rtn_tp;
int error;
-
+#ifdef CONFIG_64BIT
+ struct timespec64 rtn_tp;
error = __clock_getres(which_clock, &rtn_tp);
+#else
+ struct timespec64 rtn_tp64;
+ struct timespec rtn_tp;
+
+ error = __clock_getres(which_clock, &rtn_tp64);
+ if (!error)
+ rtn_tp = timespec64_to_timespec(rtn_tp64);
+#endif

if (!error && tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp)))
error = -EFAULT;
--
1.7.9.5


\
 
 \ /
  Last update: 2015-05-11 13:41    [W:0.026 / U:1.156 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site