On Thu, 2017-06-01 at 10:48:15 UTC, "Naveen N. Rao" wrote: > This fixes a crash when function_graph and jprobes are used together. > This is essentially commit 237d28db036e ("ftrace/jprobes/x86: Fix > conflict between jprobes and function graph tracing"), but for powerpc. > > Jprobes breaks function_graph tracing since the jprobe hook needs to use > jprobe_return(), which never returns back to the hook, but instead to > the original jprobe'd function. The solution is to momentarily pause > function_graph tracing before invoking the jprobe hook and re-enable it > when returning back to the original jprobe'd function. > > Fixes: 6794c78243bfd ("powerpc64: port of the function graph tracer") > Signed-off-by: Naveen N. Rao <naveen.n....@linux.vnet.ibm.com> > Acked-by: Masami Hiramatsu <mhira...@kernel.org> > Acked-by: Steven Rostedt (VMware) <rost...@goodmis.org>
Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/a9f8553e935f26cb5447f67e280946 cheers