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

Commit 4dce17b2 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

Merge commit '0f179765' into trace/ftrace/core 



Need to get the changes from 0f179765 ("ftrace: Fix regression with
module command in stack_trace_filter") as it is required to fix some other
changes with stack_trace_filter and the new development code.

Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parents 4ec78467 0f179765

kernel/trace/ftrace.c

+0 −3
Original line number Diff line number Diff line
@@ -4653,9 +4653,6 @@ static int ftrace_process_regex(struct ftrace_iterator *iter, 


	command = strsep(&next, ":");



	if (WARN_ON_ONCE(!tr))

		return -EINVAL;



	mutex_lock(&ftrace_cmd_mutex);

	list_for_each_entry(p, &ftrace_commands, list) {

		if (strcmp(p->name, command) == 0) {

kernel/trace/trace.c

+3 −0
Original line number Diff line number Diff line
@@ -6957,6 +6957,9 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, 
	char *number;

	int ret;



	if (!tr)

		return -ENODEV;



	/* hash funcs only work with set_ftrace_filter */

	if (!enable)

		return -EINVAL;

kernel/trace/trace_functions.c

+12 −0
Original line number Diff line number Diff line
@@ -654,6 +654,9 @@ ftrace_trace_onoff_callback(struct trace_array *tr, struct ftrace_hash *hash, 
{

	struct ftrace_probe_ops *ops;



	if (!tr)

		return -ENODEV;



	/* we register both traceon and traceoff to this callback */

	if (strcmp(cmd, "traceon") == 0)

		ops = param ? &traceon_count_probe_ops : &traceon_probe_ops;
@@ -670,6 +673,9 @@ ftrace_stacktrace_callback(struct trace_array *tr, struct ftrace_hash *hash, 
{

	struct ftrace_probe_ops *ops;



	if (!tr)

		return -ENODEV;



	ops = param ? &stacktrace_count_probe_ops : &stacktrace_probe_ops;



	return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd,
@@ -682,6 +688,9 @@ ftrace_dump_callback(struct trace_array *tr, struct ftrace_hash *hash, 
{

	struct ftrace_probe_ops *ops;



	if (!tr)

		return -ENODEV;



	ops = &dump_probe_ops;



	/* Only dump once. */
@@ -695,6 +704,9 @@ ftrace_cpudump_callback(struct trace_array *tr, struct ftrace_hash *hash, 
{

	struct ftrace_probe_ops *ops;



	if (!tr)

		return -ENODEV;



	ops = &cpudump_probe_ops;



	/* Only dump once. */

kernel/trace/trace_stack.c

+4 −2
Original line number Diff line number Diff line
@@ -409,7 +409,9 @@ static const struct file_operations stack_trace_fops = { 
static int

stack_trace_filter_open(struct inode *inode, struct file *file)

{

	return ftrace_regex_open(&trace_ops, FTRACE_ITER_FILTER,

	struct ftrace_ops *ops = inode->i_private;



	return ftrace_regex_open(ops, FTRACE_ITER_FILTER,

				 inode, file);

}
@@ -476,7 +478,7 @@ static __init int stack_trace_init(void) 
			NULL, &stack_trace_fops);



	trace_create_file("stack_trace_filter", 0444, d_tracer,

			NULL, &stack_trace_filter_fops);

			  &trace_ops, &stack_trace_filter_fops);



	if (stack_trace_filter_buf[0])

		ftrace_set_early_filter(&trace_ops, stack_trace_filter_buf, 1);