From: Jiri Olsa <jolsa@redhat.com>
To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com,
paulus@samba.org, acme@ghostprotocols.net,
a.p.zijlstra@chello.nl
Cc: linux-kernel@vger.kernel.org, aarapov@redhat.com,
Jiri Olsa <jolsa@redhat.com>
Subject: [PATCHv2 02/10] ftrace: Change mcount call replacement logic
Date: Mon, 5 Dec 2011 18:22:48 +0100 [thread overview]
Message-ID: <1323105776-26961-3-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1323105776-26961-1-git-send-email-jolsa@redhat.com>
The current logic of updating calls is to do the mcount replacement
only when ftrace_ops is being registered. When ftrace_ops is being
unregistered then only in case it was the last registered ftrace_ops,
all calls are disabled.
This is an issue when ftrace_ops without FTRACE_OPS_FL_GLOBAL flag
is being unregistered, because all the functions stays enabled
and thus inherrited by global_ops, like in following scenario:
- set restricting global filter
- enable function trace
- register/unregister ftrace_ops with flags != FTRACE_OPS_FL_GLOBAL
and with no filter
Now the global_ops will get by all the functions regardless the
global_ops filter. So we need all functions that where enabled via
this ftrace_ops and are not part of global filter to be disabled.
Note, currently if there are only global ftrace_ops registered,
there's no filter hash check and the filter is represented only
by enabled records.
Changing the ftrace_shutdown logic to ensure the replacement
is called for each ftrace_ops being unregistered.
Also changing FTRACE_ENABLE_CALLS into FTRACE_UPDATE_CALLS
calls which seems more suitable now.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
kernel/trace/ftrace.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c6d0293..b79ab33 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -948,7 +948,7 @@ struct ftrace_func_probe {
};
enum {
- FTRACE_ENABLE_CALLS = (1 << 0),
+ FTRACE_UPDATE_CALLS = (1 << 0),
FTRACE_DISABLE_CALLS = (1 << 1),
FTRACE_UPDATE_TRACE_FUNC = (1 << 2),
FTRACE_START_FUNC_RET = (1 << 3),
@@ -1520,7 +1520,7 @@ int ftrace_text_reserved(void *start, void *end)
static int
-__ftrace_replace_code(struct dyn_ftrace *rec, int enable)
+__ftrace_replace_code(struct dyn_ftrace *rec, int update)
{
unsigned long ftrace_addr;
unsigned long flag = 0UL;
@@ -1528,17 +1528,17 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
ftrace_addr = (unsigned long)FTRACE_ADDR;
/*
- * If we are enabling tracing:
+ * If we are updating calls:
*
* If the record has a ref count, then we need to enable it
* because someone is using it.
*
* Otherwise we make sure its disabled.
*
- * If we are disabling tracing, then disable all records that
+ * If we are disabling calls, then disable all records that
* are enabled.
*/
- if (enable && (rec->flags & ~FTRACE_FL_MASK))
+ if (update && (rec->flags & ~FTRACE_FL_MASK))
flag = FTRACE_FL_ENABLED;
/* If the state of this record hasn't changed, then do nothing */
@@ -1554,7 +1554,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
return ftrace_make_nop(NULL, rec, ftrace_addr);
}
-static void ftrace_replace_code(int enable)
+static void ftrace_replace_code(int update)
{
struct dyn_ftrace *rec;
struct ftrace_page *pg;
@@ -1568,7 +1568,7 @@ static void ftrace_replace_code(int enable)
if (rec->flags & FTRACE_FL_FREE)
continue;
- failed = __ftrace_replace_code(rec, enable);
+ failed = __ftrace_replace_code(rec, update);
if (failed) {
ftrace_bug(failed, rec->ip);
/* Stop processing */
@@ -1624,7 +1624,7 @@ static int __ftrace_modify_code(void *data)
*/
function_trace_stop++;
- if (*command & FTRACE_ENABLE_CALLS)
+ if (*command & FTRACE_UPDATE_CALLS)
ftrace_replace_code(1);
else if (*command & FTRACE_DISABLE_CALLS)
ftrace_replace_code(0);
@@ -1692,7 +1692,7 @@ static int ftrace_startup(struct ftrace_ops *ops, int command)
return -ENODEV;
ftrace_start_up++;
- command |= FTRACE_ENABLE_CALLS;
+ command |= FTRACE_UPDATE_CALLS;
/* ops marked global share the filter hashes */
if (ops->flags & FTRACE_OPS_FL_GLOBAL) {
@@ -1744,8 +1744,7 @@ static void ftrace_shutdown(struct ftrace_ops *ops, int command)
if (ops != &global_ops || !global_start_up)
ops->flags &= ~FTRACE_OPS_FL_ENABLED;
- if (!ftrace_start_up)
- command |= FTRACE_DISABLE_CALLS;
+ command |= FTRACE_UPDATE_CALLS;
if (saved_ftrace_func != ftrace_trace_function) {
saved_ftrace_func = ftrace_trace_function;
@@ -1767,7 +1766,7 @@ static void ftrace_startup_sysctl(void)
saved_ftrace_func = NULL;
/* ftrace_start_up is true if we want ftrace running */
if (ftrace_start_up)
- ftrace_run_update_code(FTRACE_ENABLE_CALLS);
+ ftrace_run_update_code(FTRACE_UPDATE_CALLS);
}
static void ftrace_shutdown_sysctl(void)
@@ -2920,7 +2919,7 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len,
ret = ftrace_hash_move(ops, enable, orig_hash, hash);
if (!ret && ops->flags & FTRACE_OPS_FL_ENABLED
&& ftrace_enabled)
- ftrace_run_update_code(FTRACE_ENABLE_CALLS);
+ ftrace_run_update_code(FTRACE_UPDATE_CALLS);
mutex_unlock(&ftrace_lock);
@@ -3108,7 +3107,7 @@ ftrace_regex_release(struct inode *inode, struct file *file)
orig_hash, iter->hash);
if (!ret && (iter->ops->flags & FTRACE_OPS_FL_ENABLED)
&& ftrace_enabled)
- ftrace_run_update_code(FTRACE_ENABLE_CALLS);
+ ftrace_run_update_code(FTRACE_UPDATE_CALLS);
mutex_unlock(&ftrace_lock);
}
--
1.7.1
next prev parent reply other threads:[~2011-12-05 17:23 UTC|newest]
Thread overview: 185+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-27 18:04 [RFC] ftrace, perf: Adding support to use function trace Jiri Olsa
2011-11-27 18:04 ` [PATCH 1/9] trace: Fix uninitialized variable compiler warning Jiri Olsa
2011-11-28 16:19 ` Steven Rostedt
2011-11-28 16:25 ` Jiri Olsa
2011-11-28 19:34 ` Steven Rostedt
2011-11-27 18:04 ` [PATCH 2/9] ftrace: Fix possible NULL dereferencing in __ftrace_hash_rec_update Jiri Olsa
2011-11-28 16:24 ` Steven Rostedt
2011-11-27 18:04 ` [PATCH 3/9] ftrace: Fix shutdown to disable calls properly Jiri Olsa
2011-11-28 19:18 ` Steven Rostedt
2011-11-29 11:21 ` Jiri Olsa
2011-11-27 18:04 ` [PATCH 4/9] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2011-11-28 19:26 ` Steven Rostedt
2011-11-28 20:02 ` Peter Zijlstra
2011-11-28 20:05 ` Peter Zijlstra
2011-11-28 20:14 ` Steven Rostedt
2011-11-28 20:20 ` Peter Zijlstra
2011-11-28 20:12 ` Steven Rostedt
2011-11-28 20:15 ` Peter Zijlstra
2011-11-28 20:24 ` Steven Rostedt
2011-11-28 20:21 ` Steven Rostedt
2011-11-29 10:07 ` Jiri Olsa
2011-11-27 18:04 ` [PATCH 5/9] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2011-11-27 18:04 ` [PATCH 6/9] ftrace, perf: Add add/del " Jiri Olsa
2011-11-27 18:04 ` [PATCH 7/9] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2011-11-28 19:58 ` Steven Rostedt
2011-11-28 20:03 ` Peter Zijlstra
2011-11-28 20:13 ` Steven Rostedt
2011-11-29 10:10 ` Jiri Olsa
2011-11-28 20:08 ` Peter Zijlstra
2011-11-28 20:10 ` Peter Zijlstra
2011-11-28 20:16 ` Steven Rostedt
2011-11-28 20:18 ` Peter Zijlstra
2011-11-27 18:04 ` [PATCH 8/9] ftrace, perf: Add FILTER_TRACE_FN event field type Jiri Olsa
2011-11-28 20:01 ` Steven Rostedt
2011-11-29 10:14 ` Jiri Olsa
2011-11-29 11:22 ` Jiri Olsa
2011-11-29 11:51 ` Peter Zijlstra
2011-11-29 12:21 ` Jiri Olsa
2011-11-27 18:04 ` [PATCH 9/9] ftrace, perf: Add filter support for function trace event Jiri Olsa
2011-11-28 20:07 ` Steven Rostedt
2011-12-05 17:22 ` [RFCv2] ftrace, perf: Adding support to use function trace Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 01/10] ftrace: Fix possible NULL dereferencing in __ftrace_hash_rec_update Jiri Olsa
2011-12-05 17:22 ` Jiri Olsa [this message]
2011-12-19 19:03 ` [PATCHv2 02/10] ftrace: Change mcount call replacement logic Steven Rostedt
2011-12-20 13:10 ` Jiri Olsa
2011-12-20 16:33 ` Steven Rostedt
2011-12-20 19:39 ` Steven Rostedt
2011-12-21 9:57 ` Jiri Olsa
2011-12-21 11:34 ` Steven Rostedt
2011-12-21 11:35 ` Steven Rostedt
2011-12-21 11:40 ` Jiri Olsa
2012-01-08 9:13 ` [tip:perf/core] ftrace: Fix unregister ftrace_ops accounting tip-bot for Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 03/10] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2011-12-19 19:19 ` Steven Rostedt
2011-12-19 19:35 ` Steven Rostedt
2011-12-20 14:57 ` Jiri Olsa
2011-12-20 15:25 ` Steven Rostedt
2011-12-20 15:35 ` Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 04/10] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 05/10] ftrace, perf: Add add/del " Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 06/10] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 07/10] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2011-12-19 19:22 ` Steven Rostedt
2011-12-05 17:22 ` [PATCHv2 08/10] ftrace, perf: Distinguish ftrace function event field type Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 09/10] ftrace, perf: Add filter support for function trace event Jiri Olsa
2011-12-05 17:22 ` [PATCHv2 10/10] ftrace, graph: Add global_ops filter callback for graph tracing Jiri Olsa
2011-12-19 19:27 ` Steven Rostedt
2011-12-19 13:40 ` [RFCv2] ftrace, perf: Adding support to use function trace Jiri Olsa
2011-12-19 16:45 ` Steven Rostedt
2011-12-19 16:58 ` Frederic Weisbecker
2011-12-21 11:48 ` [PATCHv3 0/8] " Jiri Olsa
2011-12-21 11:48 ` [PATCH 1/8] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2011-12-21 11:48 ` [PATCH 2/8] ftrace: Fix possible NULL dereferencing in __ftrace_hash_rec_update Jiri Olsa
2011-12-21 15:23 ` Steven Rostedt
2011-12-21 11:48 ` [PATCH 3/8] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2011-12-21 16:01 ` Steven Rostedt
2011-12-21 16:43 ` Jiri Olsa
2011-12-21 16:55 ` Steven Rostedt
2012-01-24 1:26 ` Frederic Weisbecker
2011-12-21 11:48 ` [PATCH 4/8] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2011-12-21 11:48 ` [PATCH 5/8] ftrace, perf: Add add/del " Jiri Olsa
2011-12-21 11:48 ` [PATCH 6/8] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2011-12-21 11:48 ` [PATCH 7/8] ftrace, perf: Distinguish ftrace function event field type Jiri Olsa
2011-12-21 11:48 ` [PATCH 8/8] ftrace, perf: Add filter support for function trace event Jiri Olsa
2011-12-21 18:56 ` [PATCHv4 0/8] ftrace, perf: Adding support to use function trace Jiri Olsa
2011-12-21 18:56 ` [PATCH 1/7] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2011-12-22 0:12 ` Steven Rostedt
2011-12-22 8:01 ` [PATCHv5 " Jiri Olsa
2011-12-21 18:56 ` [PATCH 2/7] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2011-12-21 18:56 ` [PATCH 3/7] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2011-12-21 18:56 ` [PATCH 4/7] ftrace, perf: Add add/del " Jiri Olsa
2011-12-21 18:56 ` [PATCH 5/7] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2011-12-21 18:56 ` [PATCH 6/7] ftrace, perf: Distinguish ftrace function event field type Jiri Olsa
2011-12-21 18:56 ` [PATCH 7/7] ftrace, perf: Add filter support for function trace event Jiri Olsa
2011-12-21 22:07 ` Frederic Weisbecker
2011-12-22 12:55 ` Jiri Olsa
2011-12-22 15:26 ` [PATCHvFIXED " Jiri Olsa
2011-12-24 2:35 ` Frederic Weisbecker
2011-12-21 19:02 ` [PATCHv4 0/7] ftrace, perf: Adding support to use function trace Jiri Olsa
2012-01-02 9:04 ` [PATCHv5 " Jiri Olsa
2012-01-02 9:04 ` [PATCH 1/7] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2012-02-17 13:46 ` [tip:perf/core] ftrace: Change filter/ notrace " tip-bot for Jiri Olsa
2012-01-02 9:04 ` [PATCH 2/7] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2012-01-17 1:42 ` Frederic Weisbecker
2012-01-17 2:07 ` Steven Rostedt
2012-01-17 2:29 ` Frederic Weisbecker
2012-01-18 13:59 ` Jiri Olsa
2012-01-02 9:04 ` [PATCH 3/7] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2012-01-02 9:04 ` [PATCH 4/7] ftrace, perf: Add add/del " Jiri Olsa
2012-01-02 9:04 ` [PATCH 5/7] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2012-01-02 9:04 ` [PATCH 6/7] ftrace, perf: Distinguish ftrace function event field type Jiri Olsa
2012-01-02 9:04 ` [PATCH 7/7] ftrace, perf: Add filter support for function trace event Jiri Olsa
2012-01-16 23:59 ` Steven Rostedt
2012-01-18 13:45 ` Jiri Olsa
2012-01-16 8:57 ` [PATCHv5 0/7] ftrace, perf: Adding support to use function trace Jiri Olsa
2012-01-16 16:17 ` Steven Rostedt
2012-01-18 18:44 ` [PATCHv6 " Jiri Olsa
2012-01-18 18:44 ` [PATCH 1/7] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2012-01-19 16:31 ` Frederic Weisbecker
2012-01-18 18:44 ` [PATCH 2/7] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2012-01-20 17:02 ` Frederic Weisbecker
2012-01-25 23:13 ` Steven Rostedt
2012-01-26 2:37 ` Frederic Weisbecker
2012-01-27 10:37 ` Jiri Olsa
2012-01-27 10:38 ` Jiri Olsa
2012-01-27 16:40 ` Frederic Weisbecker
2012-01-27 16:54 ` Jiri Olsa
2012-01-27 17:02 ` Frederic Weisbecker
2012-01-27 17:20 ` Jiri Olsa
2012-01-28 16:39 ` Frederic Weisbecker
2012-01-27 17:21 ` Steven Rostedt
2012-01-18 18:44 ` [PATCH 3/7] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2012-01-18 18:44 ` [PATCH 4/7] ftrace, perf: Add add/del " Jiri Olsa
2012-01-18 18:44 ` [PATCH 5/7] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2012-01-18 18:44 ` [PATCH 6/7] ftrace, perf: Distinguish ftrace function event field type Jiri Olsa
2012-01-18 18:44 ` [PATCH 7/7] ftrace, perf: Add filter support for function trace event Jiri Olsa
2012-01-18 21:43 ` [PATCHv6 0/7] ftrace, perf: Adding support to use function trace Steven Rostedt
2012-01-28 18:43 ` [PATCHv7 " Jiri Olsa
2012-01-28 18:43 ` [PATCH 1/7] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2012-01-30 5:42 ` Frederic Weisbecker
2012-01-28 18:43 ` [PATCH 2/7] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2012-01-30 5:59 ` Frederic Weisbecker
2012-01-30 9:18 ` Jiri Olsa
2012-02-03 13:42 ` Steven Rostedt
2012-02-03 13:50 ` Jiri Olsa
2012-02-03 14:08 ` Steven Rostedt
2012-02-03 14:22 ` [PATCHv8 0/2] first 2 patches passed review Jiri Olsa
2012-02-03 14:22 ` [PATCH 1/2] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2012-02-03 14:22 ` [PATCH 2/2] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2012-02-04 13:24 ` [PATCHv8 0/2] first 2 patches passed review Frederic Weisbecker
2012-02-03 13:40 ` [PATCH 2/7] ftrace: Add enable/disable ftrace_ops control interface Steven Rostedt
2012-01-28 18:43 ` [PATCH 3/7] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2012-02-02 17:35 ` Frederic Weisbecker
2012-02-03 10:23 ` Jiri Olsa
2012-01-28 18:43 ` [PATCH 4/7] ftrace, perf: Add add/del " Jiri Olsa
2012-02-02 17:42 ` Frederic Weisbecker
2012-01-28 18:43 ` [PATCH 5/7] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2012-02-02 18:14 ` Frederic Weisbecker
2012-02-03 12:54 ` Jiri Olsa
2012-02-03 13:00 ` Jiri Olsa
2012-02-03 14:07 ` Steven Rostedt
2012-02-04 13:21 ` Frederic Weisbecker
2012-02-06 19:35 ` Steven Rostedt
2012-02-03 13:53 ` Steven Rostedt
2012-01-28 18:43 ` [PATCH 6/7] ftrace, perf: Distinguish ftrace function event field type Jiri Olsa
2012-02-03 14:16 ` Steven Rostedt
2012-01-28 18:43 ` [PATCH 7/7] ftrace, perf: Add filter support for function trace event Jiri Olsa
2012-02-07 0:20 ` Jiri Olsa
2012-02-07 19:44 ` [PATCHv8 0/8] ftrace, perf: Adding support to use function trace Jiri Olsa
2012-02-07 19:44 ` [PATCH 1/8] ftrace: Change filter/notrace set functions to return exit code Jiri Olsa
2012-02-07 19:44 ` [PATCH 2/8] ftrace: Add enable/disable ftrace_ops control interface Jiri Olsa
2012-02-07 19:44 ` [PATCH 3/8] ftrace, perf: Add open/close tracepoint perf registration actions Jiri Olsa
2012-02-07 19:44 ` [PATCH 4/8] ftrace, perf: Add add/del " Jiri Olsa
2012-02-07 19:44 ` [PATCH 5/8] ftrace: Add FTRACE_ENTRY_REG macro to allow event registration Jiri Olsa
2012-02-07 19:44 ` [PATCH 6/8] ftrace, perf: Add support to use function tracepoint in perf Jiri Olsa
2012-02-07 19:44 ` [PATCH 7/8] ftrace: Allow to specify filter field type for ftrace events Jiri Olsa
2012-02-07 19:44 ` [PATCH 8/8] ftrace, perf: Add filter support for function trace event Jiri Olsa
2012-02-10 13:27 ` [PATCHv8 0/8] ftrace, perf: Adding support to use function trace Steven Rostedt
2012-02-10 14:45 ` Steven Rostedt
2012-02-10 16:07 ` Jiri Olsa
2012-02-10 16:48 ` Frederic Weisbecker
2012-02-10 18:00 ` Steven Rostedt
2012-02-10 18:05 ` Frederic Weisbecker
2012-02-10 18:23 ` David Ahern
2012-02-13 18:02 ` 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=1323105776-26961-3-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=aarapov@redhat.com \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.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).