From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andriin@fb.com>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>, Daniel Xu <dxu@dxuuu.xyz>,
Viktor Malik <vmalik@redhat.com>
Subject: [PATCH 19/19] selftests/bpf: Temporary fix for fentry_fexit_multi_test
Date: Sat, 5 Jun 2021 13:10:34 +0200 [thread overview]
Message-ID: <20210605111034.1810858-20-jolsa@kernel.org> (raw)
In-Reply-To: <20210605111034.1810858-1-jolsa@kernel.org>
When multi_arg_check is used from 2 different places I'm getting
compilation fail, which I did not deciphered yet:
$ CLANG=/opt/clang/bin/clang LLC=/opt/clang/bin/llc make
CLNG-BPF [test_maps] fentry_fexit_multi_test.o
progs/fentry_fexit_multi_test.c:18:2: error: too many args to t24: i64 = \
GlobalAddress<void (i64, i64, i64, i64, i64, i64, i64, i64*)* @multi_arg_check> 0, \
progs/fentry_fexit_multi_test.c:18:2 @[ progs/fentry_fexit_multi_test.c:16:5 ]
multi_arg_check(ip, a, b, c, d, e, f, &test1_arg_result);
^
progs/fentry_fexit_multi_test.c:25:2: error: too many args to t32: i64 = \
GlobalAddress<void (i64, i64, i64, i64, i64, i64, i64, i64*)* @multi_arg_check> 0, \
progs/fentry_fexit_multi_test.c:25:2 @[ progs/fentry_fexit_multi_test.c:23:5 ]
multi_arg_check(ip, a, b, c, d, e, f, &test2_arg_result);
^
In file included from progs/fentry_fexit_multi_test.c:5:
/home/jolsa/linux-qemu/tools/testing/selftests/bpf/multi_check.h:9:6: error: defined with too many args
void multi_arg_check(unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, __u64 *test_result)
^
/home/jolsa/linux-qemu/tools/testing/selftests/bpf/multi_check.h:9:6: error: defined with too many args
/home/jolsa/linux-qemu/tools/testing/selftests/bpf/multi_check.h:9:6: error: defined with too many args
5 errors generated.
make: *** [Makefile:470: /home/jolsa/linux-qemu/tools/testing/selftests/bpf/fentry_fexit_multi_test.o] Error 1
As a temporary fix adding 2 instaces of multi_arg_check
function, one for each caller.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/testing/selftests/bpf/multi_check.h | 41 ++++++++++---------
.../bpf/progs/fentry_fexit_multi_test.c | 7 +++-
.../selftests/bpf/progs/fentry_multi_test.c | 4 +-
.../selftests/bpf/progs/fexit_multi_test.c | 4 +-
4 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/tools/testing/selftests/bpf/multi_check.h b/tools/testing/selftests/bpf/multi_check.h
index 36c2a93f9be3..f720a6f9c6e4 100644
--- a/tools/testing/selftests/bpf/multi_check.h
+++ b/tools/testing/selftests/bpf/multi_check.h
@@ -5,26 +5,27 @@
extern unsigned long long bpf_fentry_test[8];
-static __attribute__((unused)) inline
-void multi_arg_check(unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, __u64 *test_result)
-{
- if (ip == bpf_fentry_test[0]) {
- *test_result += (int) a == 1;
- } else if (ip == bpf_fentry_test[1]) {
- *test_result += (int) a == 2 && (__u64) b == 3;
- } else if (ip == bpf_fentry_test[2]) {
- *test_result += (char) a == 4 && (int) b == 5 && (__u64) c == 6;
- } else if (ip == bpf_fentry_test[3]) {
- *test_result += (void *) a == (void *) 7 && (char) b == 8 && (int) c == 9 && (__u64) d == 10;
- } else if (ip == bpf_fentry_test[4]) {
- *test_result += (__u64) a == 11 && (void *) b == (void *) 12 && (short) c == 13 && (int) d == 14 && (__u64) e == 15;
- } else if (ip == bpf_fentry_test[5]) {
- *test_result += (__u64) a == 16 && (void *) b == (void *) 17 && (short) c == 18 && (int) d == 19 && (void *) e == (void *) 20 && (__u64) f == 21;
- } else if (ip == bpf_fentry_test[6]) {
- *test_result += 1;
- } else if (ip == bpf_fentry_test[7]) {
- *test_result += 1;
- }
+#define MULTI_ARG_CHECK(_name) \
+static __attribute__((unused)) inline \
+void _name ## _multi_arg_check(unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, __u64 *test_result) \
+{ \
+ if (ip == bpf_fentry_test[0]) { \
+ *test_result += (int) a == 1; \
+ } else if (ip == bpf_fentry_test[1]) { \
+ *test_result += (int) a == 2 && (__u64) b == 3; \
+ } else if (ip == bpf_fentry_test[2]) { \
+ *test_result += (char) a == 4 && (int) b == 5 && (__u64) c == 6; \
+ } else if (ip == bpf_fentry_test[3]) { \
+ *test_result += (void *) a == (void *) 7 && (char) b == 8 && (int) c == 9 && (__u64) d == 10; \
+ } else if (ip == bpf_fentry_test[4]) { \
+ *test_result += (__u64) a == 11 && (void *) b == (void *) 12 && (short) c == 13 && (int) d == 14 && (__u64) e == 15; \
+ } else if (ip == bpf_fentry_test[5]) { \
+ *test_result += (__u64) a == 16 && (void *) b == (void *) 17 && (short) c == 18 && (int) d == 19 && (void *) e == (void *) 20 && (__u64) f == 21; \
+ } else if (ip == bpf_fentry_test[6]) { \
+ *test_result += 1; \
+ } else if (ip == bpf_fentry_test[7]) { \
+ *test_result += 1; \
+ } \
}
static __attribute__((unused)) inline
diff --git a/tools/testing/selftests/bpf/progs/fentry_fexit_multi_test.c b/tools/testing/selftests/bpf/progs/fentry_fexit_multi_test.c
index e25ab0085399..dc5b51f20b84 100644
--- a/tools/testing/selftests/bpf/progs/fentry_fexit_multi_test.c
+++ b/tools/testing/selftests/bpf/progs/fentry_fexit_multi_test.c
@@ -6,6 +6,9 @@
char _license[] SEC("license") = "GPL";
+MULTI_ARG_CHECK(fentry)
+MULTI_ARG_CHECK(fexit)
+
unsigned long long bpf_fentry_test[8];
__u64 test1_arg_result = 0;
@@ -15,14 +18,14 @@ __u64 test2_ret_result = 0;
SEC("fentry.multi/bpf_fentry_test*")
int BPF_PROG(test1, unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f)
{
- multi_arg_check(ip, a, b, c, d, e, f, &test1_arg_result);
+ fentry_multi_arg_check(ip, a, b, c, d, e, f, &test1_arg_result);
return 0;
}
SEC("fexit.multi/")
int BPF_PROG(test2, unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, int ret)
{
- multi_arg_check(ip, a, b, c, d, e, f, &test2_arg_result);
+ fexit_multi_arg_check(ip, a, b, c, d, e, f, &test2_arg_result);
multi_ret_check(ip, ret, &test2_ret_result);
return 0;
}
diff --git a/tools/testing/selftests/bpf/progs/fentry_multi_test.c b/tools/testing/selftests/bpf/progs/fentry_multi_test.c
index a443fc958e5a..b3a025632e77 100644
--- a/tools/testing/selftests/bpf/progs/fentry_multi_test.c
+++ b/tools/testing/selftests/bpf/progs/fentry_multi_test.c
@@ -6,6 +6,8 @@
char _license[] SEC("license") = "GPL";
+MULTI_ARG_CHECK(fentry)
+
unsigned long long bpf_fentry_test[8];
__u64 test_result = 0;
@@ -13,6 +15,6 @@ __u64 test_result = 0;
SEC("fentry.multi/bpf_fentry_test*")
int BPF_PROG(test, unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f)
{
- multi_arg_check(ip, a, b, c, d, e, f, &test_result);
+ fentry_multi_arg_check(ip, a, b, c, d, e, f, &test_result);
return 0;
}
diff --git a/tools/testing/selftests/bpf/progs/fexit_multi_test.c b/tools/testing/selftests/bpf/progs/fexit_multi_test.c
index 365575cf05a0..8af0d65128d6 100644
--- a/tools/testing/selftests/bpf/progs/fexit_multi_test.c
+++ b/tools/testing/selftests/bpf/progs/fexit_multi_test.c
@@ -6,6 +6,8 @@
char _license[] SEC("license") = "GPL";
+MULTI_ARG_CHECK(fexit)
+
unsigned long long bpf_fentry_test[8];
__u64 test_arg_result = 0;
@@ -14,7 +16,7 @@ __u64 test_ret_result = 0;
SEC("fexit.multi/bpf_fentry_test*")
int BPF_PROG(test, unsigned long ip, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, int ret)
{
- multi_arg_check(ip, a, b, c, d, e, f, &test_arg_result);
+ fexit_multi_arg_check(ip, a, b, c, d, e, f, &test_arg_result);
multi_ret_check(ip, ret, &test_ret_result);
return 0;
}
--
2.31.1
next prev parent reply other threads:[~2021-06-05 11:11 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 11:10 [RFCv3 00/19] x86/ftrace/bpf: Add batch support for direct/tracing attach Jiri Olsa
2021-06-05 11:10 ` [PATCH 01/19] x86/ftrace: Remove extra orig rax move Jiri Olsa
2021-06-05 11:10 ` [PATCH 02/19] x86/ftrace: Remove fault protection code in prepare_ftrace_return Jiri Olsa
2021-06-05 11:10 ` [PATCH 03/19] x86/ftrace: Make function graph use ftrace directly Jiri Olsa
2021-06-08 18:35 ` Andrii Nakryiko
2021-06-08 18:51 ` Jiri Olsa
2021-06-08 19:11 ` Steven Rostedt
2021-06-05 11:10 ` [PATCH 04/19] tracing: Add trampoline/graph selftest Jiri Olsa
2021-06-05 11:10 ` [PATCH 05/19] ftrace: Add ftrace_add_rec_direct function Jiri Olsa
2021-06-05 11:10 ` [PATCH 06/19] ftrace: Add multi direct register/unregister interface Jiri Olsa
2021-06-05 11:10 ` [PATCH 07/19] ftrace: Add multi direct modify interface Jiri Olsa
2021-06-05 11:10 ` [PATCH 08/19] ftrace/samples: Add multi direct interface test module Jiri Olsa
2021-06-05 11:10 ` [PATCH 09/19] bpf, x64: Allow to use caller address from stack Jiri Olsa
2021-06-07 3:07 ` Yonghong Song
2021-06-07 18:13 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 10/19] bpf: Allow to store caller's ip as argument Jiri Olsa
2021-06-07 3:21 ` Yonghong Song
2021-06-07 18:15 ` Jiri Olsa
2021-06-08 18:49 ` Andrii Nakryiko
2021-06-08 20:58 ` Jiri Olsa
2021-06-08 21:02 ` Andrii Nakryiko
2021-06-08 21:11 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 11/19] bpf: Add support to load multi func tracing program Jiri Olsa
2021-06-07 3:56 ` Yonghong Song
2021-06-07 18:18 ` Jiri Olsa
2021-06-07 19:35 ` Yonghong Song
2021-06-05 11:10 ` [PATCH 12/19] bpf: Add bpf_trampoline_alloc function Jiri Olsa
2021-06-05 11:10 ` [PATCH 13/19] bpf: Add support to link multi func tracing program Jiri Olsa
2021-06-07 5:36 ` Yonghong Song
2021-06-07 18:25 ` Jiri Olsa
2021-06-07 19:39 ` Yonghong Song
2021-06-08 15:42 ` Alexei Starovoitov
2021-06-08 18:17 ` Jiri Olsa
2021-06-08 18:49 ` Alexei Starovoitov
2021-06-08 21:07 ` Jiri Olsa
2021-06-08 23:05 ` Alexei Starovoitov
2021-06-09 5:08 ` Andrii Nakryiko
2021-06-09 13:42 ` Jiri Olsa
2021-06-09 13:33 ` Jiri Olsa
2021-06-09 5:18 ` Andrii Nakryiko
2021-06-09 13:53 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 14/19] libbpf: Add btf__find_by_pattern_kind function Jiri Olsa
2021-06-09 5:29 ` Andrii Nakryiko
2021-06-09 13:59 ` Jiri Olsa
2021-06-09 14:19 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 15/19] libbpf: Add support to link multi func tracing program Jiri Olsa
2021-06-07 5:49 ` Yonghong Song
2021-06-07 18:28 ` Jiri Olsa
2021-06-07 19:42 ` Yonghong Song
2021-06-07 20:11 ` Jiri Olsa
2021-06-09 5:34 ` Andrii Nakryiko
2021-06-09 14:17 ` Jiri Olsa
2021-06-10 17:05 ` Andrii Nakryiko
2021-06-10 20:35 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 16/19] selftests/bpf: Add fentry multi func test Jiri Olsa
2021-06-07 6:06 ` Yonghong Song
2021-06-07 18:42 ` Jiri Olsa
2021-06-09 5:40 ` Andrii Nakryiko
2021-06-09 14:29 ` Jiri Olsa
2021-06-10 17:00 ` Andrii Nakryiko
2021-06-10 20:28 ` Jiri Olsa
2021-06-05 11:10 ` [PATCH 17/19] selftests/bpf: Add fexit " Jiri Olsa
2021-06-05 11:10 ` [PATCH 18/19] selftests/bpf: Add fentry/fexit " Jiri Olsa
2021-06-09 5:41 ` Andrii Nakryiko
2021-06-09 14:29 ` Jiri Olsa
2021-06-05 11:10 ` Jiri Olsa [this message]
2021-06-17 20:29 ` [RFCv3 00/19] x86/ftrace/bpf: Add batch support for direct/tracing attach Andrii Nakryiko
2021-06-19 8:33 ` Jiri Olsa
2021-06-19 16:19 ` Yonghong Song
2021-06-19 17:09 ` Jiri Olsa
2021-06-20 16:56 ` Yonghong Song
2021-06-20 17:47 ` Alexei Starovoitov
2021-06-21 6:46 ` Andrii Nakryiko
2021-06-21 6:50 ` Andrii Nakryiko
2021-07-06 20:26 ` Andrii Nakryiko
2021-07-07 15:19 ` Jiri Olsa
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=20210605111034.1810858-20-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dxu@dxuuu.xyz \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=songliubraving@fb.com \
--cc=vmalik@redhat.com \
--cc=yhs@fb.com \
/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).