summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMasami Hiramatsu (Google) <mhiramat@kernel.org>2023-02-01 16:56:38 +0100
committerSteven Rostedt (Google) <rostedt@goodmis.org>2023-03-29 00:52:22 +0200
commit39d954200bf6ad503c722e44d0be80c7b826fa42 (patch)
tree01cc0df2f14044b41f9cedfb2c5b3fa6da26ec2c /lib
parentlib/test_fprobe: Add a test case for nr_maxactive (diff)
downloadlinux-39d954200bf6ad503c722e44d0be80c7b826fa42.tar.xz
linux-39d954200bf6ad503c722e44d0be80c7b826fa42.zip
fprobe: Skip exit_handler if entry_handler returns !0
Skip hooking function return and calling exit_handler if the entry_handler() returns !0. Link: https://lkml.kernel.org/r/167526699798.433354.10998365726830117303.stgit@mhiramat.roam.corp.google.com Cc: Florent Revest <revest@chromium.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/test_fprobe.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/test_fprobe.c b/lib/test_fprobe.c
index 4b37d7022f35..9fa2ac9eda83 100644
--- a/lib/test_fprobe.c
+++ b/lib/test_fprobe.c
@@ -37,7 +37,7 @@ static noinline u32 fprobe_selftest_nest_target(u32 value, u32 (*nest)(u32))
return nest(value + 2);
}
-static notrace void fp_entry_handler(struct fprobe *fp, unsigned long ip,
+static notrace int fp_entry_handler(struct fprobe *fp, unsigned long ip,
struct pt_regs *regs, void *data)
{
KUNIT_EXPECT_FALSE(current_test, preemptible());
@@ -51,6 +51,8 @@ static notrace void fp_entry_handler(struct fprobe *fp, unsigned long ip,
*(u32 *)data = entry_val;
} else
KUNIT_EXPECT_NULL(current_test, data);
+
+ return 0;
}
static notrace void fp_exit_handler(struct fprobe *fp, unsigned long ip,
@@ -74,10 +76,11 @@ static notrace void fp_exit_handler(struct fprobe *fp, unsigned long ip,
KUNIT_EXPECT_NULL(current_test, data);
}
-static notrace void nest_entry_handler(struct fprobe *fp, unsigned long ip,
+static notrace int nest_entry_handler(struct fprobe *fp, unsigned long ip,
struct pt_regs *regs, void *data)
{
KUNIT_EXPECT_FALSE(current_test, preemptible());
+ return 0;
}
static notrace void nest_exit_handler(struct fprobe *fp, unsigned long ip,