浏览代码

rcu: Expedited wakeups need to be fully ordered

Expedited grace periods use workqueue handlers that wake up the requesters,
but there is no lock mediating this wakeup.  Therefore, memory barriers
are required to ensure that the handler's memory references are seen by
all to occur before synchronize_*_expedited() returns to its caller.
Possibly detected by syzkaller.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Paul E. McKenney 8 年之前
父节点
当前提交
3c345825c8
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      kernel/rcu/tree_exp.h

+ 2 - 0
kernel/rcu/tree_exp.h

@@ -533,6 +533,7 @@ static void rcu_exp_wait_wake(struct rcu_state *rsp, unsigned long s)
 				rnp->exp_seq_rq = s;
 				rnp->exp_seq_rq = s;
 			spin_unlock(&rnp->exp_lock);
 			spin_unlock(&rnp->exp_lock);
 		}
 		}
+		smp_mb(); /* All above changes before wakeup. */
 		wake_up_all(&rnp->exp_wq[(rsp->expedited_sequence >> 1) & 0x3]);
 		wake_up_all(&rnp->exp_wq[(rsp->expedited_sequence >> 1) & 0x3]);
 	}
 	}
 	trace_rcu_exp_grace_period(rsp->name, s, TPS("endwake"));
 	trace_rcu_exp_grace_period(rsp->name, s, TPS("endwake"));
@@ -614,6 +615,7 @@ static void _synchronize_rcu_expedited(struct rcu_state *rsp,
 	wait_event(rnp->exp_wq[(s >> 1) & 0x3],
 	wait_event(rnp->exp_wq[(s >> 1) & 0x3],
 		   sync_exp_work_done(rsp,
 		   sync_exp_work_done(rsp,
 				      &rdp->exp_workdone0, s));
 				      &rdp->exp_workdone0, s));
+	smp_mb(); /* Workqueue actions happen before return. */
 
 
 	/* Let the next expedited grace period start. */
 	/* Let the next expedited grace period start. */
 	mutex_unlock(&rsp->exp_mutex);
 	mutex_unlock(&rsp->exp_mutex);