Skip to content

Commit 84795de

Browse files
Yipeng Zougregkh
authored andcommitted
tracing: kprobe: Make gen test module work in arm and riscv
[ Upstream commit d8ef45d ] For now, this selftest module can only work in x86 because of the kprobe cmd was fixed use of x86 registers. This patch adapted to register names under arm and riscv, So that this module can be worked on those platform. Link: https://lkml.kernel.org/r/[email protected] Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Cc: <[email protected]> Fixes: 6483624 ("tracing: Add kprobe event command generation test module") Signed-off-by: Yipeng Zou <[email protected]> Acked-by: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 867fce0 commit 84795de

File tree

1 file changed

+43
-4
lines changed

1 file changed

+43
-4
lines changed

kernel/trace/kprobe_event_gen_test.c

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,45 @@
3535
static struct trace_event_file *gen_kprobe_test;
3636
static struct trace_event_file *gen_kretprobe_test;
3737

38+
#define KPROBE_GEN_TEST_FUNC "do_sys_open"
39+
40+
/* X86 */
41+
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_32)
42+
#define KPROBE_GEN_TEST_ARG0 "dfd=%ax"
43+
#define KPROBE_GEN_TEST_ARG1 "filename=%dx"
44+
#define KPROBE_GEN_TEST_ARG2 "flags=%cx"
45+
#define KPROBE_GEN_TEST_ARG3 "mode=+4($stack)"
46+
47+
/* ARM64 */
48+
#elif defined(CONFIG_ARM64)
49+
#define KPROBE_GEN_TEST_ARG0 "dfd=%x0"
50+
#define KPROBE_GEN_TEST_ARG1 "filename=%x1"
51+
#define KPROBE_GEN_TEST_ARG2 "flags=%x2"
52+
#define KPROBE_GEN_TEST_ARG3 "mode=%x3"
53+
54+
/* ARM */
55+
#elif defined(CONFIG_ARM)
56+
#define KPROBE_GEN_TEST_ARG0 "dfd=%r0"
57+
#define KPROBE_GEN_TEST_ARG1 "filename=%r1"
58+
#define KPROBE_GEN_TEST_ARG2 "flags=%r2"
59+
#define KPROBE_GEN_TEST_ARG3 "mode=%r3"
60+
61+
/* RISCV */
62+
#elif defined(CONFIG_RISCV)
63+
#define KPROBE_GEN_TEST_ARG0 "dfd=%a0"
64+
#define KPROBE_GEN_TEST_ARG1 "filename=%a1"
65+
#define KPROBE_GEN_TEST_ARG2 "flags=%a2"
66+
#define KPROBE_GEN_TEST_ARG3 "mode=%a3"
67+
68+
/* others */
69+
#else
70+
#define KPROBE_GEN_TEST_ARG0 NULL
71+
#define KPROBE_GEN_TEST_ARG1 NULL
72+
#define KPROBE_GEN_TEST_ARG2 NULL
73+
#define KPROBE_GEN_TEST_ARG3 NULL
74+
#endif
75+
76+
3877
/*
3978
* Test to make sure we can create a kprobe event, then add more
4079
* fields.
@@ -58,14 +97,14 @@ static int __init test_gen_kprobe_cmd(void)
5897
* fields.
5998
*/
6099
ret = kprobe_event_gen_cmd_start(&cmd, "gen_kprobe_test",
61-
"do_sys_open",
62-
"dfd=%ax", "filename=%dx");
100+
KPROBE_GEN_TEST_FUNC,
101+
KPROBE_GEN_TEST_ARG0, KPROBE_GEN_TEST_ARG1);
63102
if (ret)
64103
goto free;
65104

66105
/* Use kprobe_event_add_fields to add the rest of the fields */
67106

68-
ret = kprobe_event_add_fields(&cmd, "flags=%cx", "mode=+4($stack)");
107+
ret = kprobe_event_add_fields(&cmd, KPROBE_GEN_TEST_ARG2, KPROBE_GEN_TEST_ARG3);
69108
if (ret)
70109
goto free;
71110

@@ -128,7 +167,7 @@ static int __init test_gen_kretprobe_cmd(void)
128167
* Define the kretprobe event.
129168
*/
130169
ret = kretprobe_event_gen_cmd_start(&cmd, "gen_kretprobe_test",
131-
"do_sys_open",
170+
KPROBE_GEN_TEST_FUNC,
132171
"$retval");
133172
if (ret)
134173
goto free;

0 commit comments

Comments
 (0)