From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932351AbcLLSHX (ORCPT ); Mon, 12 Dec 2016 13:07:23 -0500 Received: from smtprelay0042.hostedemail.com ([216.40.44.42]:40786 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932172AbcLLSHV (ORCPT ); Mon, 12 Dec 2016 13:07:21 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:1801:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3865:3867:3871:3872:3873:4321:4605:5007:6261:7875:8660:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12296:12438:12555:12740:12760:13069:13148:13230:13255:13311:13357:13439:13618:14096:14097:14181:14659:14721:21080:30054:30070:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: duck45_59f49984f34c X-Filterd-Recvd-Size: 2683 Date: Mon, 12 Dec 2016 13:07:16 -0500 From: Steven Rostedt To: Namhyung Kim Cc: LKML , Ingo Molnar , Andrew Morton , stable Subject: Re: [for-next][PATCH 7/8] fgraph: Handle a case where a tracer ignores set_graph_notrace Message-ID: <20161212130716.1b0845e0@gandalf.local.home> In-Reply-To: <20161212170903.GC4142@danjae.aot.lge.com> References: <20161209142656.855277710@goodmis.org> <20161209142820.696843036@goodmis.org> <20161212114920.252e8b31@gandalf.local.home> <20161212170903.GC4142@danjae.aot.lge.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 13 Dec 2016 02:09:04 +0900 Namhyung Kim wrote: > > I wanted the simplest fix for stable. > > I think a simpler fix is just to return when it sees a negative record.. You're right, but I guess I was trying to get it someone closer to the final change too. -- Steve > > > diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c > index 52fb1e21b86b..2fb73c2e35b5 100644 > --- a/kernel/trace/trace_functions_graph.c > +++ b/kernel/trace/trace_functions_graph.c > @@ -844,7 +844,7 @@ print_graph_entry_leaf(struct trace_iterator *iter, > > /* If a graph tracer ignored set_graph_notrace */ > if (call->depth < -1) > - call->depth += FTRACE_NOTRACE_DEPTH; > + return TRACE_TYPE_HANDLED; > > /* > * Comments display at + 1 to depth. Since > @@ -887,7 +887,7 @@ print_graph_entry_nested(struct trace_iterator *iter, > > /* If a graph tracer ignored set_graph_notrace */ > if (call->depth < -1) > - call->depth += FTRACE_NOTRACE_DEPTH; > + return TRACE_TYPE_HANDLED; > > cpu_data = per_cpu_ptr(data->cpu_data, cpu); > cpu_data->depth = call->depth; > > > Thanks, > Namhyung