Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rcu: Have rcutiny tracepoints use tracepoint_string() 



This commit extends the work done in f7f7bac9 (rcu: Have the RCU
tracepoints use the tracepoint_string infrastructure) to cover rcutiny.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
parent 26cdfedf

kernel/rcu.h

+7 −0
Original line number Diff line number Diff line
@@ -122,4 +122,11 @@ int rcu_jiffies_till_stall_check(void); 


#endif /* #ifdef CONFIG_RCU_STALL_COMMON */



/*

 * Strings used in tracepoints need to be exported via the

 * tracing system such that tools like perf and trace-cmd can

 * translate the string address pointers to actual text.

 */

#define TPS(x)  tracepoint_string(x)



#endif /* __LINUX_RCU_H */

kernel/rcutiny.c

+10 −7
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/time.h>

#include <linux/cpu.h>

#include <linux/prefetch.h>

#include <linux/ftrace_event.h>



#ifdef CONFIG_RCU_TRACE

#include <trace/events/rcu.h>
@@ -58,16 +59,17 @@ static long long rcu_dynticks_nesting = DYNTICK_TASK_EXIT_IDLE; 
static void rcu_idle_enter_common(long long newval)

{

	if (newval) {

		RCU_TRACE(trace_rcu_dyntick("--=",

		RCU_TRACE(trace_rcu_dyntick(TPS("--="),

					    rcu_dynticks_nesting, newval));

		rcu_dynticks_nesting = newval;

		return;

	}

	RCU_TRACE(trace_rcu_dyntick("Start", rcu_dynticks_nesting, newval));

	RCU_TRACE(trace_rcu_dyntick(TPS("Start"),

				    rcu_dynticks_nesting, newval));

	if (!is_idle_task(current)) {

		struct task_struct *idle = idle_task(smp_processor_id());



		RCU_TRACE(trace_rcu_dyntick("Error on entry: not idle task",

		RCU_TRACE(trace_rcu_dyntick(TPS("Entry error: not idle task"),

					    rcu_dynticks_nesting, newval));

		ftrace_dump(DUMP_ALL);

		WARN_ONCE(1, "Current pid: %d comm: %s / Idle pid: %d comm: %s",
@@ -120,15 +122,15 @@ EXPORT_SYMBOL_GPL(rcu_irq_exit); 
static void rcu_idle_exit_common(long long oldval)

{

	if (oldval) {

		RCU_TRACE(trace_rcu_dyntick("++=",

		RCU_TRACE(trace_rcu_dyntick(TPS("++="),

					    oldval, rcu_dynticks_nesting));

		return;

	}

	RCU_TRACE(trace_rcu_dyntick("End", oldval, rcu_dynticks_nesting));

	RCU_TRACE(trace_rcu_dyntick(TPS("End"), oldval, rcu_dynticks_nesting));

	if (!is_idle_task(current)) {

		struct task_struct *idle = idle_task(smp_processor_id());



		RCU_TRACE(trace_rcu_dyntick("Error on exit: not idle task",

		RCU_TRACE(trace_rcu_dyntick(TPS("Exit error: not idle task"),

			  oldval, rcu_dynticks_nesting));

		ftrace_dump(DUMP_ALL);

		WARN_ONCE(1, "Current pid: %d comm: %s / Idle pid: %d comm: %s",
@@ -304,7 +306,8 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp) 
		RCU_TRACE(cb_count++);

	}

	RCU_TRACE(rcu_trace_sub_qlen(rcp, cb_count));

	RCU_TRACE(trace_rcu_batch_end(rcp->name, cb_count, 0, need_resched(),

	RCU_TRACE(trace_rcu_batch_end(rcp->name,

				      cb_count, 0, need_resched(),

				      is_idle_task(current),

				      false));

}

kernel/rcutree.c

+0 −7
Original line number Diff line number Diff line
@@ -61,13 +61,6 @@ 


#include "rcu.h"



/*

 * Strings used in tracepoints need to be exported via the

 * tracing system such that tools like perf and trace-cmd can

 * translate the string address pointers to actual text.

 */

#define TPS(x)	tracepoint_string(x)



/* Data structures. */



static struct lock_class_key rcu_node_class[RCU_NUM_LVLS];