From: Naveen N. Rao Date: Thu, 1 Jun 2017 10:48:15 +0000 (+0530) Subject: powerpc/kprobes: Pause function_graph tracing during jprobes handling X-Git-Tag: v3.2.93~22 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f9b59cfb74661077b31a9853ffb62191d989d8;p=pandora-kernel.git powerpc/kprobes: Pause function_graph tracing during jprobes handling commit a9f8553e935f26cb5447f67e280946b0923cd2dc upstream. 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: 6794c78243bf ("powerpc64: port of the function graph tracer") Signed-off-by: Naveen N. Rao Acked-by: Masami Hiramatsu Acked-by: Steven Rostedt (VMware) Signed-off-by: Michael Ellerman [bwh: Backported to 3.2: include , which apparently gets included indirectly upstream] Signed-off-by: Ben Hutchings --- Reading git-diff-tree failed