From: Jiri Olsa <jolsa@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] ftrace: Remove use of control list and ops
Date: Tue, 1 Dec 2015 14:42:36 +0100 [thread overview]
Message-ID: <20151201134213.GA14155@krava.brq.redhat.com> (raw)
In-Reply-To: <20151130173640.2c45b429@gandalf.local.home>
On Mon, Nov 30, 2015 at 05:36:40PM -0500, Steven Rostedt wrote:
>
> [ Jiri, can you take a look at this. You can also apply it on top of my
> branch ftrace/core, and run any specific tests. I just need to nuke
> that control structure for further updates with ftrace. ]
>
>
> Currently perf has its own list function within the ftrace infrastructure
> that seems to be used only to allow for it to have per-cpu disabling as well
> as a check to make sure that it's not called while RCU is not watching. It
> uses something called the "control_ops" which is used to iterate over ops
> under it with the control_list_func().
>
> The problem is that this control_ops and control_list_func unnecessarily
> complicates the code. By replacing FTRACE_OPS_FL_CONTROL with two new flags
> (FTRACE_OPS_FL_RCU and FTRACE_OPS_FL_PER_CPU) we can remove all the code
> that is special with the control ops and add the needed checks within the
> generic ftrace_list_func().
hum,
do we need also change for the trampoline, something like below?
I needed attached patch to get the perf ftrace:function
event work properly..
thanks,
jirka
---
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c4d881200d1f..2705ac2f3487 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5179,6 +5179,26 @@ static void ftrace_ops_recurs_func(unsigned long ip, unsigned long parent_ip,
trace_clear_recursion(bit);
}
+static void ftrace_ops_per_cpu_func(unsigned long ip, unsigned long parent_ip,
+ struct ftrace_ops *op, struct pt_regs *regs)
+{
+ int bit;
+
+ bit = trace_test_and_set_recursion(TRACE_LIST_START, TRACE_LIST_MAX);
+ if (bit < 0)
+ return;
+
+ preempt_disable_notrace();
+
+ if ((!(op->flags & FTRACE_OPS_FL_RCU) || rcu_is_watching()) &&
+ (!(op->flags & FTRACE_OPS_FL_PER_CPU) || !ftrace_function_local_disabled(op))) {
+ op->func(ip, parent_ip, op, regs);
+ }
+
+ preempt_enable_notrace();
+ trace_clear_recursion(bit);
+}
+
/**
* ftrace_ops_get_func - get the function a trampoline should call
* @ops: the ops to get the function for
@@ -5192,6 +5212,11 @@ static void ftrace_ops_recurs_func(unsigned long ip, unsigned long parent_ip,
*/
ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops)
{
+ if (ops->flags & (FTRACE_OPS_FL_PER_CPU|FTRACE_OPS_FL_RCU)) {
+ printk("used per cpu trampoline function\n");
+ return ftrace_ops_per_cpu_func;
+ }
+
/*
* If the func handles its own recursion, call it directly.
* Otherwise call the recursion protected function that
next prev parent reply other threads:[~2015-12-01 13:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 22:36 [PATCH] ftrace: Remove use of control list and ops Steven Rostedt
2015-12-01 13:42 ` Jiri Olsa [this message]
2015-12-01 14:55 ` Steven Rostedt
2015-12-01 15:57 ` Jiri Olsa
2015-12-01 16:56 ` Steven Rostedt
2015-12-02 7:59 ` Jiri Olsa
2015-12-02 14:15 ` Steven Rostedt
2015-12-02 8:58 ` Jiri Olsa
2015-12-02 14:27 ` Steven Rostedt
2015-12-02 14:50 ` Jiri Olsa
2015-12-02 15:03 ` Steven Rostedt
2015-12-02 15:23 ` Jiri Olsa
2015-12-18 10:18 ` Jiri Olsa
2015-12-18 14:35 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151201134213.GA14155@krava.brq.redhat.com \
--to=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).