The patch titled
Subject: mqueue: ignore the validity of abs_timeout parameter when message can be performed immediately
has been removed from the -mm tree. Its filename was
mqueue-ignore-the-validity-of-abs_timeout-parameter-when-message-can-be-performed-immediately.patch
This patch was dropped because it was withdrawn
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Akira Takeuchi <takeuchi.akr@xxxxxxxxxxxxxxxx>
Subject: mqueue: ignore the validity of abs_timeout parameter when message can be performed immediately
This patch fixes a regression in the mq_timed{send,receive} syscall.
When a message of mqueue can be performed immediately, the validity of
abs_timeout parameter should not be checked.
According to the manpage of mq_timedreceive:
Under no circumstance shall the operation fail with a timeout
if a message can be removed from the message queue immediately.
The validity of the abstime parameter need not be checked
if a message can be removed from the message queue immediately.
On 2.6.35+ kernel, mq_timed{send,receive} returns EINVAL incorrectly, in
this situation.
I found this problem during the OPTS testcase
"conformance/interfaces/mq_timedreceive/10-2":
# ./10-2.test
FAIL: the validity of abs_timeout is checked
Test FAILED
Signed-off-by: Akira Takeuchi <takeuchi.akr@xxxxxxxxxxxxxxxx>
Signed-off-by: Kiyoshi Owada <owada.kiyoshi@xxxxxxxxxxxxxxxx>
Cc: Carsten Emde <C.Emde@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/mqueue.c | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff -puN ipc/mqueue.c~mqueue-ignore-the-validity-of-abs_timeout-parameter-when-message-can-be-performed-immediately ipc/mqueue.c
--- a/ipc/mqueue.c~mqueue-ignore-the-validity-of-abs_timeout-parameter-when-message-can-be-performed-immediately
+++ a/ipc/mqueue.c
@@ -851,14 +851,22 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqd
struct msg_msg *msg_ptr;
struct mqueue_inode_info *info;
ktime_t expires, *timeout = NULL;
+ int timeout_param_error = 0;
struct timespec ts;
int ret;
if (u_abs_timeout) {
int res = prepare_timeout(u_abs_timeout, &expires, &ts);
if (res)
- return res;
- timeout = &expires;
+ /*
+ * The validity of the abs_timeout parameter need not be
+ * checked when there is sufficient room in the queue.
+ * So, do not return here, even if the parameter is
+ * invalid.
+ */
+ timeout_param_error = res;
+ else
+ timeout = &expires;
}
if (unlikely(msg_prio >= (unsigned long) MQ_PRIO_MAX))
@@ -906,6 +914,9 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqd
if (filp->f_flags & O_NONBLOCK) {
spin_unlock(&info->lock);
ret = -EAGAIN;
+ } else if (unlikely(timeout_param_error)) {
+ spin_unlock(&info->lock);
+ ret = timeout_param_error;
} else {
wait.task = current;
wait.msg = (void *) msg_ptr;
@@ -945,13 +956,21 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t,
struct mqueue_inode_info *info;
struct ext_wait_queue wait;
ktime_t expires, *timeout = NULL;
+ int timeout_param_error = 0;
struct timespec ts;
if (u_abs_timeout) {
int res = prepare_timeout(u_abs_timeout, &expires, &ts);
if (res)
- return res;
- timeout = &expires;
+ /*
+ * The validity of the abs_timeout parameter need not be
+ * checked if a message can be removed from the message
+ * queue immediately. So, do not return here, even if
+ * the parameter is invalid.
+ */
+ timeout_param_error = res;
+ else
+ timeout = &expires;
}
audit_mq_sendrecv(mqdes, msg_len, 0, timeout ? &ts : NULL);
@@ -986,6 +1005,10 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t,
if (filp->f_flags & O_NONBLOCK) {
spin_unlock(&info->lock);
ret = -EAGAIN;
+ } else if (unlikely(timeout_param_error)) {
+ spin_unlock(&info->lock);
+ ret = timeout_param_error;
+ msg_ptr = NULL; /* just for shutting up warning */
} else {
wait.task = current;
wait.state = STATE_NONE;
_
Patches currently in -mm which might be from takeuchi.akr@xxxxxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
