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

rcu: Convert rcu_preempt_task tracepoint to ->gp_seq 



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

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

include/trace/events/rcu.h

+6 −6
Original line number Diff line number Diff line
@@ -298,24 +298,24 @@ TRACE_EVENT(rcu_nocb_wake, 
 */

TRACE_EVENT(rcu_preempt_task,



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

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



	TP_ARGS(rcuname, pid, gpnum),

	TP_ARGS(rcuname, pid, gp_seq),



	TP_STRUCT__entry(

		__field(const char *, rcuname)

		__field(unsigned long, gpnum)

		__field(unsigned long, gp_seq)

		__field(int, pid)

	),



	TP_fast_assign(

		__entry->rcuname = rcuname;

		__entry->gpnum = gpnum;

		__entry->gp_seq = gp_seq;

		__entry->pid = pid;

	),



	TP_printk("%s %lu %d",

		  __entry->rcuname, __entry->gpnum, __entry->pid)

		  __entry->rcuname, __entry->gp_seq, __entry->pid)

);



/*
@@ -761,7 +761,7 @@ TRACE_EVENT(rcu_barrier, 
#define trace_rcu_exp_funnel_lock(rcuname, level, grplo, grphi, gpevent) \

	do { } while (0)

#define trace_rcu_nocb_wake(rcuname, cpu, reason) do { } while (0)

#define trace_rcu_preempt_task(rcuname, pid, gpnum) do { } while (0)

#define trace_rcu_preempt_task(rcuname, pid, gp_seq) do { } while (0)

#define trace_rcu_unlock_preempted_task(rcuname, gpnum, pid) do { } while (0)

#define trace_rcu_quiescent_state_report(rcuname, gpnum, mask, qsmask, level, \

					 grplo, grphi, gp_tasks) do { } \

kernel/rcu/tree_plugin.h

+2 −2
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ static void rcu_preempt_note_context_switch(bool preempt) 
		trace_rcu_preempt_task(rdp->rsp->name,

				       t->pid,

				       (rnp->qsmask & rdp->grpmask)

				       ? rnp->gpnum

				       : rnp->gpnum + 1);

				       ? rnp->gp_seq

				       : rcu_seq_snap(&rnp->gp_seq));

		rcu_preempt_ctxt_queue(rnp, rdp);

	} else if (t->rcu_read_lock_nesting < 0 &&

		   t->rcu_read_unlock_special.s) {