Commit fee5997c authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Convert rcu_fqs tracepoint to ->gp_seq 



This commit makes the rcu_fqs tracepoint use ->gp_seq instead of ->gpnum.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent db023296

include/trace/events/rcu.h

+6 −6
Original line number Diff line number Diff line
@@ -398,26 +398,26 @@ TRACE_EVENT(rcu_quiescent_state_report, 
 */

TRACE_EVENT(rcu_fqs,



	TP_PROTO(const char *rcuname, unsigned long gpnum, int cpu, const char *qsevent),

	TP_PROTO(const char *rcuname, unsigned long gp_seq, int cpu, const char *qsevent),



	TP_ARGS(rcuname, gpnum, cpu, qsevent),

	TP_ARGS(rcuname, gp_seq, cpu, qsevent),



	TP_STRUCT__entry(

		__field(const char *, rcuname)

		__field(unsigned long, gpnum)

		__field(unsigned long, gp_seq)

		__field(int, cpu)

		__field(const char *, qsevent)

	),



	TP_fast_assign(

		__entry->rcuname = rcuname;

		__entry->gpnum = gpnum;

		__entry->gp_seq = gp_seq;

		__entry->cpu = cpu;

		__entry->qsevent = qsevent;

	),



	TP_printk("%s %lu %d %s",

		  __entry->rcuname, __entry->gpnum,

		  __entry->rcuname, __entry->gp_seq,

		  __entry->cpu, __entry->qsevent)

);
@@ -766,7 +766,7 @@ TRACE_EVENT(rcu_barrier, 
#define trace_rcu_quiescent_state_report(rcuname, gp_seq, mask, qsmask, level, \

					 grplo, grphi, gp_tasks) do { } \

	while (0)

#define trace_rcu_fqs(rcuname, gpnum, cpu, qsevent) do { } while (0)

#define trace_rcu_fqs(rcuname, gp_seq, cpu, qsevent) do { } while (0)

#define trace_rcu_dyntick(polarity, oldnesting, newnesting, dyntick) do { } while (0)

#define trace_rcu_callback(rcuname, rhp, qlen_lazy, qlen) do { } while (0)

#define trace_rcu_kfree_callback(rcuname, rhp, offset, qlen_lazy, qlen) \

kernel/rcu/tree.c

+4 −4
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp) 
{

	rdp->dynticks_snap = rcu_dynticks_snap(rdp->dynticks);

	if (rcu_dynticks_in_eqs(rdp->dynticks_snap)) {

		trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));

		trace_rcu_fqs(rdp->rsp->name, rdp->gp_seq, rdp->cpu, TPS("dti"));

		rcu_gpnum_ovf(rdp->mynode, rdp);

		return 1;

	}
@@ -1161,7 +1161,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp) 
	 * of the current RCU grace period.

	 */

	if (rcu_dynticks_in_eqs_since(rdp->dynticks, rdp->dynticks_snap)) {

		trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));

		trace_rcu_fqs(rdp->rsp->name, rdp->gp_seq, rdp->cpu, TPS("dti"));

		rdp->dynticks_fqs++;

		rcu_gpnum_ovf(rnp, rdp);

		return 1;
@@ -1178,7 +1178,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp) 
	if (time_after(jiffies, rdp->rsp->gp_start + jtsq) &&

	    READ_ONCE(rdp->rcu_qs_ctr_snap) != per_cpu(rcu_dynticks.rcu_qs_ctr, rdp->cpu) &&

	    rcu_seq_current(&rdp->gp_seq) == rnp->gp_seq && !rdp->gpwrap) {

		trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("rqc"));

		trace_rcu_fqs(rdp->rsp->name, rdp->gp_seq, rdp->cpu, TPS("rqc"));

		rcu_gpnum_ovf(rnp, rdp);

		return 1;

	} else if (time_after(jiffies, rdp->rsp->gp_start + jtsq)) {
@@ -1188,7 +1188,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp) 


	/* Check for the CPU being offline. */

	if (!(rdp->grpmask & rcu_rnp_online_cpus(rnp))) {

		trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("ofl"));

		trace_rcu_fqs(rdp->rsp->name, rdp->gp_seq, rdp->cpu, TPS("ofl"));

		rdp->offline_fqs++;

		rcu_gpnum_ovf(rnp, rdp);

		return 1;