From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756521Ab3HaFRK (ORCPT ); Sat, 31 Aug 2013 01:17:10 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:32184 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753647Ab3HaFRD (ORCPT ); Sat, 31 Aug 2013 01:17:03 -0400 X-Authority-Analysis: v=2.0 cv=ddwCLAre c=1 sm=0 a=Sro2XwOs0tJUSHxCKfOySw==:17 a=Drc5e87SC40A:10 a=Ciwy3NGCPMMA:10 a=QXkJwfv0mFkA:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=meVymXHHAAAA:8 a=KGjhK52YXX0A:10 a=YfsKVHR3R-sA:10 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=JZYXgP7PDSWMtFAQ7SMA:9 a=jeBq3FmKZ4MA:10 a=jEp0ucaQiEUA:10 a=Sro2XwOs0tJUSHxCKfOySw==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 67.255.60.225 Message-Id: <20130831051701.256486055@goodmis.org> User-Agent: quilt/0.60-1 Date: Sat, 31 Aug 2013 01:11:22 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Peter Zijlstra , Frederic Weisbecker , "Paul E. McKenney" , Jiri Olsa Subject: [RFC][PATCH 05/18 v2] ftrace: Do not display non safe RCU functions in available_filter_functions References: <20130831051117.884125230@goodmis.org> Content-Disposition: inline; filename=0005-ftrace-Do-not-display-non-safe-RCU-functions-in-avai.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Steven Rostedt (Red Hat)" As available_filter_functions file displays functions that are generally available for tracing, do not show the ones that are RCU unsafe. Otherwise it may be confusing for perf users to see these functions in this file but not be able to trace them. Cc: Jiri Olsa Cc: Paul E. McKenney Signed-off-by: Steven Rostedt --- include/linux/ftrace.h | 1 + kernel/trace/ftrace.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 1d17a82..4709264 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -411,6 +411,7 @@ enum { FTRACE_ITER_DO_HASH = (1 << 3), FTRACE_ITER_HASH = (1 << 4), FTRACE_ITER_ENABLED = (1 << 5), + FTRACE_ITER_NO_UNSAFE = (1 << 6), }; 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)) || + + ((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