Commit 80ca75c4 authored by Linus Torvalds's avatar Linus Torvalds

Implement system call restarting for the "nanosleep()" system call

using the new system call restart infrastructure.

This breaks the compat layer - it really needs to do its own version
of restarting, since the restarting depends on the types.
parent 66d77a12
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/thread_info.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -1020,37 +1021,60 @@ asmlinkage long sys_gettid(void) ...@@ -1020,37 +1021,60 @@ asmlinkage long sys_gettid(void)
return current->pid; return current->pid;
} }
long do_nanosleep(struct timespec *t) static long nanosleep_restart(struct restart_block *restart)
{ {
unsigned long expire; unsigned long expire = restart->arg0, now = jiffies;
struct timespec *rmtp = (struct timespec *) restart->arg1;
if ((t->tv_nsec >= 1000000000L) || (t->tv_nsec < 0) || (t->tv_sec < 0)) long ret;
return -EINVAL;
expire = timespec_to_jiffies(t) + (t->tv_sec || t->tv_nsec); /* Did it expire while we handled signals? */
if (!time_after(expire, now))
return 0;
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
expire = schedule_timeout(expire); expire = schedule_timeout(expire - now);
ret = 0;
if (expire) { if (expire) {
jiffies_to_timespec(expire, t); struct timespec t;
return -EINTR; jiffies_to_timespec(expire, &t);
ret = -ERESTART_RESTARTBLOCK;
if (copy_to_user(rmtp, &t, sizeof(t)))
ret = -EFAULT;
/* The 'restart' block is already filled in */
} }
return 0; return ret;
} }
asmlinkage long sys_nanosleep(struct timespec *rqtp, struct timespec *rmtp) asmlinkage long sys_nanosleep(struct timespec *rqtp, struct timespec *rmtp)
{ {
struct timespec t; struct timespec t;
unsigned long expire;
long ret; long ret;
if (copy_from_user(&t, rqtp, sizeof(t))) if (copy_from_user(&t, rqtp, sizeof(t)))
return -EFAULT; return -EFAULT;
ret = do_nanosleep(&t); if ((t.tv_nsec >= 1000000000L) || (t.tv_nsec < 0) || (t.tv_sec < 0))
if (rmtp && (ret == -EINTR)) { return -EINVAL;
expire = timespec_to_jiffies(&t) + (t.tv_sec || t.tv_nsec);
current->state = TASK_INTERRUPTIBLE;
expire = schedule_timeout(expire);
ret = 0;
if (expire) {
struct restart_block *restart;
jiffies_to_timespec(expire, &t);
if (copy_to_user(rmtp, &t, sizeof(t))) if (copy_to_user(rmtp, &t, sizeof(t)))
return -EFAULT; return -EFAULT;
restart = &current_thread_info()->restart_block;
restart->fn = nanosleep_restart;
restart->arg0 = jiffies + expire;
restart->arg1 = (unsigned long) rmtp;
ret = -ERESTART_RESTARTBLOCK;
} }
return ret; return ret;
} }
......
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