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

Pull locking updates from Ingo Molnar:
 "Here are the locking changes in this cycle:

   - rwsem unification and simpler micro-optimizations to prepare for
     more intrusive (and more lucrative) scalability improvements in
     v5.3 (Waiman Long)

   - Lockdep irq state tracking flag usage cleanups (Frederic
     Weisbecker)

   - static key improvements (Jakub Kicinski, Peter Zijlstra)

   - misc updates, cleanups and smaller fixes"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
  locking/lockdep: Remove unnecessary unlikely()
  locking/static_key: Don't take sleeping locks in __static_key_slow_dec_deferred()
  locking/static_key: Factor out the fast path of static_key_slow_dec()
  locking/static_key: Add support for deferred static branches
  locking/lockdep: Test all incompatible scenarios at once in check_irq_usage()
  locking/lockdep: Avoid bogus Clang warning
  locking/lockdep: Generate LOCKF_ bit composites
  locking/lockdep: Use expanded masks on find_usage_*() functions
  locking/lockdep: Map remaining magic numbers to lock usage mask names
  locking/lockdep: Move valid_state() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING
  locking/rwsem: Prevent unneeded warning during locking selftest
  locking/rwsem: Optimize rwsem structure for uncontended lock acquisition
  locking/rwsem: Enable lock event counting
  locking/lock_events: Don't show pvqspinlock events on bare metal
  locking/lock_events: Make lock_events available for all archs & other locks
  locking/qspinlock_stat: Introduce generic lockevent_*() counting APIs
  locking/rwsem: Enhance DEBUG_RWSEMS_WARN_ON() macro
  locking/rwsem: Add debug check for __down_read*()
  locking/rwsem: Micro-optimize rwsem_try_read_lock_unqueued()
  locking/rwsem: Move rwsem internal function declarations to rwsem-xadd.h
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c
index 5e9247dc2515..e14b32c69639 100644
--- a/kernel/locking/qspinlock.c
+++ b/kernel/locking/qspinlock.c
@@ -395,7 +395,7 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val)
          * 0,1,0 -> 0,0,1
          */
         clear_pending_set_locked(lock);
-        qstat_inc(qstat_lock_pending, true);
+        lockevent_inc(lock_pending);
         return;
 
         /*
@@ -403,7 +403,7 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val)
          * queuing.
          */
 queue:
-        qstat_inc(qstat_lock_slowpath, true);
+        lockevent_inc(lock_slowpath);
 pv_queue:
         node = this_cpu_ptr(&qnodes[0].mcs);
         idx = node->count++;
@@ -419,7 +419,7 @@ pv_queue:
          * simple enough.
          */
         if (unlikely(idx >= MAX_NODES)) {
-                qstat_inc(qstat_lock_no_node, true);
+                lockevent_inc(lock_no_node);
                 while (!queued_spin_trylock(lock))
                         cpu_relax();
                 goto release;
@@ -430,7 +430,7 @@ pv_queue:
         /*
          * Keep counts of non-zero index values:
          */
-        qstat_inc(qstat_lock_use_node2 + idx - 1, idx);
+        lockevent_cond_inc(lock_use_node2 + idx - 1, idx);
 
         /*
          * Ensure that we increment the head node->count before initialising