1 files changed, 7 insertions, 8 deletions

diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c
index 4989f7ea1e59..1a29f2695ff2 100644
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@ -59,18 +59,17 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame)
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
         if (tsk->ret_stack &&
                         (frame->pc == (unsigned long)return_to_handler)) {
-                if (WARN_ON_ONCE(frame->graph == -1))
-                        return -EINVAL;
-                if (frame->graph < -1)
-                        frame->graph += FTRACE_NOTRACE_DEPTH;
-
+                struct ftrace_ret_stack *ret_stack;
                 /*
                  * This is a case where function graph tracer has
                  * modified a return address (LR) in a stack frame
                  * to hook a function return.
                  * So replace it to an original value.
                  */
-                frame->pc = tsk->ret_stack[frame->graph--].ret;
+                ret_stack = ftrace_graph_get_ret_stack(tsk, frame->graph++);
+                if (WARN_ON_ONCE(!ret_stack))
+                        return -EINVAL;
+                frame->pc = ret_stack->ret;
         }
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
@@ -137,7 +136,7 @@ void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)
         frame.fp = regs->regs[29];
         frame.pc = regs->pc;
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-        frame.graph = current->curr_ret_stack;
+        frame.graph = 0;
 #endif
 
         walk_stackframe(current, &frame, save_trace, &data);
@@ -168,7 +167,7 @@ static noinline void __save_stack_trace(struct task_struct *tsk,
                 frame.pc = (unsigned long)__save_stack_trace;
         }
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-        frame.graph = tsk->curr_ret_stack;
+        frame.graph = 0;
 #endif
 
         walk_stackframe(tsk, &frame, save_trace, &data);