|
@@ -1810,6 +1810,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
|
|
if (READ_ONCE(rdp_leader->nocb_leader_sleep) || force) {
|
|
if (READ_ONCE(rdp_leader->nocb_leader_sleep) || force) {
|
|
/* Prior smp_mb__after_atomic() orders against prior enqueue. */
|
|
/* Prior smp_mb__after_atomic() orders against prior enqueue. */
|
|
WRITE_ONCE(rdp_leader->nocb_leader_sleep, false);
|
|
WRITE_ONCE(rdp_leader->nocb_leader_sleep, false);
|
|
|
|
+ smp_mb(); /* ->nocb_leader_sleep before swake_up(). */
|
|
swake_up(&rdp_leader->nocb_wq);
|
|
swake_up(&rdp_leader->nocb_wq);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -2064,6 +2065,7 @@ wait_again:
|
|
* nocb_gp_head, where they await a grace period.
|
|
* nocb_gp_head, where they await a grace period.
|
|
*/
|
|
*/
|
|
gotcbs = false;
|
|
gotcbs = false;
|
|
|
|
+ smp_mb(); /* wakeup before ->nocb_head reads. */
|
|
for (rdp = my_rdp; rdp; rdp = rdp->nocb_next_follower) {
|
|
for (rdp = my_rdp; rdp; rdp = rdp->nocb_next_follower) {
|
|
rdp->nocb_gp_head = READ_ONCE(rdp->nocb_head);
|
|
rdp->nocb_gp_head = READ_ONCE(rdp->nocb_head);
|
|
if (!rdp->nocb_gp_head)
|
|
if (!rdp->nocb_gp_head)
|