Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1295594

[tip:locking/core] futex: Cleanup the goto confusion in requeue_pi()

Show all headers | View raw

Commit-ID:  885c2cb770b5ac2507c41bc9f91a5d1c98337bee
Gitweb:     http://git.kernel.org/tip/885c2cb770b5ac2507c41bc9f91a5d1c98337bee
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Sat, 19 Dec 2015 20:07:41 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 20 Dec 2015 12:43:25 +0100

futex: Cleanup the goto confusion in requeue_pi()

out_unlock: does not only drop the locks, it also drops the refcount
on the pi_state. Really intuitive.

Move the label after the put_pi_state() call and use 'break' in the
error handling path of the requeue loop.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Darren Hart <darren@dvhart.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Bhuvanesh_Surachari@mentor.com
Cc: Andy Lowe <Andy_Lowe@mentor.com>
Link: http://lkml.kernel.org/r/20151219200607.526665141@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/futex.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index dcec018..461d438 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1839,20 +1839,25 @@ retry_private:
 				 */
 				this->pi_state = NULL;
 				put_pi_state(pi_state);
-				goto out_unlock;
+				/*
+				 * We stop queueing more waiters and let user
+				 * space deal with the mess.
+				 */
+				break;
 			}
 		}
 		requeue_futex(this, hb1, hb2, &key2);
 		drop_count++;
 	}
 
-out_unlock:
 	/*
 	 * We took an extra initial reference to the pi_state either
 	 * in futex_proxy_trylock_atomic() or in lookup_pi_state(). We
 	 * need to drop it here again.
 	 */
 	put_pi_state(pi_state);
+
+out_unlock:
 	double_unlock_hb(hb1, hb2);
 	wake_up_q(&wake_q);
 	hb_waiters_dec(hb2);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch 0/5] futex: Plug a pi_state leak and clarify the refcounting Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:10 +0100
  [patch 5/5] futex: Cleanup the goto confusion in requeue_pi() Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:10 +0100
    Re: [patch 5/5] futex: Cleanup the goto confusion in requeue_pi() Darren Hart <dvhart@infradead.org> - 2015-12-20 06:20 +0100
      Re: [patch 5/5] futex: Cleanup the goto confusion in requeue_pi() Mike Galbraith <umgwanakikbuti@gmail.com> - 2015-12-20 06:50 +0100
        Re: [patch 5/5] futex: Cleanup the goto confusion in requeue_pi() Darren Hart <dvhart@infradead.org> - 2015-12-20 08:40 +0100
      Re: [patch 5/5] futex: Cleanup the goto confusion in requeue_pi() Darren Hart <dvhart@infradead.org> - 2015-12-20 06:50 +0100
    [tip:locking/core] futex:   Cleanup the goto confusion in requeue_pi() tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2015-12-20 14:30 +0100
  [patch 3/5] futex: Document pi_state refcounting in requeue code Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:10 +0100
    Re: [patch 3/5] futex: Document pi_state refcounting in requeue code Darren Hart <dvhart@infradead.org> - 2015-12-20 08:50 +0100
    [tip:locking/core] futex:   Document pi_state refcounting in requeue code tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2015-12-20 14:30 +0100
  [patch 1/5] futex: Drop refcount if requeue_pi() acquired the rtmutex Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:10 +0100
    [tip:locking/core] futex: Drop refcount if requeue_pi()   acquired the rtmutex tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2015-12-20 14:30 +0100
  [patch 2/5] futex: Rename free_pi_state() to put_pi_state() Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:10 +0100
    [tip:locking/core] futex: Rename free_pi_state() to put_pi_state(  ) tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2015-12-20 14:30 +0100
  [patch 4/5] futex: Remove pointless put_pi_state calls in requeue() Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:20 +0100
    [tip:locking/core] futex:   Remove pointless put_pi_state calls in requeue() tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2015-12-20 14:30 +0100

csiph-web