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

Commit b375a11a authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: switch function prints from %pf to %ps 



For direct function pointers (like what mcount provides) PowerPC64
requires the use of %ps, otherwise nothing is printed.

This patch converts all prints of functions retrieved through mcount
to use the %ps format from the %pf.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 91adcd2c

kernel/trace/ftrace.c

+3 −3
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ static int t_hash_show(struct seq_file *m, void *v) 
	if (rec->ops->print)

		return rec->ops->print(m, rec->ip, rec->ops, rec->data);



	seq_printf(m, "%pf:%pf", (void *)rec->ip, (void *)rec->ops->func);

	seq_printf(m, "%ps:%ps", (void *)rec->ip, (void *)rec->ops->func);



	if (rec->data)

		seq_printf(m, ":%p", rec->data);
@@ -1515,7 +1515,7 @@ static int t_show(struct seq_file *m, void *v) 
	if (!rec)

		return 0;



	seq_printf(m, "%pf\n", (void *)rec->ip);

	seq_printf(m, "%ps\n", (void *)rec->ip);



	return 0;

}
@@ -2456,7 +2456,7 @@ static int g_show(struct seq_file *m, void *v) 
		return 0;

	}



	seq_printf(m, "%pf\n", (void *)*ptr);

	seq_printf(m, "%ps\n", (void *)*ptr);



	return 0;

}

kernel/trace/trace_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip, 
{

	long count = (long)data;



	seq_printf(m, "%pf:", (void *)ip);

	seq_printf(m, "%ps:", (void *)ip);



	if (ops == &traceon_probe_ops)

		seq_printf(m, "traceon");

kernel/trace/trace_functions_graph.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret, 
	if (unlikely(current->ret_stack[index].fp != frame_pointer)) {

		ftrace_graph_stop();

		WARN(1, "Bad frame pointer: expected %lx, received %lx\n"

		     "  from func %pF return to %lx\n",

		     "  from func %ps return to %lx\n",

		     current->ret_stack[index].fp,

		     frame_pointer,

		     (void *)current->ret_stack[index].func,
@@ -669,7 +669,7 @@ print_graph_entry_leaf(struct trace_iterator *iter, 
			return TRACE_TYPE_PARTIAL_LINE;

	}



	ret = trace_seq_printf(s, "%pf();\n", (void *)call->func);

	ret = trace_seq_printf(s, "%ps();\n", (void *)call->func);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;
@@ -712,7 +712,7 @@ print_graph_entry_nested(struct trace_iterator *iter, 
			return TRACE_TYPE_PARTIAL_LINE;

	}



	ret = trace_seq_printf(s, "%pf() {\n", (void *)call->func);

	ret = trace_seq_printf(s, "%ps() {\n", (void *)call->func);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;