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

Commit 2074006d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing updates from Steven Rostedt:
 "The new features of this release:

   - Added TRACE_DEFINE_SIZEOF() which allows trace events that use
     sizeof() it the TP_printk() to be converted to the actual size such
     that trace-cmd and perf can parse them correctly.

   - Some rework of the TRACE_DEFINE_ENUM() such that the above
     TRACE_DEFINE_SIZEOF() could reuse the same code.

   - Recording of tgid (Thread Group ID). This is similar to how task
     COMMs are recorded (cached at sched_switch), where it is in a table
     and used on output of the trace and trace_pipe files.

   - Have ":mod:<module>" be cached when written into set_ftrace_filter.
     Then the functions of the module will be traced at module load.

   - Some random clean ups and small fixes"

* tag 'trace-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (26 commits)
  ftrace: Test for NULL iter->tr in regex for stack_trace_filter changes
  ftrace: Decrement count for dyn_ftrace_total_info for init functions
  ftrace: Unlock hash mutex on failed allocation in process_mod_list()
  tracing: Add support for display of tgid in trace output
  tracing: Add support for recording tgid of tasks
  ftrace: Decrement count for dyn_ftrace_total_info file
  ftrace: Remove unused function ftrace_arch_read_dyn_info()
  sh/ftrace: Remove only user of ftrace_arch_read_dyn_info()
  ftrace: Have cached module filters be an active filter
  ftrace: Implement cached modules tracing on module load
  ftrace: Have the cached module list show in set_ftrace_filter
  ftrace: Add :mod: caching infrastructure to trace_array
  tracing: Show address when function names are not found
  ftrace: Add missing comment for FTRACE_OPS_FL_RCU
  tracing: Rename update the enum_map file
  tracing: Add TRACE_DEFINE_SIZEOF() macros
  tracing: define TRACE_DEFINE_SIZEOF() macro to map sizeof's to their values
  tracing: Rename enum_replace to eval_replace
  trace: rename enum_map functions
  trace: rename trace.c enum functions
  ...
parents f72e24a1 69d71879

arch/arm64/kvm/trace.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ TRACE_EVENT(kvm_arm_set_dreg32, 
	TP_printk("%s: 0x%08x", __entry->name, __entry->value)

);



TRACE_DEFINE_SIZEOF(__u64);



TRACE_EVENT(kvm_arm_set_regset,

	TP_PROTO(const char *type, int len, __u64 *control, __u64 *value),

	TP_ARGS(type, len, control, value),

arch/sh/kernel/ftrace.c

+0 −18
Original line number Diff line number Diff line
@@ -96,19 +96,6 @@ static int mod_code_status; /* holds return value of text write */ 
static void *mod_code_ip;		/* holds the IP to write to */

static void *mod_code_newcode;		/* holds the text to write to the IP */



static unsigned nmi_wait_count;

static atomic_t nmi_update_count = ATOMIC_INIT(0);



int ftrace_arch_read_dyn_info(char *buf, int size)

{

	int r;



	r = snprintf(buf, size, "%u %u",

		     nmi_wait_count,

		     atomic_read(&nmi_update_count));

	return r;

}



static void clear_mod_flag(void)

{

	int old = atomic_read(&nmi_running);
@@ -144,7 +131,6 @@ void arch_ftrace_nmi_enter(void) 
	if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {

		smp_rmb();

		ftrace_mod_code();

		atomic_inc(&nmi_update_count);

	}

	/* Must have previous changes seen before executions */

	smp_mb();
@@ -165,8 +151,6 @@ static void wait_for_nmi_and_set_mod_flag(void) 
	do {

		cpu_relax();

	} while (atomic_cmpxchg(&nmi_running, 0, MOD_CODE_WRITE_FLAG));



	nmi_wait_count++;

}



static void wait_for_nmi(void)
@@ -177,8 +161,6 @@ static void wait_for_nmi(void) 
	do {

		cpu_relax();

	} while (atomic_read(&nmi_running));



	nmi_wait_count++;

}



static int

include/asm-generic/vmlinux.lds.h

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ 
			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\

			KEEP(*(_ftrace_events))				\

			VMLINUX_SYMBOL(__stop_ftrace_events) = .;	\

			VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .;	\

			KEEP(*(_ftrace_enum_map))			\

			VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .;

			VMLINUX_SYMBOL(__start_ftrace_eval_maps) = .;	\

			KEEP(*(_ftrace_eval_map))			\

			VMLINUX_SYMBOL(__stop_ftrace_eval_maps) = .;

#else

#define FTRACE_EVENTS()

#endif

include/linux/ftrace.h

+5 −1
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops); 
 *            for any of the functions that this ops will be registered for, then

 *            this ops will fail to register or set_filter_ip.

 * PID     - Is affected by set_ftrace_pid (allows filtering on those pids)

 * RCU     - Set when the ops can only be called when RCU is watching.

 * TRACE_ARRAY - The ops->private points to a trace_array descriptor.

 */

enum {

	FTRACE_OPS_FL_ENABLED			= 1 << 0,
@@ -137,6 +139,7 @@ enum { 
	FTRACE_OPS_FL_IPMODIFY			= 1 << 13,

	FTRACE_OPS_FL_PID			= 1 << 14,

	FTRACE_OPS_FL_RCU			= 1 << 15,

	FTRACE_OPS_FL_TRACE_ARRAY		= 1 << 16,

};



#ifdef CONFIG_DYNAMIC_FTRACE
@@ -445,7 +448,8 @@ enum { 
	FTRACE_ITER_PRINTALL	= (1 << 2),

	FTRACE_ITER_DO_PROBES	= (1 << 3),

	FTRACE_ITER_PROBE	= (1 << 4),

	FTRACE_ITER_ENABLED	= (1 << 5),

	FTRACE_ITER_MOD		= (1 << 5),

	FTRACE_ITER_ENABLED	= (1 << 6),

};



void arch_ftrace_update_code(int command);

include/linux/module.h

+2 −2
Original line number Diff line number Diff line
@@ -442,8 +442,8 @@ struct module { 
#ifdef CONFIG_EVENT_TRACING

	struct trace_event_call **trace_events;

	unsigned int num_trace_events;

	struct trace_enum_map **trace_enums;

	unsigned int num_trace_enums;

	struct trace_eval_map **trace_evals;

	unsigned int num_trace_evals;

#endif

#ifdef CONFIG_FTRACE_MCOUNT_RECORD

	unsigned int num_ftrace_callsites;