| Message ID | 20210622202835.1151230-6-memxor@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Generic XDP improvements | expand |
Kumar Kartikeya Dwivedi <memxor@gmail.com> writes: > Generic XDP devmaps and cpumaps now allow setting value_size to 8 bytes > (so that prog_fd can be specified) and XDP progs using them succeed in > SKB mode now. Adjust the checks. > > Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com> > --- > tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c | 4 ++-- > tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c > index 0176573fe4e7..42e46d2ae349 100644 > --- a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c > +++ b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c > @@ -29,8 +29,8 @@ void test_xdp_with_cpumap_helpers(void) > */ > prog_fd = bpf_program__fd(skel->progs.xdp_redir_prog); > err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE); > - CHECK(err == 0, "Generic attach of program with 8-byte CPUMAP", > - "should have failed\n"); > + CHECK(err, "Generic attach of program with 8-byte CPUMAP", > + "shouldn't have failed\n"); There's a comment right above this that is now wrong... Also, this program is never being detached. > prog_fd = bpf_program__fd(skel->progs.xdp_dummy_cm); > map_fd = bpf_map__fd(skel->maps.cpu_map); > diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > index 88ef3ec8ac4c..861db508ace2 100644 > --- a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > +++ b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > @@ -31,8 +31,8 @@ void test_xdp_with_devmap_helpers(void) > */ > dm_fd = bpf_program__fd(skel->progs.xdp_redir_prog); > err = bpf_set_link_xdp_fd(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE); > - CHECK(err == 0, "Generic attach of program with 8-byte devmap", > - "should have failed\n"); > + CHECK(err, "Generic attach of program with 8-byte devmap", > + "shouldn't have failed\n"); ... same here -Toke
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c index 0176573fe4e7..42e46d2ae349 100644 --- a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c +++ b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c @@ -29,8 +29,8 @@ void test_xdp_with_cpumap_helpers(void) */ prog_fd = bpf_program__fd(skel->progs.xdp_redir_prog); err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE); - CHECK(err == 0, "Generic attach of program with 8-byte CPUMAP", - "should have failed\n"); + CHECK(err, "Generic attach of program with 8-byte CPUMAP", + "shouldn't have failed\n"); prog_fd = bpf_program__fd(skel->progs.xdp_dummy_cm); map_fd = bpf_map__fd(skel->maps.cpu_map); diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c index 88ef3ec8ac4c..861db508ace2 100644 --- a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c +++ b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c @@ -31,8 +31,8 @@ void test_xdp_with_devmap_helpers(void) */ dm_fd = bpf_program__fd(skel->progs.xdp_redir_prog); err = bpf_set_link_xdp_fd(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE); - CHECK(err == 0, "Generic attach of program with 8-byte devmap", - "should have failed\n"); + CHECK(err, "Generic attach of program with 8-byte devmap", + "shouldn't have failed\n"); dm_fd = bpf_program__fd(skel->progs.xdp_dummy_dm); map_fd = bpf_map__fd(skel->maps.dm_ports);
Generic XDP devmaps and cpumaps now allow setting value_size to 8 bytes (so that prog_fd can be specified) and XDP progs using them succeed in SKB mode now. Adjust the checks. Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com> --- tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c | 4 ++-- tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)