Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"Fix the arm64 usage of ftrace_graph_ret_addr() to pass the
&state->graph_idx pointer instead of NULL, otherwise this function
just returns early"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: stacktrace: fix the usage of ftrace_graph_ret_addr()
+3
-1
+3
-1
arch/arm64/kernel/stacktrace.c
+3
-1
arch/arm64/kernel/stacktrace.c
···
25
25
*
26
26
* @common: Common unwind state.
27
27
* @task: The task being unwound.
28
+
* @graph_idx: Used by ftrace_graph_ret_addr() for optimized stack unwinding.
28
29
* @kr_cur: When KRETPROBES is selected, holds the kretprobe instance
29
30
* associated with the most recently encountered replacement lr
30
31
* value.
···
33
32
struct kunwind_state {
34
33
struct unwind_state common;
35
34
struct task_struct *task;
35
+
int graph_idx;
36
36
#ifdef CONFIG_KRETPROBES
37
37
struct llist_node *kr_cur;
38
38
#endif
···
108
106
if (state->task->ret_stack &&
109
107
(state->common.pc == (unsigned long)return_to_handler)) {
110
108
unsigned long orig_pc;
111
-
orig_pc = ftrace_graph_ret_addr(state->task, NULL,
109
+
orig_pc = ftrace_graph_ret_addr(state->task, &state->graph_idx,
112
110
state->common.pc,
113
111
(void *)state->common.fp);
114
112
if (WARN_ON_ONCE(state->common.pc == orig_pc))