OSDN Git Service

rcu: Add missing annotation for rcu_nocb_bypass_lock()
authorJules Irenge <jbi.octave@gmail.com>
Mon, 20 Jan 2020 22:42:15 +0000 (22:42 +0000)
committerPaul E. McKenney <paulmck@kernel.org>
Thu, 20 Feb 2020 23:58:23 +0000 (15:58 -0800)
Sparse reports warning at rcu_nocb_bypass_lock()

|warning: context imbalance in rcu_nocb_bypass_lock() - wrong count at exit

To fix this, this commit adds an __acquires(&rdp->nocb_bypass_lock).
Given that rcu_nocb_bypass_lock() does actually call raw_spin_lock()
when raw_spin_trylock() fails, this not only fixes the warning but also
improves on the readability of the code.

Signed-off-by: Jules Irenge <jbi.octave@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
kernel/rcu/tree_plugin.h

index 0f8b714..6db2cad 100644 (file)
@@ -1486,6 +1486,7 @@ module_param(nocb_nobypass_lim_per_jiffy, int, 0);
  * flag the contention.
  */
 static void rcu_nocb_bypass_lock(struct rcu_data *rdp)
+       __acquires(&rdp->nocb_bypass_lock)
 {
        lockdep_assert_irqs_disabled();
        if (raw_spin_trylock(&rdp->nocb_bypass_lock))