From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760107Ab3ICN0S (ORCPT ); Tue, 3 Sep 2013 09:26:18 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:3313 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759933Ab3ICN0R (ORCPT ); Tue, 3 Sep 2013 09:26:17 -0400 X-Authority-Analysis: v=2.0 cv=fJG7LOme c=1 sm=0 a=Sro2XwOs0tJUSHxCKfOySw==:17 a=Drc5e87SC40A:10 a=NO13L3veMrYA:10 a=5SG0PmZfjMsA:10 a=kj9zAlcOel0A:10 a=meVymXHHAAAA:8 a=KGjhK52YXX0A:10 a=hcrmJ-Ldf6sA:10 a=VnNF1IyMAAAA:8 a=SYfl2ZiqAAAA:8 a=Jjh85GMx7G4daeu3Zc8A:9 a=CjuIK1q_8ugA:10 a=bo4z3Be4H8AA:10 a=Sro2XwOs0tJUSHxCKfOySw==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 67.255.60.225 Date: Tue, 3 Sep 2013 09:26:15 -0400 From: Steven Rostedt To: paulmck@linux.vnet.ibm.com Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Andrew Morton , Peter Zijlstra , Frederic Weisbecker , Jiri Olsa Subject: Re: [RFC][PATCH 05/18 v2] ftrace: Do not display non safe RCU functions in available_filter_functions Message-ID: <20130903092615.6310f13d@gandalf.local.home> In-Reply-To: <20130831205430.GB3871@linux.vnet.ibm.com> References: <20130831051117.884125230@goodmis.org> <20130831051701.256486055@goodmis.org> <20130831194602.GM3871@linux.vnet.ibm.com> <1377981303.26624.2.camel@pippen.local.home> <20130831205430.GB3871@linux.vnet.ibm.com> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.20; 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 Sat, 31 Aug 2013 13:54:30 -0700 "Paul E. McKenney" wrote: > On Sat, Aug 31, 2013 at 04:35:03PM -0400, Steven Rostedt wrote: > > On Sat, 2013-08-31 at 12:46 -0700, Paul E. McKenney wrote: > > > > > > void arch_ftrace_update_code(int command); > > > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > > > > index 06504b2..be87ac9 100644 > > > > --- a/kernel/trace/ftrace.c > > > > +++ b/kernel/trace/ftrace.c > > > > @@ -2645,7 +2645,10 @@ t_next(struct seq_file *m, void *v, loff_t *pos) > > > > !ftrace_lookup_ip(ops->notrace_hash, rec->ip)) || > > > > > > > > ((iter->flags & FTRACE_ITER_ENABLED) && > > > > - !(rec->flags & FTRACE_FL_ENABLED))) { > > > > + !(rec->flags & FTRACE_FL_ENABLED)) || > > > > + > > > > > > OK, I'll bite... Why the blank line? > > > > For readability. Here's the full if statement: > > > > if (((iter->flags & FTRACE_ITER_FILTER) && > > !(ftrace_lookup_ip(ops->filter_hash, rec->ip))) || > > > > ((iter->flags & FTRACE_ITER_NOTRACE) && > > !ftrace_lookup_ip(ops->notrace_hash, rec->ip)) || > > > > ((iter->flags & FTRACE_ITER_ENABLED) && > > !(rec->flags & FTRACE_FL_ENABLED)) || > > > > ((iter->flags & FTRACE_ITER_UNSAFE_ONLY) && > > !ftrace_lookup_ip(ftrace_unsafe_rcu, rec->ip)) || > > > > ((iter->flags & FTRACE_ITER_NO_UNSAFE) && > > ftrace_lookup_ip(ftrace_unsafe_rcu, rec->ip))) { > > > > > > They are grouped in pairs. > > Fair enough! Can I take this as an Acked-by? -- Steve > > Thanx, Paul > > > -- Steve > > > > > > > > Thanx, Paul > > > > > > > + ((iter->flags & FTRACE_ITER_NO_UNSAFE) && > > > > + ftrace_lookup_ip(ftrace_unsafe_rcu, rec->ip))) { > > > > > > > > rec = NULL; > > > > goto retry; > > > > @@ -2773,6 +2776,7 @@ ftrace_avail_open(struct inode *inode, struct file *file) > > > > iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter)); > > > > if (iter) { > > > > iter->pg = ftrace_pages_start; > > > > + iter->flags = FTRACE_ITER_NO_UNSAFE; > > > > iter->ops = &global_ops; > > > > } > > > > > > > > -- > > > > 1.7.10.4 > > > > > > > > > > > >