sched/wait: wait_event*_timeout() needs ___wait_cond_timeout() too
cover sched/wait: wait_event*_timeout() needs ___wait_cond_timeout() too
And another patch we already discussed.
wait_event_timeout(wq, true, 0) still returns 0, this doesn't look right, and this doesn't match __wait_event_timeout(timeout => 0).
Sure, most probably nobody uses the constant timeout == 0, but this can break the code which does something like
if (nonblock) timeout = 0; else timeout = TIMEOUT; success = wait_event_timeout(wq, CONDITION, timeout);
Oleg.
PATCH 1/1 sched/wait: wait_event*_timeout() needs ___wait_cond_timeout() too
Commit 4c663cfc ("wait: fix false timeouts when using wait_event_timeout()") introduced the additional condition checks after a timeout but only in the "slow" __wait*() paths.
wait_event_timeout(wq, CONDITION, 0) still returns 0 if CONDITION is already true and we do not call __wait*().
Now that we have ___wait_cond_timeout() we can use it instead to ensure that __ret will be properly updated.
--- include/linux/wait.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
include/linux/wait.h +3 -3
@@ -273,7 +273,7 @@ do { \#define wait_event_timeout (wq, condition, timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_timeout(wq, condition, timeout); \ __ret; \ })
@@ -331,7 +331,7 @@ do { \#define wait_event_interruptible_timeout (wq, condition, timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_interruptible_timeout(wq, \ condition, timeout); \ __ret; \
@@ -772,7 +772,7 @@ do { \ timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_interruptible_lock_irq_timeout( \ wq, condition, lock, timeout); \ __ret; \
Signature · 1 line
1.5.5.1
tip-bot for Oleg Nesterov
merge bot[tip:sched/core] sched/wait: Add ___wait_cond_timeout() to wait_event*_timeout() too
sched/wait: Add ___wait_cond_timeout() to wait_event*_timeout() too
Commit-ID: 8922915b38cd8b72f8e5af614b95be71d1d299d4 Gitweb: http://git.kernel.org/tip/8922915b38cd8b72f8e5af614b95be71d1d299d4 Author: Oleg Nesterov <[email protected]> AuthorDate: Mon, 7 Oct 2013 20:31:06 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 16 Oct 2013 14:22:17 +0200
sched/wait: Add ___wait_cond_timeout() to wait_event*_timeout() too
Commit 4c663cfc ("wait: fix false timeouts when using wait_event_timeout()") introduced the additional condition checks after a timeout but only in the "slow" __wait*() paths.
wait_event_timeout(wq, CONDITION, 0) still returns 0 if CONDITION is already true and we do not call __wait*().
Now that we have ___wait_cond_timeout() we can use it instead to ensure that __ret will be properly updated.
--- include/linux/wait.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/wait.h +3 -3
@@ -270,7 +270,7 @@ do { \#define wait_event_timeout (wq, condition, timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_timeout(wq, condition, timeout); \ __ret; \ })
@@ -328,7 +328,7 @@ do { \#define wait_event_interruptible_timeout (wq, condition, timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_interruptible_timeout(wq, \ condition, timeout); \ __ret; \
@@ -769,7 +769,7 @@ do { \ timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_interruptible_lock_irq_timeout( \ wq, condition, lock, timeout); \ __ret; \