Skip to content

L
linux
Commit 58a14ee9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt 

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  hrtimer: don't modify restart_block->fn in restart functions
  hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
  hrtimer: fix *rmtp handling in hrtimer_nanosleep()
  ntp: correct inconsistent interval/tick_length usage
parents 712a30e6 c289b074
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 52 deletions
include/linux/hrtimer.h
View file @ 58a14ee9
...@@ -316,7 +316,7 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer, ...@@ -316,7 +316,7 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,
/* Precise sleep: */ /* Precise sleep: */
extern long hrtimer_nanosleep(struct timespec *rqtp, extern long hrtimer_nanosleep(struct timespec *rqtp,
struct timespec *rmtp, struct timespec __user *rmtp,
const enum hrtimer_mode mode, const enum hrtimer_mode mode,
const clockid_t clockid); const clockid_t clockid);
extern long hrtimer_nanosleep_restart(struct restart_block *restart_block); extern long hrtimer_nanosleep_restart(struct restart_block *restart_block);
......
include/linux/timex.h
View file @ 58a14ee9
...@@ -232,7 +232,14 @@ static inline int ntp_synced(void) ...@@ -232,7 +232,14 @@ static inline int ntp_synced(void)
#else #else
#define NTP_INTERVAL_FREQ (HZ) #define NTP_INTERVAL_FREQ (HZ)
#endif #endif
#define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
#define CLOCK_TICK_OVERFLOW (LATCH * HZ - CLOCK_TICK_RATE)
#define CLOCK_TICK_ADJUST (((s64)CLOCK_TICK_OVERFLOW * NSEC_PER_SEC) / \
(s64)CLOCK_TICK_RATE)
/* Because using NSEC_PER_SEC would be too easy */
#define NTP_INTERVAL_LENGTH ((((s64)TICK_USEC * NSEC_PER_USEC * USER_HZ) + \
CLOCK_TICK_ADJUST) / NTP_INTERVAL_FREQ)
/* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */ /* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */
extern u64 current_tick_length(void); extern u64 current_tick_length(void);
......
kernel/compat.c
View file @ 58a14ee9
...@@ -40,10 +40,35 @@ int put_compat_timespec(const struct timespec *ts, struct compat_timespec __user ...@@ -40,10 +40,35 @@ int put_compat_timespec(const struct timespec *ts, struct compat_timespec __user
__put_user(ts->tv_nsec, &cts->tv_nsec)) ? -EFAULT : 0; __put_user(ts->tv_nsec, &cts->tv_nsec)) ? -EFAULT : 0;
} }
static long compat_nanosleep_restart(struct restart_block *restart)
{
struct compat_timespec __user *rmtp;
struct timespec rmt;
mm_segment_t oldfs;
long ret;
rmtp = (struct compat_timespec __user *)(restart->arg1);
restart->arg1 = (unsigned long)&rmt;
oldfs = get_fs();
set_fs(KERNEL_DS);
ret = hrtimer_nanosleep_restart(restart);
set_fs(oldfs);
if (ret) {
restart->arg1 = (unsigned long)rmtp;
if (rmtp && put_compat_timespec(&rmt, rmtp))
return -EFAULT;
}
return ret;
}
asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp, asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
struct compat_timespec __user *rmtp) struct compat_timespec __user *rmtp)
{ {
struct timespec tu, rmt; struct timespec tu, rmt;
mm_segment_t oldfs;
long ret; long ret;
if (get_compat_timespec(&tu, rqtp)) if (get_compat_timespec(&tu, rqtp))
...@@ -52,11 +77,21 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp, ...@@ -52,11 +77,21 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
if (!timespec_valid(&tu)) if (!timespec_valid(&tu))
return -EINVAL; return -EINVAL;
ret = hrtimer_nanosleep(&tu, rmtp ? &rmt : NULL, HRTIMER_MODE_REL, oldfs = get_fs();
CLOCK_MONOTONIC); set_fs(KERNEL_DS);
ret = hrtimer_nanosleep(&tu,
rmtp ? (struct timespec __user *)&rmt : NULL,
HRTIMER_MODE_REL, CLOCK_MONOTONIC);
set_fs(oldfs);
if (ret) {
struct restart_block *restart
= &current_thread_info()->restart_block;
restart->fn = compat_nanosleep_restart;
restart->arg1 = (unsigned long)rmtp;
if (ret && rmtp) { if (rmtp && put_compat_timespec(&rmt, rmtp))
if (put_compat_timespec(&rmt, rmtp))
return -EFAULT; return -EFAULT;
} }
......
kernel/hrtimer.c
View file @ 58a14ee9
...@@ -1319,13 +1319,26 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod ...@@ -1319,13 +1319,26 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
return t->task == NULL; return t->task == NULL;
} }
static int update_rmtp(struct hrtimer *timer, struct timespec __user *rmtp)
{
struct timespec rmt;
ktime_t rem;
rem = ktime_sub(timer->expires, timer->base->get_time());
if (rem.tv64 <= 0)
return 0;
rmt = ktime_to_timespec(rem);
if (copy_to_user(rmtp, &rmt, sizeof(*rmtp)))
return -EFAULT;
return 1;
}
long __sched hrtimer_nanosleep_restart(struct restart_block *restart) long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
{ {
struct hrtimer_sleeper t; struct hrtimer_sleeper t;
struct timespec *rmtp; struct timespec __user *rmtp;
ktime_t time;
restart->fn = do_no_restart_syscall;
hrtimer_init(&t.timer, restart->arg0, HRTIMER_MODE_ABS); hrtimer_init(&t.timer, restart->arg0, HRTIMER_MODE_ABS);
t.timer.expires.tv64 = ((u64)restart->arg3 << 32) | (u64) restart->arg2; t.timer.expires.tv64 = ((u64)restart->arg3 << 32) | (u64) restart->arg2;
...@@ -1333,26 +1346,22 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart) ...@@ -1333,26 +1346,22 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
if (do_nanosleep(&t, HRTIMER_MODE_ABS)) if (do_nanosleep(&t, HRTIMER_MODE_ABS))
return 0; return 0;
rmtp = (struct timespec *)restart->arg1; rmtp = (struct timespec __user *)restart->arg1;
if (rmtp) { if (rmtp) {
time = ktime_sub(t.timer.expires, t.timer.base->get_time()); int ret = update_rmtp(&t.timer, rmtp);
if (time.tv64 <= 0) if (ret <= 0)
return 0; return ret;
*rmtp = ktime_to_timespec(time);
} }
restart->fn = hrtimer_nanosleep_restart;
/* The other values in restart are already filled in */ /* The other values in restart are already filled in */
return -ERESTART_RESTARTBLOCK; return -ERESTART_RESTARTBLOCK;
} }
long hrtimer_nanosleep(struct timespec *rqtp, struct timespec *rmtp, long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
const enum hrtimer_mode mode, const clockid_t clockid) const enum hrtimer_mode mode, const clockid_t clockid)
{ {
struct restart_block *restart; struct restart_block *restart;
struct hrtimer_sleeper t; struct hrtimer_sleeper t;
ktime_t rem;
hrtimer_init(&t.timer, clockid, mode); hrtimer_init(&t.timer, clockid, mode);
t.timer.expires = timespec_to_ktime(*rqtp); t.timer.expires = timespec_to_ktime(*rqtp);
...@@ -1364,10 +1373,9 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec *rmtp, ...@@ -1364,10 +1373,9 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec *rmtp,
return -ERESTARTNOHAND; return -ERESTARTNOHAND;
if (rmtp) { if (rmtp) {
rem = ktime_sub(t.timer.expires, t.timer.base->get_time()); int ret = update_rmtp(&t.timer, rmtp);
if (rem.tv64 <= 0) if (ret <= 0)
return 0; return ret;
*rmtp = ktime_to_timespec(rem);
} }
restart = &current_thread_info()->restart_block; restart = &current_thread_info()->restart_block;
...@@ -1383,8 +1391,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec *rmtp, ...@@ -1383,8 +1391,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec *rmtp,
asmlinkage long asmlinkage long
sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp) sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp)
{ {
struct timespec tu, rmt; struct timespec tu;
int ret;
if (copy_from_user(&tu, rqtp, sizeof(tu))) if (copy_from_user(&tu, rqtp, sizeof(tu)))
return -EFAULT; return -EFAULT;
...@@ -1392,15 +1399,7 @@ sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp) ...@@ -1392,15 +1399,7 @@ sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp)
if (!timespec_valid(&tu)) if (!timespec_valid(&tu))
return -EINVAL; return -EINVAL;
ret = hrtimer_nanosleep(&tu, rmtp ? &rmt : NULL, HRTIMER_MODE_REL, return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
CLOCK_MONOTONIC);
if (ret && rmtp) {
if (copy_to_user(rmtp, &rmt, sizeof(*rmtp)))
return -EFAULT;
}
return ret;
} }
/* /*
......
kernel/posix-timers.c
View file @ 58a14ee9
...@@ -982,20 +982,9 @@ sys_clock_getres(const clockid_t which_clock, struct timespec __user *tp) ...@@ -982,20 +982,9 @@ sys_clock_getres(const clockid_t which_clock, struct timespec __user *tp)
static int common_nsleep(const clockid_t which_clock, int flags, static int common_nsleep(const clockid_t which_clock, int flags,
struct timespec *tsave, struct timespec __user *rmtp) struct timespec *tsave, struct timespec __user *rmtp)
{ {
struct timespec rmt; return hrtimer_nanosleep(tsave, rmtp, flags & TIMER_ABSTIME ?
int ret;
ret = hrtimer_nanosleep(tsave, rmtp ? &rmt : NULL,
flags & TIMER_ABSTIME ?
HRTIMER_MODE_ABS : HRTIMER_MODE_REL, HRTIMER_MODE_ABS : HRTIMER_MODE_REL,
which_clock); which_clock);
if (ret && rmtp) {
if (copy_to_user(rmtp, &rmt, sizeof(*rmtp)))
return -EFAULT;
}
return ret;
} }
asmlinkage long asmlinkage long
......
kernel/time/ntp.c
View file @ 58a14ee9
...@@ -43,10 +43,6 @@ long time_freq; /* frequency offset (scaled ppm)*/ ...@@ -43,10 +43,6 @@ long time_freq; /* frequency offset (scaled ppm)*/
static long time_reftime; /* time at last adjustment (s) */ static long time_reftime; /* time at last adjustment (s) */
long time_adjust; long time_adjust;
#define CLOCK_TICK_OVERFLOW (LATCH * HZ - CLOCK_TICK_RATE)
#define CLOCK_TICK_ADJUST (((s64)CLOCK_TICK_OVERFLOW * NSEC_PER_SEC) / \
(s64)CLOCK_TICK_RATE)
static void ntp_update_frequency(void) static void ntp_update_frequency(void)
{ {
u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7