Y2038 April 2015

y2038@lists.linaro.org

11 participants
38 discussions

Re: [Y2038] [PATCH v3 10/10] k_clock:Remove the 32bit methods with timespec type

by Arnd Bergmann

On Saturday 11 April 2015 18:46:56 Baolin Wang wrote: > All of the k_clock users have been converted to the new methods. This patch > removes the older methods with timepsec type. As a result, the k_clock > structure is ready for the year 2038. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> > --- As mentioned in my earlier reply to an older thread, a better way to do this would be to just remove the unused function calls (clock_set, clock_get, clock_getres) and leave the newly introduced code in place. Otherwise the patch is technically correct as far as I can tell, so this is more of a style issue. Arnd > diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c > index 1d64a0e..c70f82b 100644 > --- a/drivers/char/mmtimer.c > +++ b/drivers/char/mmtimer.c > @@ -773,9 +773,9 @@ static int sgi_clock_getres(const clockid_t which_clock, struct timespec64 *tp) > } > > static struct k_clock sgi_clock = { > - .clock_set64 = sgi_clock_set, > - .clock_get64 = sgi_clock_get, > - .clock_getres64 = sgi_clock_getres, > + .clock_set = sgi_clock_set, > + .clock_get = sgi_clock_get, > + .clock_getres = sgi_clock_getres, > .timer_create = sgi_timer_create, > .timer_set = sgi_timer_set, > .timer_del = sgi_timer_del, > diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h > index ff0b81f..4059129 100644 > --- a/include/linux/posix-timers.h > +++ b/include/linux/posix-timers.h > @@ -97,15 +97,11 @@ 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, > + int (*clock_getres) (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, > 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_get) (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, > diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c > index 7aefb7f..114e8fb 100644 > --- a/kernel/time/alarmtimer.c > +++ b/kernel/time/alarmtimer.c > @@ -825,8 +825,8 @@ static int __init alarmtimer_init(void) > int error = 0; > int i; > struct k_clock alarm_clock = { > - .clock_getres64 = alarm_clock_getres, > - .clock_get64 = alarm_clock_get, > + .clock_getres = alarm_clock_getres, > + .clock_get = alarm_clock_get, > .timer_create = alarm_timer_create, > .timer_set = alarm_timer_set, > .timer_del = alarm_timer_del, > diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c > index f425caf..0a1eb98 100644 > --- a/kernel/time/posix-clock.c > +++ b/kernel/time/posix-clock.c > @@ -435,9 +435,9 @@ static int pc_timer_settime(struct k_itimer *kit, int flags, > } > > struct k_clock clock_posix_dynamic = { > - .clock_getres64 = pc_clock_getres, > - .clock_set64 = pc_clock_settime, > - .clock_get64 = pc_clock_gettime, > + .clock_getres = pc_clock_getres, > + .clock_set = pc_clock_settime, > + .clock_get = pc_clock_gettime, > .clock_adj = pc_clock_adjtime, > .timer_create = pc_timer_create, > .timer_set = pc_timer_settime, > diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c > index 7bd88f6..d7fa1ab 100644 > --- a/kernel/time/posix-cpu-timers.c > +++ b/kernel/time/posix-cpu-timers.c > @@ -1446,9 +1446,9 @@ static int thread_cpu_timer_create(struct k_itimer *timer) > } > > struct k_clock clock_posix_cpu = { > - .clock_getres64 = posix_cpu_clock_getres, > - .clock_set64 = posix_cpu_clock_set, > - .clock_get64 = posix_cpu_clock_get, > + .clock_getres = posix_cpu_clock_getres, > + .clock_set = posix_cpu_clock_set, > + .clock_get = posix_cpu_clock_get, > .timer_create = posix_cpu_timer_create, > .nsleep = posix_cpu_nsleep, > .nsleep_restart = posix_cpu_nsleep_restart, > @@ -1460,15 +1460,15 @@ struct k_clock clock_posix_cpu = { > static __init int init_posix_cpu_timers(void) > { > struct k_clock process = { > - .clock_getres64 = process_cpu_clock_getres, > - .clock_get64 = process_cpu_clock_get, > + .clock_getres = process_cpu_clock_getres, > + .clock_get = process_cpu_clock_get, > .timer_create = process_cpu_timer_create, > .nsleep = process_cpu_nsleep, > .nsleep_restart = process_cpu_nsleep_restart, > }; > struct k_clock thread = { > - .clock_getres64 = thread_cpu_clock_getres, > - .clock_get64 = thread_cpu_clock_get, > + .clock_getres = thread_cpu_clock_getres, > + .clock_get = thread_cpu_clock_get, > .timer_create = thread_cpu_timer_create, > }; > struct timespec ts; > diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c > index 2c55be1..1625541 100644 > --- a/kernel/time/posix-timers.c > +++ b/kernel/time/posix-timers.c > @@ -284,9 +284,9 @@ static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp) > static __init int init_posix_timers(void) > { > struct k_clock clock_realtime = { > - .clock_getres64 = hrtimer_get_res64, > - .clock_get64 = posix_clock_realtime_get, > - .clock_set64 = posix_clock_realtime_set, > + .clock_getres = hrtimer_get_res64, > + .clock_get = posix_clock_realtime_get, > + .clock_set = posix_clock_realtime_set, > .clock_adj = posix_clock_realtime_adj, > .nsleep = common_nsleep, > .nsleep_restart = hrtimer_nanosleep_restart, > @@ -296,8 +296,8 @@ static __init int init_posix_timers(void) > .timer_del = common_timer_del, > }; > struct k_clock clock_monotonic = { > - .clock_getres64 = hrtimer_get_res64, > - .clock_get64 = posix_ktime_get_ts, > + .clock_getres = hrtimer_get_res64, > + .clock_get = posix_ktime_get_ts, > .nsleep = common_nsleep, > .nsleep_restart = hrtimer_nanosleep_restart, > .timer_create = common_timer_create, > @@ -306,20 +306,20 @@ static __init int init_posix_timers(void) > .timer_del = common_timer_del, > }; > struct k_clock clock_monotonic_raw = { > - .clock_getres64 = hrtimer_get_res64, > - .clock_get64 = posix_get_monotonic_raw, > + .clock_getres = hrtimer_get_res64, > + .clock_get = posix_get_monotonic_raw, > }; > struct k_clock clock_realtime_coarse = { > - .clock_getres64 = posix_get_coarse_res, > - .clock_get64 = posix_get_realtime_coarse, > + .clock_getres = posix_get_coarse_res, > + .clock_get = posix_get_realtime_coarse, > }; > struct k_clock clock_monotonic_coarse = { > - .clock_getres64 = posix_get_coarse_res, > - .clock_get64 = posix_get_monotonic_coarse, > + .clock_getres = posix_get_coarse_res, > + .clock_get = posix_get_monotonic_coarse, > }; > struct k_clock clock_tai = { > - .clock_getres64 = hrtimer_get_res64, > - .clock_get64 = posix_get_tai, > + .clock_getres = hrtimer_get_res64, > + .clock_get = posix_get_tai, > .nsleep = common_nsleep, > .nsleep_restart = hrtimer_nanosleep_restart, > .timer_create = common_timer_create, > @@ -328,8 +328,8 @@ static __init int init_posix_timers(void) > .timer_del = common_timer_del, > }; > struct k_clock clock_boottime = { > - .clock_getres64 = hrtimer_get_res64, > - .clock_get64 = posix_get_boottime, > + .clock_getres = hrtimer_get_res64, > + .clock_get = posix_get_boottime, > .nsleep = common_nsleep, > .nsleep_restart = hrtimer_nanosleep_restart, > .timer_create = common_timer_create, > @@ -1021,12 +1021,8 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock, > if (copy_from_user(&new_tp, tp, sizeof (*tp))) > return -EFAULT; > > - if (kc->clock_set64) { > - new_tp64 = timespec_to_timespec64(new_tp); > - return kc->clock_set64(which_clock, &new_tp64); > - } else { > - return kc->clock_set(which_clock, &new_tp); > - } > + new_tp64 = timespec_to_timespec64(new_tp); > + return kc->clock_set(which_clock, &new_tp64); > } > > SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock, > @@ -1040,14 +1036,13 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock, > if (!kc) > return -EINVAL; > > - if (kc->clock_get64) { > - error = kc->clock_get64(which_clock, &kernel_tp64); > - kernel_tp = timespec64_to_timespec(kernel_tp64); > - } else { > - error = kc->clock_get(which_clock, &kernel_tp); > - } > + error = kc->clock_get(which_clock, &kernel_tp64); > + if (!error) > + return error; > > - if (!error && copy_to_user(tp, &kernel_tp, sizeof (kernel_tp))) > + kernel_tp = timespec64_to_timespec(kernel_tp64); > + > + if (copy_to_user(tp, &kernel_tp, sizeof (kernel_tp))) > error = -EFAULT; > > return error; > @@ -1087,14 +1082,13 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, > if (!kc) > return -EINVAL; > > - if (kc->clock_getres64) { > - error = kc->clock_getres64(which_clock, &rtn_tp64); > - rtn_tp = timespec64_to_timespec(rtn_tp64); > - } else { > - error = kc->clock_getres(which_clock, &rtn_tp); > - } > + error = kc->clock_getres(which_clock, &rtn_tp64); > + if (!error) > + return error; > + > + rtn_tp = timespec64_to_timespec(rtn_tp64); > > - if (!error && tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp))) > + if (tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp))) > error = -EFAULT; > > return error; >

9 years, 8 months

Re: [Y2038] [PATCH v3 09/10] time/posix-cpu-timers:Introduce the new methods with timespec64 type

by Arnd Bergmann

On Saturday 11 April 2015 18:46:55 Baolin Wang wrote: > This patch introduces the new methods of k_clock structure with timespec64 > type, converts the timespec type to timespec64 type for the callback function > in posix-cpu-timers.c file. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> The patch looks correct, but it wasn't obvious at first why you are modifying some of the functions in here such as posix_cpu_timer_get. It would be helpful to explain that first. Arnd > kernel/time/posix-cpu-timers.c | 58 +++++++++++++++++++++++----------------- > 1 file changed, 34 insertions(+), 24 deletions(-) > > diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c > index 0075da7..7bd88f6 100644 > --- a/kernel/time/posix-cpu-timers.c > +++ b/kernel/time/posix-cpu-timers.c > @@ -67,12 +67,12 @@ timespec_to_sample(const clockid_t which_clock, const struct timespec *tp) > > static void sample_to_timespec(const clockid_t which_clock, > unsigned long long expires, > - struct timespec *tp) > + struct timespec64 *tp) > { > if (CPUCLOCK_WHICH(which_clock) == CPUCLOCK_SCHED) > - *tp = ns_to_timespec(expires); > + *tp = ns_to_timespec64(expires); > else > - cputime_to_timespec((__force cputime_t)expires, tp); > + cputime_to_timespec64((__force cputime_t)expires, tp); > } > > /* > @@ -141,7 +141,7 @@ static inline unsigned long long virt_ticks(struct task_struct *p) > } > > static int > -posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp) > +posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp) > { > int error = check_clock(which_clock); > if (!error) { > @@ -160,7 +160,7 @@ posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp) > } > > static int > -posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *tp) > +posix_cpu_clock_set(const clockid_t which_clock, const struct timespec64 *tp) > { > /* > * You can never reset a CPU clock, but we check for other errors > @@ -263,7 +263,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock, > > static int posix_cpu_clock_get_task(struct task_struct *tsk, > const clockid_t which_clock, > - struct timespec *tp) > + struct timespec64 *tp) > { > int err = -EINVAL; > unsigned long long rtn; > @@ -283,7 +283,8 @@ static int posix_cpu_clock_get_task(struct task_struct *tsk, > } > > > -static int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp) > +static int posix_cpu_clock_get(const clockid_t which_clock, > + struct timespec64 *tp) > { > const pid_t pid = CPUCLOCK_PID(which_clock); > int err = -EINVAL; > @@ -604,6 +605,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, > struct sighand_struct *sighand; > struct task_struct *p = timer->it.cpu.task; > unsigned long long old_expires, new_expires, old_incr, val; > + struct timespec64 ts64; > int ret; > > WARN_ON_ONCE(p == NULL); > @@ -671,7 +673,8 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, > old_expires = timer->it.cpu.expires - val; > sample_to_timespec(timer->it_clock, > old_expires, > - &old->it_value); > + &ts64); > + old->it_value = timespec64_to_timespec(ts64); > } else { > old->it_value.tv_nsec = 1; > old->it_value.tv_sec = 0; > @@ -735,7 +738,8 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, > out: > if (old) { > sample_to_timespec(timer->it_clock, > - old_incr, &old->it_interval); > + old_incr, &ts64); > + old->it_interval = timespec64_to_timespec(ts64); > } > if (!ret) > posix_cpu_timer_kick_nohz(); > @@ -746,6 +750,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) > { > unsigned long long now; > struct task_struct *p = timer->it.cpu.task; > + struct timespec64 ts64; > > WARN_ON_ONCE(p == NULL); > > @@ -753,7 +758,8 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) > * Easy part: convert the reload time. > */ > sample_to_timespec(timer->it_clock, > - timer->it.cpu.incr, &itp->it_interval); > + timer->it.cpu.incr, &ts64); > + itp->it_interval = timespec64_to_timespec(ts64); > > if (timer->it.cpu.expires == 0) { /* Timer not armed at all. */ > itp->it_value.tv_sec = itp->it_value.tv_nsec = 0; > @@ -783,7 +789,8 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) > */ > timer->it.cpu.expires = 0; > sample_to_timespec(timer->it_clock, timer->it.cpu.expires, > - &itp->it_value); > + &ts64); > + itp->it_value = timespec64_to_timespec(ts64); > } else { > cpu_timer_sample_group(timer->it_clock, p, &now); > unlock_task_sighand(p, &flags); > @@ -793,7 +800,8 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec *itp) > if (now < timer->it.cpu.expires) { > sample_to_timespec(timer->it_clock, > timer->it.cpu.expires - now, > - &itp->it_value); > + &ts64); > + itp->it_value = timespec64_to_timespec(ts64); > } else { > /* > * The timer should have expired already, but the firing > @@ -1248,6 +1256,7 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, > struct timespec *rqtp, struct itimerspec *it) > { > struct k_itimer timer; > + struct timespec64 ts64; > int error; > > /* > @@ -1295,7 +1304,8 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, > /* > * We were interrupted by a signal. > */ > - sample_to_timespec(which_clock, timer.it.cpu.expires, rqtp); > + sample_to_timespec(which_clock, timer.it.cpu.expires, &ts64); > + *rqtp = timespec64_to_timespec(ts64); > error = posix_cpu_timer_set(&timer, 0, &zero_it, it); > if (!error) { > /* > @@ -1395,12 +1405,12 @@ static long posix_cpu_nsleep_restart(struct restart_block *restart_block) > #define THREAD_CLOCK MAKE_THREAD_CPUCLOCK(0, CPUCLOCK_SCHED) > > static int process_cpu_clock_getres(const clockid_t which_clock, > - struct timespec *tp) > + struct timespec64 *tp) > { > return posix_cpu_clock_getres(PROCESS_CLOCK, tp); > } > static int process_cpu_clock_get(const clockid_t which_clock, > - struct timespec *tp) > + struct timespec64 *tp) > { > return posix_cpu_clock_get(PROCESS_CLOCK, tp); > } > @@ -1420,12 +1430,12 @@ static long process_cpu_nsleep_restart(struct restart_block *restart_block) > return -EINVAL; > } > static int thread_cpu_clock_getres(const clockid_t which_clock, > - struct timespec *tp) > + struct timespec64 *tp) > { > return posix_cpu_clock_getres(THREAD_CLOCK, tp); > } > static int thread_cpu_clock_get(const clockid_t which_clock, > - struct timespec *tp) > + struct timespec64 *tp) > { > return posix_cpu_clock_get(THREAD_CLOCK, tp); > } > @@ -1436,9 +1446,9 @@ static int thread_cpu_timer_create(struct k_itimer *timer) > } > > struct k_clock clock_posix_cpu = { > - .clock_getres = posix_cpu_clock_getres, > - .clock_set = posix_cpu_clock_set, > - .clock_get = posix_cpu_clock_get, > + .clock_getres64 = posix_cpu_clock_getres, > + .clock_set64 = posix_cpu_clock_set, > + .clock_get64 = posix_cpu_clock_get, > .timer_create = posix_cpu_timer_create, > .nsleep = posix_cpu_nsleep, > .nsleep_restart = posix_cpu_nsleep_restart, > @@ -1450,15 +1460,15 @@ struct k_clock clock_posix_cpu = { > static __init int init_posix_cpu_timers(void) > { > struct k_clock process = { > - .clock_getres = process_cpu_clock_getres, > - .clock_get = process_cpu_clock_get, > + .clock_getres64 = process_cpu_clock_getres, > + .clock_get64 = process_cpu_clock_get, > .timer_create = process_cpu_timer_create, > .nsleep = process_cpu_nsleep, > .nsleep_restart = process_cpu_nsleep_restart, > }; > struct k_clock thread = { > - .clock_getres = thread_cpu_clock_getres, > - .clock_get = thread_cpu_clock_get, > + .clock_getres64 = thread_cpu_clock_getres, > + .clock_get64 = thread_cpu_clock_get, > .timer_create = thread_cpu_timer_create, > }; > struct timespec ts; >

9 years, 8 months

Re: [Y2038] [PATCH v3 08/10] time:Introduce the cputime_to_timespec64() function

by Arnd Bergmann

On Saturday 11 April 2015 18:46:54 Baolin Wang wrote: > This patch introduces the cputime_to_timespec64() function and > jiffies_to_timespec64() function for converting the jiffies > value to timespec64 value. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> > --- > include/asm-generic/cputime_jiffies.h | 6 ++++++ > include/linux/jiffies.h | 2 ++ > kernel/time/time.c | 14 ++++++++++++++ > 3 files changed, 22 insertions(+) > > diff --git a/include/asm-generic/cputime_jiffies.h b/include/asm-generic/cputime_jiffies.h > index fe386fc..c0c4fcb 100644 > --- a/include/asm-generic/cputime_jiffies.h > +++ b/include/asm-generic/cputime_jiffies.h > @@ -52,6 +52,12 @@ typedef u64 __nocast cputime64_t; > jiffies_to_timespec(cputime_to_jiffies(__ct),__val) > > /* > + * Convert cputime to timespec64. > + */ > +#define cputime_to_timespec64(__ct,__val) \ > + jiffies_to_timespec64(cputime_to_jiffies(__ct),__val) > + > +/* > * Convert cputime to timeval and back. You missed an important piece here: cputime_to_timespec64 is architecture specific, and arch/s390 as well as arch/powerpc have their own implementations, so you have to introduce all three cputime_to_timespec64 implementations before using it. Arnd

9 years, 8 months

Re: [Y2038] [PATCH v3 07/10] time/posix-clock:Introduce the 64bit methods for k_clock structure

by Arnd Bergmann

On Saturday 11 April 2015 18:46:53 Baolin Wang wrote: > This patch introduces the 64bit methods for k_clock structure, that > converts the timespec type to timespec64 type. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> > --- > kernel/time/posix-clock.c | 36 +++++++++++++++--------------------- > 1 file changed, 15 insertions(+), 21 deletions(-) Looks good. > diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c > index 382bf23..f425caf 100644 > --- a/kernel/time/posix-clock.c > +++ b/kernel/time/posix-clock.c > @@ -297,20 +297,18 @@ out: > return err; > } > > -static int pc_clock_gettime(clockid_t id, struct timespec *ts) > +static int pc_clock_gettime(clockid_t id, struct timespec64 *ts) > { > struct posix_clock_desc cd; > - struct timespec64 *tp; > int err; > > err = get_clock_desc(id, &cd); > if (err) > return err; > > - if (cd.clk->ops.clock_gettime) { > - *tp = timespec_to_timespec64(*ts); > - err = cd.clk->ops.clock_gettime(cd.clk, tp); > - } else > + if (cd.clk->ops.clock_gettime) > + err = cd.clk->ops.clock_gettime(cd.clk, ts); > + else > err = -EOPNOTSUPP; > > put_clock_desc(&cd); > @@ -318,20 +316,18 @@ static int pc_clock_gettime(clockid_t id, struct timespec *ts) > return err; > } > > -static int pc_clock_getres(clockid_t id, struct timespec *ts) > +static int pc_clock_getres(clockid_t id, struct timespec64 *ts) > { > struct posix_clock_desc cd; > - struct timespec64 *tp; > int err; > > err = get_clock_desc(id, &cd); > if (err) > return err; > > - if (cd.clk->ops.clock_getres) { > - *tp = timespec_to_timespec64(*ts); > - err = cd.clk->ops.clock_getres(cd.clk, tp); > - } else > + if (cd.clk->ops.clock_getres) > + err = cd.clk->ops.clock_getres(cd.clk, ts); > + else > err = -EOPNOTSUPP; > > put_clock_desc(&cd); > @@ -339,10 +335,9 @@ static int pc_clock_getres(clockid_t id, struct timespec *ts) > return err; > } > > -static int pc_clock_settime(clockid_t id, const struct timespec *ts) > +static int pc_clock_settime(clockid_t id, const struct timespec64 *ts) > { > struct posix_clock_desc cd; > - struct timespec64 tp; > int err; > > err = get_clock_desc(id, &cd); > @@ -354,10 +349,9 @@ static int pc_clock_settime(clockid_t id, const struct timespec *ts) > goto out; > } > > - if (cd.clk->ops.clock_settime) { > - tp = timespec_to_timespec64(*ts); > - err = cd.clk->ops.clock_settime(cd.clk, &tp); > - } else > + if (cd.clk->ops.clock_settime) > + err = cd.clk->ops.clock_settime(cd.clk, ts); > + else > err = -EOPNOTSUPP; > out: > put_clock_desc(&cd); > @@ -441,9 +435,9 @@ static int pc_timer_settime(struct k_itimer *kit, int flags, > } > > struct k_clock clock_posix_dynamic = { > - .clock_getres = pc_clock_getres, > - .clock_set = pc_clock_settime, > - .clock_get = pc_clock_gettime, > + .clock_getres64 = pc_clock_getres, > + .clock_set64 = pc_clock_settime, > + .clock_get64 = pc_clock_gettime, > .clock_adj = pc_clock_adjtime, > .timer_create = pc_timer_create, > .timer_set = pc_timer_settime, >

9 years, 8 months

Re: [Y2038] [PATCH v3 06/10] time/alarmtimer:Introduce the new methods with timespec64 type for k_clock structure

by Arnd Bergmann

On Saturday 11 April 2015 18:46:52 Baolin Wang wrote: > This patch introduces the new methods with timespec64 type of k_clock > structure, and converts the timespec type to timespec64 type in alarmtimer.c > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> > --- > kernel/time/alarmtimer.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) Looks good. > diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c > index 1b001ed..7aefb7f 100644 > --- a/kernel/time/alarmtimer.c > +++ b/kernel/time/alarmtimer.c > @@ -489,35 +489,36 @@ static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm, > /** > * alarm_clock_getres - posix getres interface > * @which_clock: clockid > - * @tp: timespec to fill > + * @tp: timespec64 to fill > * > * Returns the granularity of underlying alarm base clock > */ > -static int alarm_clock_getres(const clockid_t which_clock, struct timespec *tp) > +static int alarm_clock_getres(const clockid_t which_clock, > + struct timespec64 *tp) > { > clockid_t baseid = alarm_bases[clock2alarm(which_clock)].base_clockid; > > if (!alarmtimer_get_rtcdev()) > return -EINVAL; > > - return hrtimer_get_res(baseid, tp); > + return hrtimer_get_res64(baseid, tp); > } > > /** > * alarm_clock_get - posix clock_get interface > * @which_clock: clockid > - * @tp: timespec to fill. > + * @tp: timespec64 to fill. > * > * Provides the underlying alarm base time. > */ > -static int alarm_clock_get(clockid_t which_clock, struct timespec *tp) > +static int alarm_clock_get(clockid_t which_clock, struct timespec64 *tp) > { > struct alarm_base *base = &alarm_bases[clock2alarm(which_clock)]; > > if (!alarmtimer_get_rtcdev()) > return -EINVAL; > > - *tp = ktime_to_timespec(base->gettime()); > + *tp = ktime_to_timespec64(base->gettime()); > return 0; > } > > @@ -670,7 +671,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp) > > > /** > - * update_rmtp - Update remaining timespec value > + * update_rmtp - Update remaining timespec64 value > * @exp: expiration time > * @type: timer type > * @rmtp: user pointer to remaining timepsec value > @@ -824,8 +825,8 @@ static int __init alarmtimer_init(void) > int error = 0; > int i; > struct k_clock alarm_clock = { > - .clock_getres = alarm_clock_getres, > - .clock_get = alarm_clock_get, > + .clock_getres64 = alarm_clock_getres, > + .clock_get64 = alarm_clock_get, > .timer_create = alarm_timer_create, > .timer_set = alarm_timer_set, > .timer_del = alarm_timer_del, >

9 years, 8 months

Re: [Y2038] [PATCH v3 04/10] posix timers:Introduce the 64bit methods with timespec64 type for k_clock structure

by Arnd Bergmann

On Saturday 11 April 2015 18:46:50 Baolin Wang wrote: > This patch introduces the new methods with timespec64 type for k_clcok structure, > converts the timepsec type to timespec64 type in k_clock structure and implements > some callback function. > > This patch also converts the timespec type to timespec64 type for timekeeping_clocktai > function which is used only in the posix-timers.c file. > > Next step will migrate all the k_clock users to use the new methods with timespec64 type, > and it contains the files of mmtimer.c, alarmtimer.c, posix-clock.c and > posix-cpu-timers.c. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> The changes in this patch all look good, but as I mentioned, I would separate the two things you do here: > 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, > + 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, a) introducing and using the function pointers > @@ -278,9 +284,9 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp) > static __init int init_posix_timers(void) > { > struct k_clock clock_realtime = { > - .clock_getres = hrtimer_get_res, > - .clock_get = posix_clock_realtime_get, > - .clock_set = posix_clock_realtime_set, > + .clock_getres64 = hrtimer_get_res64, > + .clock_get64 = posix_clock_realtime_get, > + .clock_set64 = posix_clock_realtime_set, > .clock_adj = posix_clock_realtime_adj, > .nsleep = common_nsleep, and b) converting some of the k_clock definitions. Arnd

9 years, 8 months

Re: [Y2038] [PATCH v3 03/10] time/hrtimer:Introduce hrtimer_get_res64() for getting the timer resolution

by Arnd Bergmann

On Saturday 11 April 2015 18:46:49 Baolin Wang wrote: > This patch introduces hrtimer_get_res64() function to get the timer resolution > with timespec64 type, and moves the hrtimer_get_res() function into > include/linux/hrtimer.h as a 'static inline' helper that just calls hrtimer_get_res64. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> > Looks good. Arnd

9 years, 8 months

Re: [Y2038] [PATCH v3 02/10] timekeeping:Introduce the current_kernel_time64() with timespec64 type

by Arnd Bergmann

On Saturday 11 April 2015 18:46:48 Baolin Wang wrote: > This patch adds current_kernel_time64() function with timespec64 type, > and makes current_kernel_time 'static inline' and moves it to timekeeping.h > file. > > Signed-off-by: Baolin Wang <baolin.wang(a)linaro.org> Looks good to me. Arnd > diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h > index 3eaae47..c6d5ae9 100644 > --- a/include/linux/timekeeping.h > +++ b/include/linux/timekeeping.h > @@ -18,10 +18,18 @@ extern int do_sys_settimeofday(const struct timespec *tv, > * Kernel time accessors > */ > unsigned long get_seconds(void); > -struct timespec current_kernel_time(void); > +struct timespec64 current_kernel_time64(void); > /* does not take xtime_lock */ > struct timespec __current_kernel_time(void); > > +static inline struct timespec current_kernel_time(void) > +{ > + struct timespec64 now; > + > + now = current_kernel_time64(); > + return timespec64_to_timespec(now); > +} > + > /* > * timespec based interfaces > */ > diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c > index 91db941..8ccc02c 100644 > --- a/kernel/time/timekeeping.c > +++ b/kernel/time/timekeeping.c > @@ -1721,7 +1721,7 @@ struct timespec __current_kernel_time(void) > return timespec64_to_timespec(tk_xtime(tk)); > } > > -struct timespec current_kernel_time(void) > +struct timespec64 current_kernel_time64(void) > { > struct timekeeper *tk = &tk_core.timekeeper; > struct timespec64 now; > @@ -1733,9 +1733,9 @@ struct timespec current_kernel_time(void) > now = tk_xtime(tk); > } while (read_seqcount_retry(&tk_core.seq, seq)); > > - return timespec64_to_timespec(now); > + return now; > } > -EXPORT_SYMBOL(current_kernel_time); > +EXPORT_SYMBOL(current_kernel_time64); > > struct timespec64 get_monotonic_coarse64(void) > { >

9 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038 April 2015