futex: futex_wait_requeue_pi commentary corrections
PATCH v2 1/1 futex: futex_wait_requeue_pi commentary corrections
futex: futex_wait_requeue_pi commentary corrections
From: Darren Hart <[email protected]>
The state machine described in the comments wasn't updated with a follow-on fix. Address that and cleanup the corresponding commentary in the function.
---
kernel/futex.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
kernel/futex.c +5 -5
@@ -2102,11 +2102,11 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,* We call schedule in futex_wait_queue_me() when we enqueue and return there * via the following: * 1) wakeup on uaddr2 after an atomic lock acquisition by futex_requeue() -* 2) wakeup on uaddr2 after a requeue and subsequent unlock -* 3) signal (before or after requeue) -* 4) timeout (before or after requeue) +* 2) wakeup on uaddr2 after a requeue +* 3) signal +* 4) timeout * -* If 3, we setup a restart_block with futex_wait_requeue_pi() as the function. +* If 3, cleanup and return -ERESTARTNOINTR. * * If 2, we may then block on trying to take the rt_mutex and return via: * 5) successful lock
@@ -2114,7 +2114,7 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,* 7) timeout * 8) other lock acquisition failure * -* If 6, we setup a restart_block with futex_lock_pi() as the function. +* If 6, return -EWOULDBLOCK (restarting the syscall would do the same). * * If 4 or 7, we cleanup and return with -ETIMEDOUT. *
@@ -2232,14 +2232,11 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,
rt_mutex_unlock(pi_mutex);
} else if (ret == -EINTR) {
/*- * We've already been requeued, but we have no way to
- * restart by calling futex_lock_pi() directly. We
- * could restart the syscall, but that will look at
- * the user space value and return right away. So we
- * drop back with EWOULDBLOCK to tell user space that
- * "val" has been changed. That's the same what the
- * restart of the syscall would do in
- * futex_wait_setup().
+ * We've already been requeued, but cannot restart by calling
+ * futex_lock_pi() directly. We could restart this syscall, but
+ * it would detect that the user space "val" changed and return
+ * -EWOULDBLOCK. Save the overhead of the restart and return
+ * -EWOULDBLOCK directly.
*/ ret = -EWOULDBLOCK; }
Signature · 3 lines
Darren Hart IBM Linux Technology Center Real-Time Linux Team
[tip:core/futexes] futex: Correct futex_wait_requeue_pi() commentary
Commit-ID: cc6db4e60116c1f76577b6850a35ae7de69a95b6 Gitweb: http://git.kernel.org/tip/cc6db4e60116c1f76577b6850a35ae7de69a95b6 Author: Darren Hart <[email protected]> AuthorDate: Fri, 31 Jul 2009 16:20:10 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Aug 2009 15:59:14 +0200
futex: Correct futex_wait_requeue_pi() commentary
The state machine described in the comments wasn't updated with a follow-on fix. Address that and cleanup the corresponding commentary in the function.
LKML-Reference: <[email protected]>
--- kernel/futex.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-)
kernel/futex.c +10 -13
@@ -2102,11 +2102,11 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,* We call schedule in futex_wait_queue_me() when we enqueue and return there * via the following: * 1) wakeup on uaddr2 after an atomic lock acquisition by futex_requeue() -* 2) wakeup on uaddr2 after a requeue and subsequent unlock -* 3) signal (before or after requeue) -* 4) timeout (before or after requeue) +* 2) wakeup on uaddr2 after a requeue +* 3) signal +* 4) timeout * -* If 3, we setup a restart_block with futex_wait_requeue_pi() as the function. +* If 3, cleanup and return -ERESTARTNOINTR. * * If 2, we may then block on trying to take the rt_mutex and return via: * 5) successful lock
@@ -2114,7 +2114,7 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,* 7) timeout * 8) other lock acquisition failure * -* If 6, we setup a restart_block with futex_lock_pi() as the function. +* If 6, return -EWOULDBLOCK (restarting the syscall would do the same). * * If 4 or 7, we cleanup and return with -ETIMEDOUT. *
@@ -2232,14 +2232,11 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,rt_mutex_unlock (pi_mutex); }else if (ret == -EINTR ) {/* -* We've already been requeued, but we have no way to -* restart by calling futex_lock_pi() directly. We -* could restart the syscall, but that will look at -* the user space value and return right away. So we -* drop back with EWOULDBLOCK to tell user space that -* "val" has been changed. That's the same what the -* restart of the syscall would do in -* futex_wait_setup(). +* We've already been requeued, but cannot restart by calling +* futex_lock_pi() directly. We could restart this syscall, but +* it would detect that the user space "val" changed and return +* -EWOULDBLOCK. Save the overhead of the restart and return +* -EWOULDBLOCK directly. */ ret = -EWOULDBLOCK ; }