p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hrtimers/posix-timers: Merge nanosleep timespec copyout logics into a new helper 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170607084241.28657-7-viro@ZenIV.linux.org.uk
This commit is contained in:
Al Viro 2017-06-07 09:42:32 +01:00 committed by Thomas Gleixner
parent edbeda4632
commit ce41aaf47a
4 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/hrtimer.h
View File

@ -452,6 +452,8 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,
} }
/* Precise sleep: */ /* Precise sleep: */
extern int nanosleep_copyout(struct restart_block *, struct timespec *);
extern long hrtimer_nanosleep(struct timespec64 *rqtp, extern long hrtimer_nanosleep(struct timespec64 *rqtp,
const enum hrtimer_mode mode, const enum hrtimer_mode mode,
const clockid_t clockid); const clockid_t clockid);

10
kernel/time/alarmtimer.c
View File

@ -721,15 +721,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,
return 0; return 0;
rmt = ktime_to_timespec(rem); rmt = ktime_to_timespec(rem);
#ifdef CONFIG_COMPAT return nanosleep_copyout(restart, &rmt);
if (restart->nanosleep.type == TT_COMPAT) {
if (compat_put_timespec(&rmt,
restart->nanosleep.compat_rmtp))
return -EFAULT;
} else
#endif
if (copy_to_user(restart->nanosleep.rmtp, &rmt, sizeof(rmt)))
return -EFAULT;
} }
return -ERESTART_RESTARTBLOCK; return -ERESTART_RESTARTBLOCK;
} }

29
kernel/time/hrtimer.c
View File

@ -1440,6 +1440,25 @@ void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
} }
EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
int nanosleep_copyout(struct restart_block *restart, struct timespec *ts)
{
switch(restart->nanosleep.type) {
#ifdef CONFIG_COMPAT
case TT_COMPAT:
if (compat_put_timespec(ts, restart->nanosleep.compat_rmtp))
return -EFAULT;
break;
#endif
case TT_NATIVE:
if (copy_to_user(restart->nanosleep.rmtp, ts, sizeof(struct timespec)))
return -EFAULT;
break;
default:
BUG();
}
return -ERESTART_RESTARTBLOCK;
}
static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode) static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
{ {
struct restart_block *restart; struct restart_block *restart;
@ -1472,15 +1491,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
return 0; return 0;
rmt = ktime_to_timespec(rem); rmt = ktime_to_timespec(rem);
#ifdef CONFIG_COMPAT return nanosleep_copyout(restart, &rmt);
if (restart->nanosleep.type == TT_COMPAT) {
if (compat_put_timespec(&rmt,
restart->nanosleep.compat_rmtp))
return -EFAULT;
} else
#endif
if (copy_to_user(restart->nanosleep.rmtp, &rmt, sizeof(rmt)))
return -EFAULT;
} }
return -ERESTART_RESTARTBLOCK; return -ERESTART_RESTARTBLOCK;
} }

13
kernel/time/posix-cpu-timers.c
View File

@ -1312,22 +1312,13 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
* Report back to the user the time still remaining. * Report back to the user the time still remaining.
*/ */
restart = &current->restart_block; restart = &current->restart_block;
restart->nanosleep.expires = timespec64_to_ns(rqtp);
if (restart->nanosleep.type != TT_NONE) { if (restart->nanosleep.type != TT_NONE) {
struct timespec ts; struct timespec ts;
ts = timespec64_to_timespec(it.it_value); ts = timespec64_to_timespec(it.it_value);
#ifdef CONFIG_COMPAT error = nanosleep_copyout(restart, &ts);
if (restart->nanosleep.type == TT_COMPAT) {
if (compat_put_timespec(&ts,
restart->nanosleep.compat_rmtp))
return -EFAULT;
} else
#endif
if (copy_to_user(restart->nanosleep.rmtp, &ts,
sizeof(ts)))
return -EFAULT;
} }
restart->nanosleep.expires = timespec64_to_ns(rqtp);
} }
return error; return error;