From: Naveen N. Rao Date: Thu, 5 Sep 2019 18:20:28 +0000 (+0530) Subject: ftrace: Look up the address of return_to_handler() using helpers X-Git-Tag: v5.4-rc1~99^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a3db31ff6ce31f5a544a66b61613a098029031cc;p=linux.git ftrace: Look up the address of return_to_handler() using helpers This ensures that we use the right address on architectures that use function descriptors. Signed-off-by: Naveen N. Rao Acked-by: Steven Rostedt (VMware) Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/8f6f14d192a994008ac370ce14036bbe67224c7d.1567707399.git.naveen.n.rao@linux.vnet.ibm.com --- diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 8dfd5021b933..7950a0356042 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -276,7 +276,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, int index = task->curr_ret_stack; int i; - if (ret != (unsigned long)return_to_handler) + if (ret != (unsigned long)dereference_kernel_function_descriptor(return_to_handler)) return ret; if (index < 0) @@ -294,7 +294,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, { int task_idx; - if (ret != (unsigned long)return_to_handler) + if (ret != (unsigned long)dereference_kernel_function_descriptor(return_to_handler)) return ret; task_idx = task->curr_ret_stack;