Commit 340170fe authored by Paul E. McKenney's avatar Paul E. McKenney

rcutorture: Suppress pi-lock-across read-unlock testing for Tiny SRCU

Because Tiny srcu_read_unlock() directly calls swake_up_one(), lockdep
complains when a pi lock is held across that srcu_read_unlock().
Although this is a lockdep false positive (there is no other CPU to
complete the deadlock cycle), lockdep is what it is at the moment.
This commit therefore prevents rcutorture from holding pi lock across
a Tiny srcu_read_unlock().
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 1c3d5398
...@@ -349,6 +349,7 @@ struct rcu_torture_ops { ...@@ -349,6 +349,7 @@ struct rcu_torture_ops {
int can_boost; int can_boost;
int extendables; int extendables;
int slow_gps; int slow_gps;
int no_pi_lock;
const char *name; const char *name;
}; };
...@@ -670,6 +671,7 @@ static struct rcu_torture_ops srcu_ops = { ...@@ -670,6 +671,7 @@ static struct rcu_torture_ops srcu_ops = {
.cb_barrier = srcu_torture_barrier, .cb_barrier = srcu_torture_barrier,
.stats = srcu_torture_stats, .stats = srcu_torture_stats,
.irq_capable = 1, .irq_capable = 1,
.no_pi_lock = IS_ENABLED(CONFIG_TINY_SRCU),
.name = "srcu" .name = "srcu"
}; };
...@@ -703,6 +705,7 @@ static struct rcu_torture_ops srcud_ops = { ...@@ -703,6 +705,7 @@ static struct rcu_torture_ops srcud_ops = {
.cb_barrier = srcu_torture_barrier, .cb_barrier = srcu_torture_barrier,
.stats = srcu_torture_stats, .stats = srcu_torture_stats,
.irq_capable = 1, .irq_capable = 1,
.no_pi_lock = IS_ENABLED(CONFIG_TINY_SRCU),
.name = "srcud" .name = "srcud"
}; };
...@@ -723,6 +726,7 @@ static struct rcu_torture_ops busted_srcud_ops = { ...@@ -723,6 +726,7 @@ static struct rcu_torture_ops busted_srcud_ops = {
.cb_barrier = srcu_torture_barrier, .cb_barrier = srcu_torture_barrier,
.stats = srcu_torture_stats, .stats = srcu_torture_stats,
.irq_capable = 1, .irq_capable = 1,
.no_pi_lock = IS_ENABLED(CONFIG_TINY_SRCU),
.extendables = RCUTORTURE_MAX_EXTEND, .extendables = RCUTORTURE_MAX_EXTEND,
.name = "busted_srcud" .name = "busted_srcud"
}; };
...@@ -1473,8 +1477,9 @@ static void rcutorture_one_extend(int *readstate, int newstate, ...@@ -1473,8 +1477,9 @@ static void rcutorture_one_extend(int *readstate, int newstate,
idxold2 = 0; idxold2 = 0;
} }
if (statesold & RCUTORTURE_RDR_RCU_1) { if (statesold & RCUTORTURE_RDR_RCU_1) {
bool lockit = !statesnew && !(torture_random(trsp) & 0xffff); bool lockit;
lockit = !cur_ops->no_pi_lock && !statesnew && !(torture_random(trsp) & 0xffff);
if (lockit) if (lockit)
raw_spin_lock_irqsave(&current->pi_lock, flags); raw_spin_lock_irqsave(&current->pi_lock, flags);
cur_ops->readunlock((idxold1 >> RCUTORTURE_RDR_SHIFT_1) & 0x1); cur_ops->readunlock((idxold1 >> RCUTORTURE_RDR_SHIFT_1) & 0x1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment