Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking updates from Ingo Molnar:
 "The biggest part of this tree is the new auto-generated atomics API
  wrappers by Mark Rutland.

  The primary motivation was to allow instrumentation without uglifying
  the primary source code.

  The linecount increase comes from adding the auto-generated files to
  the Git space as well:

    include/asm-generic/atomic-instrumented.h     | 1689 ++++++++++++++++--
    include/asm-generic/atomic-long.h             | 1174 ++++++++++---
    include/linux/atomic-fallback.h               | 2295 +++++++++++++++++++++++++
    include/linux/atomic.h                        | 1241 +------------

  I preferred this approach, so that the full call stack of the (already
  complex) locking APIs is still fully visible in 'git grep'.

  But if this is excessive we could certainly hide them.

  There's a separate build-time mechanism to determine whether the
  headers are out of date (they should never be stale if we do our job
  right).

  Anyway, nothing from this should be visible to regular kernel
  developers.

  Other changes:

   - Add support for dynamic keys, which removes a source of false
     positives in the workqueue code, among other things (Bart Van
     Assche)

   - Updates to tools/memory-model (Andrea Parri, Paul E. McKenney)

   - qspinlock, wake_q and lockdep micro-optimizations (Waiman Long)

   - misc other updates and enhancements"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (48 commits)
  locking/lockdep: Shrink struct lock_class_key
  locking/lockdep: Add module_param to enable consistency checks
  lockdep/lib/tests: Test dynamic key registration
  lockdep/lib/tests: Fix run_tests.sh
  kernel/workqueue: Use dynamic lockdep keys for workqueues
  locking/lockdep: Add support for dynamic keys
  locking/lockdep: Verify whether lock objects are small enough to be used as class keys
  locking/lockdep: Check data structure consistency
  locking/lockdep: Reuse lock chains that have been freed
  locking/lockdep: Fix a comment in add_chain_cache()
  locking/lockdep: Introduce lockdep_next_lockchain() and lock_chain_count()
  locking/lockdep: Reuse list entries that are no longer in use
  locking/lockdep: Free lock classes that are no longer in use
  locking/lockdep: Update two outdated comments
  locking/lockdep: Make it easy to detect whether or not inside a selftest
  locking/lockdep: Split lockdep_free_key_range() and lockdep_reset_lock()
  locking/lockdep: Initialize the locks_before and locks_after lists earlier
  locking/lockdep: Make zap_class() remove all matching lock order entries
  locking/lockdep: Reorder struct lock_class members
  locking/lockdep: Avoid that add_chain_cache() adds an invalid chain to the cache
  ...

1 files changed, 11 insertions, 15 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index ca58fc0a496e..c3b73b0311bc 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -68,6 +68,7 @@
 #include <linux/freezer.h>
 #include <linux/memblock.h>
 #include <linux/fault-inject.h>
+#include <linux/refcount.h>
 
 #include <asm/futex.h>
 
@@ -212,7 +213,7 @@ struct futex_pi_state {
         struct rt_mutex pi_mutex;
 
         struct task_struct *owner;
-        atomic_t refcount;
+        refcount_t refcount;
 
         union futex_key key;
 } __randomize_layout;
@@ -321,12 +322,8 @@ static int __init fail_futex_debugfs(void)
         if (IS_ERR(dir))
                 return PTR_ERR(dir);
 
-        if (!debugfs_create_bool("ignore-private", mode, dir,
-                                 &fail_futex.ignore_private)) {
-                debugfs_remove_recursive(dir);
-                return -ENOMEM;
-        }
-
+        debugfs_create_bool("ignore-private", mode, dir,
+                            &fail_futex.ignore_private);
         return 0;
 }
 
@@ -803,7 +800,7 @@ static int refill_pi_state_cache(void)
         INIT_LIST_HEAD(&pi_state->list);
         /* pi_mutex gets initialized later */
         pi_state->owner = NULL;
-        atomic_set(&pi_state->refcount, 1);
+        refcount_set(&pi_state->refcount, 1);
         pi_state->key = FUTEX_KEY_INIT;
 
         current->pi_state_cache = pi_state;
@@ -823,7 +820,7 @@ static struct futex_pi_state *alloc_pi_state(void)
 
 static void get_pi_state(struct futex_pi_state *pi_state)
 {
-        WARN_ON_ONCE(!atomic_inc_not_zero(&pi_state->refcount));
+        WARN_ON_ONCE(!refcount_inc_not_zero(&pi_state->refcount));
 }
 
 /*
@@ -835,7 +832,7 @@ static void put_pi_state(struct futex_pi_state *pi_state)
         if (!pi_state)
                 return;
 
-        if (!atomic_dec_and_test(&pi_state->refcount))
+        if (!refcount_dec_and_test(&pi_state->refcount))
                 return;
 
         /*
@@ -865,7 +862,7 @@ static void put_pi_state(struct futex_pi_state *pi_state)
                  * refcount is at 0 - put it back to 1.
                  */
                 pi_state->owner = NULL;
-                atomic_set(&pi_state->refcount, 1);
+                refcount_set(&pi_state->refcount, 1);
                 current->pi_state_cache = pi_state;
         }
 }
@@ -908,7 +905,7 @@ void exit_pi_state_list(struct task_struct *curr)
                  * In that case; drop the locks to let put_pi_state() make
                  * progress and retry the loop.
                  */
-                if (!atomic_inc_not_zero(&pi_state->refcount)) {
+                if (!refcount_inc_not_zero(&pi_state->refcount)) {
                         raw_spin_unlock_irq(&curr->pi_lock);
                         cpu_relax();
                         raw_spin_lock_irq(&curr->pi_lock);
@@ -1064,7 +1061,7 @@ static int attach_to_pi_state(u32 __user *uaddr, u32 uval,
          * and futex_wait_requeue_pi() as it cannot go to 0 and consequently
          * free pi_state before we can take a reference ourselves.
          */
-        WARN_ON(!atomic_read(&pi_state->refcount));
+        WARN_ON(!refcount_read(&pi_state->refcount));
 
         /*
          * Now that we have a pi_state, we can acquire wait_lock
@@ -1467,8 +1464,7 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)
          * Queue the task for later wakeup for after we've released
          * the hb->lock. wake_q_add() grabs reference to p.
          */
-        wake_q_add(wake_q, p);
-        put_task_struct(p);
+        wake_q_add_safe(wake_q, p);
 }
 
 /*