From: Davidlohr Bueso <dave@stgolabs.net>
To: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Darren Hart <darren@dvhart.com>,
Davidlohr Bueso <dave@stgolabs.net>,
linux-kernel@vger.kernel.org, Davidlohr Bueso <dbueso@suse.de>
Subject: [PATCH 1/2] futex: Enhance comments in futex_lock_pi() for blocking paths
Date: Mon, 29 Jun 2015 23:26:01 -0700 [thread overview]
Message-ID: <1435645562-975-2-git-send-email-dave@stgolabs.net> (raw)
In-Reply-To: <1435645562-975-1-git-send-email-dave@stgolabs.net>
... serves a bit better to clarify between blocking
and non-blocking code paths.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
---
kernel/futex.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index c4a182f..153eb22 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2268,8 +2268,11 @@ static long futex_wait_restart(struct restart_block *restart)
/*
* Userspace tried a 0 -> TID atomic transition of the futex value
* and failed. The kernel side here does the whole locking operation:
- * if there are waiters then it will block, it does PI, etc. (Due to
- * races the kernel might see a 0 value of the futex too.)
+ * if there are waiters then it will block as a consequence of relying
+ * on rt-mutexes, it does PI, etc. (Due to races the kernel might see
+ * a 0 value of the futex too.).
+ *
+ * Also serves as futex trylock_pi()'ing, and due semantics.
*/
static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
ktime_t *time, int trylock)
@@ -2300,6 +2303,10 @@ retry_private:
ret = futex_lock_pi_atomic(uaddr, hb, &q.key, &q.pi_state, current, 0);
if (unlikely(ret)) {
+ /*
+ * Atomic work succeeded and we got the lock,
+ * or failed. Either way, we do _not_ block.
+ */
switch (ret) {
case 1:
/* We got the lock. */
--
2.1.4
next prev parent reply other threads:[~2015-06-30 6:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 6:26 [PATCH -tip 0/2] futex: Fault/error injection capabilities Davidlohr Bueso
2015-06-30 6:26 ` Davidlohr Bueso [this message]
2015-07-20 10:57 ` [tip:locking/core] futex: Enhance comments in futex_lock_pi() for blocking paths tip-bot for Davidlohr Bueso
2015-07-20 21:24 ` Darren Hart
2015-07-20 21:59 ` Davidlohr Bueso
2015-07-20 22:02 ` Darren Hart
2015-06-30 6:26 ` [PATCH 2/2] futex: Fault/error injection capabilities Davidlohr Bueso
2015-07-20 10:57 ` [tip:locking/core] " tip-bot for Davidlohr Bueso
2015-07-20 14:35 ` Dave Jones
2015-07-13 9:41 ` [PATCH -tip 0/2] " Davidlohr Bueso
2015-07-16 12:55 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435645562-975-2-git-send-email-dave@stgolabs.net \
--to=dave@stgolabs.net \
--cc=darren@dvhart.com \
--cc=dbueso@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).