From: Masami Hiramatsu <mhiramat@kernel.org>
To: rostedt@goodmis.org,
Francis Deslauriers <francis.deslauriers@efficios.com>,
peterz@infradead.org
Cc: mhiramat@kernel.org, mathieu.desnoyers@efficios.com,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] selftest/ftrace: Move kprobe selftest function to separate compile unit
Date: Thu, 26 Jul 2018 14:53:55 +0900 [thread overview]
Message-ID: <153258443533.11602.8446454305778389593.stgit@devbox> (raw)
In-Reply-To: <153258437722.11602.12405835083073480618.stgit@devbox>
From: Francis Deslauriers <francis.deslauriers@efficios.com>
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>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
---
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 e2538c7638d4..e38771eccb2f 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 1f1b4d712a7e..859f7c310a00 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -23,6 +23,7 @@
#include <linux/rculist.h>
#include <linux/error-injection.h>
+#include "trace_kprobe_selftest.h"
#include "trace_probe.h"
#define KPROBE_EVENT_SYSTEM "kprobes"
@@ -1573,17 +1574,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 000000000000..16548ee4c8c6
--- /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 separate
+ * 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 000000000000..4e10ec41c013
--- /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 separate
+ * 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);
next prev parent reply other threads:[~2018-07-26 5:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 5:52 [PATCH v2 0/3] tracing: kprobes: Prohibit probing on notrace functions Masami Hiramatsu
2018-07-26 5:53 ` [PATCH v2 1/3] tracing: kprobes: Prohibit probing on notrace function Masami Hiramatsu
2018-07-28 1:00 ` Masami Hiramatsu
2018-07-28 8:11 ` kbuild test robot
2018-07-28 13:42 ` Masami Hiramatsu
2018-07-28 8:24 ` kbuild test robot
2018-07-26 5:53 ` Masami Hiramatsu [this message]
2018-07-26 23:29 ` [PATCH v2 2/3] selftest/ftrace: Move kprobe selftest function to separate compile unit Steven Rostedt
2018-07-27 12:39 ` Masami Hiramatsu
2018-07-27 12:44 ` [PATCH v2.1 " Masami Hiramatsu
2018-07-26 5:54 ` [PATCH v2 3/3] selftests/ftrace: Fix kprobe string testcase to not probe notrace function Masami Hiramatsu
2018-07-26 7:44 ` Masami Hiramatsu
2018-07-26 19:58 ` Steven Rostedt
2018-07-26 21:22 ` Shuah Khan
2018-07-27 12:47 ` Masami Hiramatsu
2018-07-27 14:26 ` Shuah Khan
2018-07-27 14:31 ` Steven Rostedt
2018-07-28 2:24 ` Masami Hiramatsu
2018-07-27 21:43 ` Steven Rostedt
2018-07-27 23:59 ` Masami Hiramatsu
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=153258443533.11602.8446454305778389593.stgit@devbox \
--to=mhiramat@kernel.org \
--cc=francis.deslauriers@efficios.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--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).