posix-timers:Convert to the 64bit methods for the clock_gettime syscall function
PATCH v3 12/23 posix-timers:Convert to the 64bit methods for the clock_gettime syscall function
This patch introduces the clock_get64 method with timespec64 type for k_clock structure, that makes it ready for the 2038 year.
Convert to the 64bit method with timespec64 type for the clock_gettime syscall function, and change the clock_gettime syscall implementation according to the CONFIG_64BIT macro.
Also add a default 64bit method for the clock_get64 pointer of k_clock structure, and it will be removed after all the drivers are converted to 64bit methods.
Signed-off-by Baolin Wang <[email protected]>
--- include/linux/posix-timers.h | 1 + kernel/time/posix-timers.c | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-)
include/linux/posix-timers.h +1 -0
@@ -103,6 +103,7 @@ struct k_clock {int (*clock_set64) (const clockid_t which_clock,const struct timespec64 *tp);int (*clock_get) (const clockid_t which_clock,struct timespec * tp); +int (*clock_get64) (const clockid_t which_clock,struct timespec64 *tp);int (*clock_adj) (const clockid_t which_clock,struct timex *tx);int (*timer_create) (struct k_itimer *timer); int (*nsleep) (const clockid_t which_clock, int flags,
kernel/time/posix-timers.c +30 -5
@@ -553,6 +553,20 @@ static int default_clock_set64(const clockid_t which_clock,return ret; } +static int default_clock_get64 (const clockid_t which_clock, +struct timespec64 *tp64) +{ +struct k_clock *kc =clockid_to_kclock (which_clock); +struct timespec tp; +int ret; + + ret = kc->clock_get (which_clock, &tp); +if (!ret) + *tp64 =timespec_to_timespec64 (tp); + +return ret; +} +void posix_timers_register_clock (const clockid_t clock_id,struct k_clock *new_clock) {
@@ -562,8 +576,8 @@ void posix_timers_register_clock(const clockid_t clock_id,return ; } -if (!new_clock->clock_get) { -printk (KERN_WARNING "POSIX clock id %d lacks clock_get()\n" , +if (!new_clock->clock_get && !new_clock->clock_get64) { +printk (KERN_WARNING "POSIX clock id %d lacks clock_get() and clock_get64()\n" , clock_id);return ; }
@@ -579,6 +593,8 @@ void posix_timers_register_clock(const clockid_t clock_id, new_clock->timer_set64 = default_timer_set64;if (new_clock->clock_set && !new_clock->clock_set64) new_clock->clock_set64 = default_clock_set64; +if (new_clock->clock_get && !new_clock->clock_get64) + new_clock->clock_get64 = default_clock_get64; posix_clocks[clock_id] = *new_clock; }
@@ -1123,23 +1139,32 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,#endif } -static int __clock_gettime (clockid_t which_clock,struct timespec *ts) +static int __clock_gettime (clockid_t which_clock,struct timespec64 *ts) {struct k_clock *kc =clockid_to_kclock (which_clock);if (!kc)return -EINVAL ; -return kc->clock_get (which_clock, ts); +return kc->clock_get64 (which_clock, ts); } SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock, struct timespec __user *,tp) { -struct timespec kernel_tp;int error; +#ifdef CONFIG_64BIT +struct timespec64 kernel_tp; error =__clock_gettime (which_clock, &kernel_tp); +#else +struct timespec64 kernel_tp64; +struct timespec kernel_tp; + + error =__clock_gettime (which_clock, &kernel_tp64); +if (!error) + kernel_tp =timespec64_to_timespec (kernel_tp64); +#endif if (!error &©_to_user (tp, &kernel_tp,sizeof (kernel_tp))) error = -EFAULT ;
Signature · 1 line
1.7.9.5