From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757655AbbLBI6a (ORCPT ); Wed, 2 Dec 2015 03:58:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45757 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757566AbbLBI62 (ORCPT ); Wed, 2 Dec 2015 03:58:28 -0500 Date: Wed, 2 Dec 2015 09:58:26 +0100 From: Jiri Olsa To: Steven Rostedt Cc: LKML , Ingo Molnar , Peter Zijlstra Subject: Re: [PATCH] ftrace: Remove use of control list and ops Message-ID: <20151202085826.GA1068@krava.brq.redhat.com> References: <20151130173640.2c45b429@gandalf.local.home> <20151201134213.GA14155@krava.brq.redhat.com> <20151201095554.7b56bff7@gandalf.local.home> <20151201155744.GA24786@krava.local> <20151201115655.1b7e79e6@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151201115655.1b7e79e6@gandalf.local.home> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 01, 2015 at 11:56:55AM -0500, Steven Rostedt wrote: SNIP > -static void ftrace_ops_recurs_func(unsigned long ip, unsigned long parent_ip, > +static void ftrace_ops_assist_func(unsigned long ip, unsigned long parent_ip, > struct ftrace_ops *op, struct pt_regs *regs) > { > int bit; > > + if ((op->flags & FTRACE_OPS_FL_RCU) && !rcu_is_watching()) > + return; > + > bit = trace_test_and_set_recursion(TRACE_LIST_START, TRACE_LIST_MAX); > if (bit < 0) > return; > > - op->func(ip, parent_ip, op, regs); > + preempt_disable_notrace(); > > + if (!(op->flags & FTRACE_OPS_FL_PER_CPU) || > + ftrace_function_local_disabled(op)) { should be !ftrace_function_local_disabled(op) in here, I passed my test with attached patch thanks, jirka > + op->func(ip, parent_ip, op, regs); > + } > + > + preempt_enable_notrace(); > trace_clear_recursion(bit); > } SNIP --- diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 710430fcfd9c..ad0e0e7eaea2 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -115,7 +115,7 @@ static struct ftrace_ops *ftrace_ops_list __read_mostly = &ftrace_list_end; ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub; static struct ftrace_ops global_ops; -static void ftrace_ops_recurs_func(unsigned long ip, unsigned long parent_ip, +static void ftrace_ops_assist_func(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *op, struct pt_regs *regs); #if ARCH_SUPPORTS_FTRACE_OPS @@ -5180,7 +5180,7 @@ static void ftrace_ops_assist_func(unsigned long ip, unsigned long parent_ip, preempt_disable_notrace(); if (!(op->flags & FTRACE_OPS_FL_PER_CPU) || - ftrace_function_local_disabled(op)) { + !ftrace_function_local_disabled(op)) { op->func(ip, parent_ip, op, regs); }