From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Subject: [PATCH 12/18] ftrace: Fix the output of enabled_functions debug file
Date: Fri, 10 May 2013 20:12:18 -0400 [thread overview]
Message-ID: <20130511001305.508530826@goodmis.org> (raw)
In-Reply-To: 20130511001206.477862307@goodmis.org
[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
The enabled_functions debugfs file was created to be able to see
what functions have been modified from nops to calling a tracer.
The current method uses the counter in the function record.
As when a ftrace_ops is registered to a function, its count
increases. But that doesn't mean that the function is actively
being traced. /proc/sys/kernel/ftrace_enabled can be set to zero
which would disable it, as well as something can go wrong and
we can think its enabled when only the counter is set.
The record's FTRACE_FL_ENABLED flag is set or cleared when its
function is modified. That is a much more accurate way of knowing
what function is enabled or not.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f104c45..dcca9fa 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2459,7 +2459,7 @@ 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_MASK))) {
+ !(rec->flags & FTRACE_FL_ENABLED))) {
rec = NULL;
goto retry;
--
1.7.10.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2013-05-11 0:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-11 0:12 [PATCH 00/18] tracing/kprobes: Update kprobes with new ftrace changes Steven Rostedt
2013-05-11 0:12 ` [PATCH 01/18] ring-buffer: Select IRQ_WORK Steven Rostedt
2013-05-11 0:12 ` [PATCH 02/18] tracing: Dont succeed if event_enable_func did not register anything Steven Rostedt
2013-05-11 0:12 ` [PATCH 03/18] tracing: Return error if register_ftrace_function_probe() fails for event_enable_func() Steven Rostedt
2013-05-11 0:12 ` [PATCH 04/18] ftrace: Have ftrace_regex_write() return either read or error Steven Rostedt
2013-05-11 0:12 ` [PATCH 05/18] ftrace, kprobes: Fix a deadlock on ftrace_regex_lock Steven Rostedt
2013-05-11 0:12 ` [PATCH 06/18] ftrace: Cleanup regex_lock and ftrace_lock around hash updating Steven Rostedt
2013-05-11 0:12 ` [PATCH 07/18] tracing/kprobes: Fix to increment return event probe hit-count Steven Rostedt
2013-05-11 0:12 ` [PATCH 08/18] tracing: Indicate enabled soft-mode in enable file Steven Rostedt
2013-05-11 0:12 ` [PATCH 09/18] tracing: Modify soft-mode only if theres no other referrer Steven Rostedt
2013-05-11 0:12 ` [PATCH 10/18] tracing: Add helper function trace_create_new_event() to remove duplicate code Steven Rostedt
2013-05-11 0:12 ` [PATCH 11/18] ftrace: Fix locking in register_ftrace_function_probe() Steven Rostedt
2013-05-11 0:12 ` Steven Rostedt [this message]
2013-05-11 0:12 ` [PATCH 13/18] ftrace: Fix function probe when more than one probe is added Steven Rostedt
2013-05-11 0:12 ` [PATCH 14/18] tracing/kprobes: Use bool for retprobe checker Steven Rostedt
2013-05-11 0:12 ` [PATCH 15/18] tracing/kprobes: Increment probe hit-count even if it is used by perf Steven Rostedt
2013-05-11 0:12 ` [PATCH 16/18] tracing/kprobes: Pass trace_probe directly from dispatcher Steven Rostedt
2013-05-11 0:12 ` [PATCH 17/18] tracing/kprobes: Support ftrace_event_file base multibuffer Steven Rostedt
2013-05-11 0:12 ` [PATCH 18/18] tracing/kprobes: Support soft-mode disabling Steven Rostedt
2013-05-12 1:16 ` [PATCH 00/18] tracing/kprobes: Update kprobes with new ftrace changes Linus Torvalds
2013-05-12 2:11 ` Steven Rostedt
2013-05-12 2:22 ` Steven Rostedt
2013-05-12 12:50 ` Steven Rostedt
2013-05-12 18:56 ` Linus Torvalds
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=20130511001305.508530826@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=torvalds@linux-foundation.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