Commit 945626db authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

sparc64: Use ftrace_graph_get_ret_stack() instead of curr_ret_stack 



The structure of the ret_stack array on the task struct is going to
change, and accessing it directly via the curr_ret_stack index will no
longer give the ret_stack entry that holds the return address. To access
that, architectures must now use ftrace_graph_get_ret_stack() to get the
associated ret_stack that matches the saved return address.

Cc: sparclinux@vger.kernel.org
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 0fad8bfe

arch/sparc/kernel/perf_event.c

+5 −3
Original line number Diff line number Diff line
@@ -1767,9 +1767,11 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, 
		perf_callchain_store(entry, pc);

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

		if ((pc + 8UL) == (unsigned long) &return_to_handler) {

			int index = current->curr_ret_stack;

			if (current->ret_stack && index >= graph) {

				pc = current->ret_stack[index - graph].ret;

			struct ftrace_ret_stack *ret_stack;

			ret_stack = ftrace_graph_get_ret_stack(current,

							       graph);

			if (ret_stack) {

				pc = ret_stack->ret;

				perf_callchain_store(entry, pc);

				graph++;

			}

arch/sparc/kernel/stacktrace.c

+5 −3
Original line number Diff line number Diff line
@@ -57,9 +57,11 @@ static void __save_stack_trace(struct thread_info *tp, 
			trace->entries[trace->nr_entries++] = pc;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

			if ((pc + 8UL) == (unsigned long) &return_to_handler) {

				int index = t->curr_ret_stack;

				if (t->ret_stack && index >= graph) {

					pc = t->ret_stack[index - graph].ret;

				struct ftrace_ret_stack *ret_stack;

				ret_stack = ftrace_graph_get_ret_stack(t,

								       graph);

				if (ret_stack) {

					pc = ret_stack->ret;

					if (trace->nr_entries <

					    trace->max_entries)

						trace->entries[trace->nr_entries++] = pc;

arch/sparc/kernel/traps_64.c

+4 −3
Original line number Diff line number Diff line
@@ -2502,9 +2502,10 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) 
		printk(" [%016lx] %pS\n", pc, (void *) pc);

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

		if ((pc + 8UL) == (unsigned long) &return_to_handler) {

			int index = tsk->curr_ret_stack;

			if (tsk->ret_stack && index >= graph) {

				pc = tsk->ret_stack[index - graph].ret;

			struct ftrace_ret_stack *ret_stack;

			ret_stack = ftrace_graph_get_ret_stack(tsk, graph);

			if (ret_stack) {

				pc = ret_stack->ret;

				printk(" [%016lx] %pS\n", pc, (void *) pc);

				graph++;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE