rcu: Fix cpustart tracepoint gp_seq number
authorJoel Fernandes (Google) <joel@joelfernandes.org>
Mon, 14 May 2018 03:15:41 +0000 (20:15 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 12 Jul 2018 22:38:53 +0000 (15:38 -0700)
The "cpustart" trace event shows a stale gp_seq. This is because it uses
rdp->gp_seq, which is updated only at the end of the __note_gp_changes()
function. This commit therefore instead uses rnp->gp_seq.

An alternative fix would be to update rdp->gp_seq earlier, but this would
break RCU's detection of the beginning of a new-to-this-CPU grace period.

Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
kernel/rcu/tree.c

index 73a33b82cfcd42a39425622cbc1fecbd212477ba..973250503d984eda185298b4514b166a965f3ec2 100644 (file)
@@ -1801,7 +1801,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
                 * set up to detect a quiescent state, otherwise don't
                 * go looking for one.
                 */
-               trace_rcu_grace_period(rsp->name, rdp->gp_seq, TPS("cpustart"));
+               trace_rcu_grace_period(rsp->name, rnp->gp_seq, TPS("cpustart"));
                need_gp = !!(rnp->qsmask & rdp->grpmask);
                rdp->cpu_no_qs.b.norm = need_gp;
                rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_dynticks.rcu_qs_ctr);