From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Josef Bacik <josef@toxicpanda.com>
Subject: [for-linus][PATCH 11/17] ftrace: Fix ftrace_trace_task return value
Date: Tue, 04 Aug 2020 16:57:54 -0400 [thread overview]
Message-ID: <20200804205813.485673301@goodmis.org> (raw)
In-Reply-To: 20200804205743.419135730@goodmis.org
From: Josef Bacik <josef@toxicpanda.com>
I was attempting to use pid filtering with function_graph, but it wasn't
allowing anything to make it through. Turns out ftrace_trace_task
returns false if ftrace_ignore_pid is not-empty, which isn't correct
anymore. We're now setting it to FTRACE_PID_IGNORE if we need to ignore
that pid, otherwise it's set to the pid (which is weird considering the
name) or to FTRACE_PID_TRACE. Fix the check to check for !=
FTRACE_PID_IGNORE. With this we can now use function_graph with pid
filtering.
Link: https://lkml.kernel.org/r/20200725005048.1790-1-josef@toxicpanda.com
Fixes: 717e3f5ebc82 ("ftrace: Make function trace pid filtering a bit more exact")
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 3 ---
kernel/trace/trace.h | 7 ++++++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index f433cb44300a..4e3a5d79c078 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -139,9 +139,6 @@ static inline void ftrace_ops_init(struct ftrace_ops *ops)
#endif
}
-#define FTRACE_PID_IGNORE -1
-#define FTRACE_PID_TRACE -2
-
static void ftrace_pid_func(unsigned long ip, unsigned long parent_ip,
struct ftrace_ops *op, struct pt_regs *regs)
{
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index f21607f87189..610d21355526 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1103,6 +1103,10 @@ print_graph_function_flags(struct trace_iterator *iter, u32 flags)
extern struct list_head ftrace_pids;
#ifdef CONFIG_FUNCTION_TRACER
+
+#define FTRACE_PID_IGNORE -1
+#define FTRACE_PID_TRACE -2
+
struct ftrace_func_command {
struct list_head list;
char *name;
@@ -1114,7 +1118,8 @@ struct ftrace_func_command {
extern bool ftrace_filter_param __initdata;
static inline int ftrace_trace_task(struct trace_array *tr)
{
- return !this_cpu_read(tr->array_buffer.data->ftrace_ignore_pid);
+ return this_cpu_read(tr->array_buffer.data->ftrace_ignore_pid) !=
+ FTRACE_PID_IGNORE;
}
extern int ftrace_is_dead(void);
int ftrace_create_function_files(struct trace_array *tr,
--
2.26.2
next prev parent reply other threads:[~2020-08-04 20:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 20:57 [for-linus][PATCH 00/17] tracing: Last minute fixes for this merge window Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 01/17] tracing: Simplify defining of the next event id Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 02/17] tracing: Save one trace_event->type by using __TRACE_LAST_TYPE Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 03/17] tracing/hwlat: Drop the duplicate assignment in start_kthread() Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 04/17] tracing/hwlat: Honor the tracing_cpumask Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 05/17] ftrace: Setup correct FTRACE_FL_REGS flags for module Steven Rostedt
2020-08-09 15:53 ` Sasha Levin
2020-08-04 20:57 ` [for-linus][PATCH 06/17] ftrace: Do not let direct or IPMODIFY ftrace_ops be added to module and set trampolines Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 07/17] tracing: Remove outdated comment in stack handling Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 09/17] tracepoint: Mark __tracepoint_strings __used Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 10/17] tracepoint: Use __used attribute definitions from compiler_attributes.h Steven Rostedt
2020-08-04 20:57 ` Steven Rostedt [this message]
2020-08-04 20:57 ` [for-linus][PATCH 12/17] kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 13/17] tracing/uprobe: Remove dead code in trace_uprobe_register() Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 14/17] kprobes: Remove show_registers() function prototype Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 15/17] lib/bootconfig: Add override operator support Steven Rostedt
2020-08-04 20:57 ` [for-linus][PATCH 16/17] tools/bootconfig: Add testcases for value override operator Steven Rostedt
2020-08-04 20:58 ` [for-linus][PATCH 17/17] Documentation: bootconfig: Add bootconfig " 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=20200804205813.485673301@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=josef@toxicpanda.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.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).