From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761584AbaGSNQ2 (ORCPT ); Sat, 19 Jul 2014 09:16:28 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.227]:10810 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755317AbaGSNQO (ORCPT ); Sat, 19 Jul 2014 09:16:14 -0400 Message-Id: <20140719131611.006930251@goodmis.org> User-Agent: quilt/0.63-1 Date: Sat, 19 Jul 2014 09:15:35 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Paul Mundt Subject: [for-next][PATCH 11/32] sh: ftrace: Add call to ftrace_graph_is_dead() in function graph code References: <20140719131524.009152325@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0011-sh-ftrace-Add-call-to-ftrace_graph_is_dead-in-functi.patch X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (Red Hat)" ftrace_stop() is going away as it disables parts of function tracing that affects users that should not be affected. But ftrace_graph_stop() is built on ftrace_stop(). Here's another example of killing all of function tracing because something went wrong with function graph tracing. Instead of disabling all users of function tracing on function graph error, disable only function graph tracing. To do this, the arch code must call ftrace_graph_is_dead() before it implements function graph. Cc: Paul Mundt Signed-off-by: Steven Rostedt --- arch/sh/kernel/ftrace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c index 3c74f53db6db..079d70e6d74b 100644 --- a/arch/sh/kernel/ftrace.c +++ b/arch/sh/kernel/ftrace.c @@ -344,6 +344,9 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) struct ftrace_graph_ent trace; unsigned long return_hooker = (unsigned long)&return_to_handler; + if (unlikely(ftrace_graph_is_dead())) + return; + if (unlikely(atomic_read(¤t->tracing_graph_pause))) return; -- 2.0.1