* [PATCH bpf-next] bpf, selftests: Skip verifier tests that fail to load with ENOTSUPP
@ 2021-10-07 17:33 Ilya Leoshkevich
2021-10-07 22:27 ` Song Liu
0 siblings, 1 reply; 3+ messages in thread
From: Ilya Leoshkevich @ 2021-10-07 17:33 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
Cc: bpf, Heiko Carstens, Vasily Gorbik, Ilya Leoshkevich
The verifier tests added in commit c48e51c8b07a ("bpf: selftests: Add
selftests for module kfunc support") fail on s390, since the JIT does
not support calling kernel functions. This is most likely an issue for
all the other non-Intel arches, as well as on Intel with
!CONFIG_DEBUG_INFO_BTF or !CONFIG_BPF_JIT.
Trying to check for messages from all the possible add_kfunc_call()
failure cases in test_verifier looks pointless, so do a much simpler
thing instead: just like it's already done in do_prog_test_run(), skip
the tests that fail to load with ENOTSUPP.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
tools/testing/selftests/bpf/test_verifier.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 3a9e332c5e36..25afe423b3f0 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -47,6 +47,10 @@
#include "test_btf.h"
#include "../../../include/linux/filter.h"
+#ifndef ENOTSUPP
+#define ENOTSUPP 524
+#endif
+
#define MAX_INSNS BPF_MAXINSNS
#define MAX_TEST_INSNS 1000000
#define MAX_FIXUPS 8
@@ -974,7 +978,7 @@ static int do_prog_test_run(int fd_prog, bool unpriv, uint32_t expected_val,
if (err) {
switch (saved_errno) {
- case 524/*ENOTSUPP*/:
+ case ENOTSUPP:
printf("Did not run the program (not supported) ");
return 0;
case EPERM:
@@ -1119,6 +1123,12 @@ static void do_test_single(struct bpf_test *test, bool unpriv,
goto close_fds;
}
+ if (fd_prog < 0 && saved_errno == ENOTSUPP) {
+ printf("SKIP (program uses an unsupported feature)\n");
+ skips++;
+ goto close_fds;
+ }
+
alignment_prevented_execution = 0;
if (expected_ret == ACCEPT || expected_ret == VERBOSE_ACCEPT) {
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf, selftests: Skip verifier tests that fail to load with ENOTSUPP
2021-10-07 17:33 [PATCH bpf-next] bpf, selftests: Skip verifier tests that fail to load with ENOTSUPP Ilya Leoshkevich
@ 2021-10-07 22:27 ` Song Liu
2021-10-09 3:07 ` Andrii Nakryiko
0 siblings, 1 reply; 3+ messages in thread
From: Song Liu @ 2021-10-07 22:27 UTC (permalink / raw)
To: Ilya Leoshkevich
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, bpf,
Heiko Carstens, Vasily Gorbik
On Thu, Oct 7, 2021 at 12:44 PM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> The verifier tests added in commit c48e51c8b07a ("bpf: selftests: Add
> selftests for module kfunc support") fail on s390, since the JIT does
> not support calling kernel functions. This is most likely an issue for
> all the other non-Intel arches, as well as on Intel with
> !CONFIG_DEBUG_INFO_BTF or !CONFIG_BPF_JIT.
>
> Trying to check for messages from all the possible add_kfunc_call()
> failure cases in test_verifier looks pointless, so do a much simpler
> thing instead: just like it's already done in do_prog_test_run(), skip
> the tests that fail to load with ENOTSUPP.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Song Liu <songliubraving@fb.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf, selftests: Skip verifier tests that fail to load with ENOTSUPP
2021-10-07 22:27 ` Song Liu
@ 2021-10-09 3:07 ` Andrii Nakryiko
0 siblings, 0 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2021-10-09 3:07 UTC (permalink / raw)
To: Song Liu
Cc: Ilya Leoshkevich, Alexei Starovoitov, Daniel Borkmann, bpf,
Heiko Carstens, Vasily Gorbik
On Thu, Oct 7, 2021 at 3:28 PM Song Liu <song@kernel.org> wrote:
>
> On Thu, Oct 7, 2021 at 12:44 PM Ilya Leoshkevich <iii@linux.ibm.com> wrote:
> >
> > The verifier tests added in commit c48e51c8b07a ("bpf: selftests: Add
> > selftests for module kfunc support") fail on s390, since the JIT does
> > not support calling kernel functions. This is most likely an issue for
> > all the other non-Intel arches, as well as on Intel with
> > !CONFIG_DEBUG_INFO_BTF or !CONFIG_BPF_JIT.
> >
> > Trying to check for messages from all the possible add_kfunc_call()
> > failure cases in test_verifier looks pointless, so do a much simpler
> > thing instead: just like it's already done in do_prog_test_run(), skip
> > the tests that fail to load with ENOTSUPP.
> >
> > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
>
> Acked-by: Song Liu <songliubraving@fb.com>
Applied to bpf-next, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-09 3:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-07 17:33 [PATCH bpf-next] bpf, selftests: Skip verifier tests that fail to load with ENOTSUPP Ilya Leoshkevich
2021-10-07 22:27 ` Song Liu
2021-10-09 3:07 ` Andrii Nakryiko
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).