|
@@ -427,8 +427,10 @@ void rcu_read_unlock_special(struct task_struct *t)
|
|
|
|
|
|
#ifdef CONFIG_RCU_BOOST
|
|
|
/* Unboost if we were boosted. */
|
|
|
- if (rbmp)
|
|
|
+ if (rbmp) {
|
|
|
rt_mutex_unlock(rbmp);
|
|
|
+ complete(&rnp->boost_completion);
|
|
|
+ }
|
|
|
#endif /* #ifdef CONFIG_RCU_BOOST */
|
|
|
|
|
|
/*
|
|
@@ -1202,10 +1204,14 @@ static int rcu_boost(struct rcu_node *rnp)
|
|
|
t = container_of(tb, struct task_struct, rcu_node_entry);
|
|
|
rt_mutex_init_proxy_locked(&mtx, t);
|
|
|
t->rcu_boost_mutex = &mtx;
|
|
|
+ init_completion(&rnp->boost_completion);
|
|
|
raw_spin_unlock_irqrestore(&rnp->lock, flags);
|
|
|
rt_mutex_lock(&mtx); /* Side effect: boosts task t's priority. */
|
|
|
rt_mutex_unlock(&mtx); /* Keep lockdep happy. */
|
|
|
|
|
|
+ /* Wait until boostee is done accessing mtx before reinitializing. */
|
|
|
+ wait_for_completion(&rnp->boost_completion);
|
|
|
+
|
|
|
return ACCESS_ONCE(rnp->exp_tasks) != NULL ||
|
|
|
ACCESS_ONCE(rnp->boost_tasks) != NULL;
|
|
|
}
|