From: Francis Deslauriers <francis.deslauriers@efficios.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
torvalds@linux-foundation.org
Subject: Re: [PATCH 2/2] kprobe: fix: Add ftrace_ops_assist_func to kprobe blacklist
Date: Wed, 11 Jul 2018 20:40:45 -0400 [thread overview]
Message-ID: <CADcCL0hz7GOW=+pzMcwktiMx+g7NTV3ua41zU0UHHSjHQdGKQg@mail.gmail.com> (raw)
In-Reply-To: <20180711155628.78b0fd83@gandalf.local.home>
Le mer. 11 juill. 2018, à 15 h 56, Steven Rostedt
<rostedt@goodmis.org> a écrit :
>
> On Wed, 11 Jul 2018 15:34:30 -0400
> Francis Deslauriers <francis.deslauriers@efficios.com> wrote:
>
> > Hi Steven,
> > I tested it and it prevents the kernel crash I am witnessing.
> > As for the side-effect that Masami mentioned regarding not being able to probe
> > function inside the trace_kprobe.c file, I suggest we move the target
> > function in
> > its own separate compile unit so it can be compiled with the ftrace cflags.
> > See patch below.
> >
>
> The patch below looks fine and so does Masami's. But there's too many
> patches within emails (not separated out). I have no idea what to
> apply. I'm not going to apply anything that is not sent as a proper
> patch (ie. any patch within a separate thread, like the patch below).
>
I will put together a proper patch set with both commits.
Masami, you mentioned: "So anyway we still need to mark those functions
NOKPROBE_SYMBOL." in a reply. What functions were you talking about?
ftrace_ops_assist_func? Aren't those functions covered by your
within_notrace_func check?
Thank you,
Francis
> -- Steve
>
>
> > Thanks
> > Francis
> >
> > >From d5a3645bd0046f28275d6b60207958f2751c1f47 Mon Sep 17 00:00:00 2001
> > From: Francis Deslauriers <francis.deslauriers@efficios.com>
> > Date: Wed, 11 Jul 2018 12:34:22 -0400
> > Subject: [PATCH] selftest/ftrace: Move kprobe selftest function to separate
> > compile unit
> >
> > Move selftest function to its own compile unit so it can be compiled
> > with the ftrace cflags (CC_FLAGS_FTRACE) allowing it to be probed
> > during the ftrace startup tests.
> >
> > Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
> > ---
> > kernel/trace/Makefile | 5 +++++
> > kernel/trace/trace_kprobe.c | 12 +-----------
> > kernel/trace/trace_kprobe_selftest.c | 10 ++++++++++
> > kernel/trace/trace_kprobe_selftest.h | 7 +++++++
> > 4 files changed, 23 insertions(+), 11 deletions(-)
> > create mode 100644 kernel/trace/trace_kprobe_selftest.c
> > create mode 100644 kernel/trace/trace_kprobe_selftest.h
> >
> > diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
> > index e2538c7..e38771e 100644
> > --- a/kernel/trace/Makefile
> > +++ b/kernel/trace/Makefile
> > @@ -13,6 +13,11 @@ obj-y += trace_selftest_dynamic.o
> > endif
> > endif
> >
> > +ifdef CONFIG_FTRACE_STARTUP_TEST
> > +CFLAGS_trace_kprobe_selftest.o = $(CC_FLAGS_FTRACE)
> > +obj-$(CONFIG_KPROBE_EVENTS) += trace_kprobe_selftest.o
> > +endif
> > +
> > # If unlikely tracing is enabled, do not trace these files
> > ifdef CONFIG_TRACING_BRANCHES
> > KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
> > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> > index 952dc2a..3fe966f 100644
> > --- a/kernel/trace/trace_kprobe.c
> > +++ b/kernel/trace/trace_kprobe.c
> > @@ -24,6 +24,7 @@
> > #include <linux/error-injection.h>
> >
> > #include "trace_probe.h"
> > +#include "trace_kprobe_selftest.h"
> >
> > #define KPROBE_EVENT_SYSTEM "kprobes"
> > #define KRETPROBE_MAXACTIVE_MAX 4096
> > @@ -1560,17 +1561,6 @@ fs_initcall(init_kprobe_trace);
> >
> >
> > #ifdef CONFIG_FTRACE_STARTUP_TEST
> > -/*
> > - * The "__used" keeps gcc from removing the function symbol
> > - * from the kallsyms table. 'noinline' makes sure that there
> > - * isn't an inlined version used by the test method below
> > - */
> > -static __used __init noinline int
> > -kprobe_trace_selftest_target(int a1, int a2, int a3, int a4, int a5, int a6)
> > -{
> > - return a1 + a2 + a3 + a4 + a5 + a6;
> > -}
> > -
> > static __init struct trace_event_file *
> > find_trace_probe_file(struct trace_kprobe *tk, struct trace_array *tr)
> > {
> > diff --git a/kernel/trace/trace_kprobe_selftest.c
> > b/kernel/trace/trace_kprobe_selftest.c
> > new file mode 100644
> > index 0000000..a3d2090
> > --- /dev/null
> > +++ b/kernel/trace/trace_kprobe_selftest.c
> > @@ -0,0 +1,10 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Function used during the kprobe self test. This function is in a seperate
> > + * compile unit so it can be compile with CC_FLAGS_FTRACE to ensure that it
> > + * can be probed by the selftests.
> > + */
> > +int kprobe_trace_selftest_target(int a1, int a2, int a3, int a4, int
> > a5, int a6)
> > +{
> > + return a1 + a2 + a3 + a4 + a5 + a6;
> > +}
> > diff --git a/kernel/trace/trace_kprobe_selftest.h
> > b/kernel/trace/trace_kprobe_selftest.h
> > new file mode 100644
> > index 0000000..9243d4e
> > --- /dev/null
> > +++ b/kernel/trace/trace_kprobe_selftest.h
> > @@ -0,0 +1,7 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Function used during the kprobe self test. This function is in a seperate
> > + * compile unit so it can be compile with CC_FLAGS_FTRACE to ensure that it
> > + * can be probed by the selftests.
> > + */
> > +int kprobe_trace_selftest_target(int a1, int a2, int a3, int a4, int
> > a5, int a6);
>
--
Francis Deslauriers
Software developer
EfficiOS inc.
next prev parent reply other threads:[~2018-07-12 0:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 14:58 [PATCH 0/2] kprobe: Fix: add symbols to kprobe blacklist Francis Deslauriers
2017-07-14 14:58 ` [PATCH 1/2] kprobe: fix: Add _ASM_NOKPROBE to x86 apic interrupt macro Francis Deslauriers
2017-07-14 14:58 ` [PATCH 2/2] kprobe: fix: Add ftrace_ops_assist_func to kprobe blacklist Francis Deslauriers
2017-07-14 18:29 ` Steven Rostedt
2018-03-16 15:18 ` Francis Deslauriers
2018-03-16 15:25 ` Steven Rostedt
2018-03-16 16:28 ` Mathieu Desnoyers
2018-03-16 16:41 ` Steven Rostedt
2018-03-16 16:48 ` Steven Rostedt
2018-03-16 17:53 ` Mathieu Desnoyers
2018-03-16 19:02 ` Steven Rostedt
2018-03-17 0:13 ` Masami Hiramatsu
2018-03-17 1:22 ` Masami Hiramatsu
2018-03-17 3:01 ` Steven Rostedt
2018-03-17 7:57 ` Masami Hiramatsu
2018-07-03 22:30 ` Steven Rostedt
2018-07-11 19:34 ` Francis Deslauriers
2018-07-11 19:56 ` Steven Rostedt
2018-07-12 0:40 ` Francis Deslauriers [this message]
2018-07-12 13:59 ` Masami Hiramatsu
2018-07-12 13:46 ` Masami Hiramatsu
2018-03-17 0:08 ` Masami Hiramatsu
2018-07-12 17:54 ` [PATCH 0/2] tracing: kprobes: Prohibit probing on notrace functions Francis Deslauriers
2018-07-12 17:54 ` [PATCH 1/2] " Francis Deslauriers
2018-07-12 21:49 ` Steven Rostedt
2018-07-13 2:53 ` Masami Hiramatsu
2018-07-13 12:18 ` Steven Rostedt
2018-07-26 0:41 ` Masami Hiramatsu
2018-07-26 1:13 ` Steven Rostedt
2018-07-12 17:54 ` [PATCH 2/2] selftest/ftrace: Move kprobe selftest function to separate compile unit Francis Deslauriers
2017-07-14 18:27 ` [PATCH 0/2] kprobe: Fix: add symbols to kprobe blacklist Steven Rostedt
2017-07-16 15:59 ` Masami Hiramatsu
2017-07-16 14:37 ` Masami Hiramatsu
2017-07-16 15:46 ` Masami Hiramatsu
2017-07-17 18:46 ` Francis Deslauriers
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='CADcCL0hz7GOW=+pzMcwktiMx+g7NTV3ua41zU0UHHSjHQdGKQg@mail.gmail.com' \
--to=francis.deslauriers@efficios.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).