mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mqueue: Convert message queue timeout to use hrtimers

Browse source 
The message queue functions mq_timedsend() and mq_timedreceive()
have not yet been converted to use the hrtimer interface.

This patch replaces the call to schedule_timeout() by a call to
schedule_hrtimeout() and transforms the expiration time from
timespec to ktime as required.

[ tglx: Fixed whitespace wreckage ]

Signed-off-by: Carsten Emde <C.Emde@osadl.org>
Tested-by: Pradyumna Sampath <pradysam@gmail.com>
Cc: Arjan van de Veen <arjan@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20100402204331.715783034@osadl.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Carsten Emde 2010-04-02 22:40:20 +02:00 committed by Thomas Gleixner
parent 351b3f7a21
commit 9ca7d8e683
1 changed files with 25 additions and 49 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

74
ipc/mqueue.c
View file

@ -428,7 +428,7 @@ static void wq_add(struct mqueue_inode_info *info, int sr,
* sr: SEND or RECV * sr: SEND or RECV
*/ */
static int wq_sleep(struct mqueue_inode_info *info, int sr, static int wq_sleep(struct mqueue_inode_info *info, int sr,
long timeout, struct ext_wait_queue *ewp) ktime_t *timeout, struct ext_wait_queue *ewp)
{ {
int retval; int retval;
signed long time; signed long time;
@ -439,7 +439,8 @@ static int wq_sleep(struct mqueue_inode_info *info, int sr,
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
spin_unlock(&info->lock); spin_unlock(&info->lock);
time = schedule_timeout(timeout); time = schedule_hrtimeout_range_clock(timeout,
HRTIMER_MODE_ABS, 0, CLOCK_REALTIME);
while (ewp->state == STATE_PENDING) while (ewp->state == STATE_PENDING)
cpu_relax(); cpu_relax();
@ -551,31 +552,16 @@ static void __do_notify(struct mqueue_inode_info *info)
wake_up(&info->wait_q); wake_up(&info->wait_q);
} }
static long prepare_timeout(struct timespec *p) static int prepare_timeout(const struct timespec __user *u_abs_timeout,
ktime_t *expires, struct timespec *ts)
{ {
struct timespec nowts; if (copy_from_user(ts, u_abs_timeout, sizeof(struct timespec)))
long timeout; return -EFAULT;
if (!timespec_valid(ts))
return -EINVAL;
if (p) { *expires = timespec_to_ktime(*ts);
if (unlikely(p->tv_nsec < 0 || p->tv_sec < 0 return 0;
|| p->tv_nsec >= NSEC_PER_SEC))
return -EINVAL;
nowts = CURRENT_TIME;
/* first subtract as jiffies can't be too big */
p->tv_sec -= nowts.tv_sec;
if (p->tv_nsec < nowts.tv_nsec) {
p->tv_nsec += NSEC_PER_SEC;
p->tv_sec--;
}
p->tv_nsec -= nowts.tv_nsec;
if (p->tv_sec < 0)
return 0;
timeout = timespec_to_jiffies(p) + 1;
} else
return MAX_SCHEDULE_TIMEOUT;
return timeout;
} }
static void remove_notification(struct mqueue_inode_info *info) static void remove_notification(struct mqueue_inode_info *info)
@ -861,22 +847,21 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
struct ext_wait_queue *receiver; struct ext_wait_queue *receiver;
struct msg_msg *msg_ptr; struct msg_msg *msg_ptr;
struct mqueue_inode_info *info; struct mqueue_inode_info *info;
struct timespec ts, *p = NULL; ktime_t expires, *timeout = NULL;
long timeout; struct timespec ts;
int ret; int ret;
if (u_abs_timeout) { if (u_abs_timeout) {
if (copy_from_user(&ts, u_abs_timeout, int res = prepare_timeout(u_abs_timeout, &expires, &ts);
sizeof(struct timespec))) if (res)
return -EFAULT; return res;
p = &ts; timeout = &expires;
} }
if (unlikely(msg_prio >= (unsigned long) MQ_PRIO_MAX)) if (unlikely(msg_prio >= (unsigned long) MQ_PRIO_MAX))
return -EINVAL; return -EINVAL;
audit_mq_sendrecv(mqdes, msg_len, msg_prio, p); audit_mq_sendrecv(mqdes, msg_len, msg_prio, timeout ? &ts : NULL);
timeout = prepare_timeout(p);
filp = fget(mqdes); filp = fget(mqdes);
if (unlikely(!filp)) { if (unlikely(!filp)) {
@ -918,9 +903,6 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
if (filp->f_flags & O_NONBLOCK) { if (filp->f_flags & O_NONBLOCK) {
spin_unlock(&info->lock); spin_unlock(&info->lock);
ret = -EAGAIN; ret = -EAGAIN;
} else if (unlikely(timeout < 0)) {
spin_unlock(&info->lock);
ret = timeout;
} else { } else {
wait.task = current; wait.task = current;
wait.msg = (void *) msg_ptr; wait.msg = (void *) msg_ptr;
@ -953,24 +935,23 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
size_t, msg_len, unsigned int __user *, u_msg_prio, size_t, msg_len, unsigned int __user *, u_msg_prio,
const struct timespec __user *, u_abs_timeout) const struct timespec __user *, u_abs_timeout)
{ {
long timeout;
ssize_t ret; ssize_t ret;
struct msg_msg *msg_ptr; struct msg_msg *msg_ptr;
struct file *filp; struct file *filp;
struct inode *inode; struct inode *inode;
struct mqueue_inode_info *info; struct mqueue_inode_info *info;
struct ext_wait_queue wait; struct ext_wait_queue wait;
struct timespec ts, *p = NULL; ktime_t expires, *timeout = NULL;
struct timespec ts;
if (u_abs_timeout) { if (u_abs_timeout) {
if (copy_from_user(&ts, u_abs_timeout, int res = prepare_timeout(u_abs_timeout, &expires, &ts);
sizeof(struct timespec))) if (res)
return -EFAULT; return res;
p = &ts; timeout = &expires;
} }
audit_mq_sendrecv(mqdes, msg_len, 0, p); audit_mq_sendrecv(mqdes, msg_len, 0, timeout ? &ts : NULL);
timeout = prepare_timeout(p);
filp = fget(mqdes); filp = fget(mqdes);
if (unlikely(!filp)) { if (unlikely(!filp)) {
@ -1002,11 +983,6 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
if (filp->f_flags & O_NONBLOCK) { if (filp->f_flags & O_NONBLOCK) {
spin_unlock(&info->lock); spin_unlock(&info->lock);
ret = -EAGAIN; ret = -EAGAIN;
msg_ptr = NULL;
} else if (unlikely(timeout < 0)) {
spin_unlock(&info->lock);
ret = timeout;
msg_ptr = NULL;
} else { } else {
wait.task = current; wait.task = current;
wait.state = STATE_NONE; wait.state = STATE_NONE;