selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program
Subsystems (6)
PATCH v3 1/1 selftests/bpf: Add a test for attaching a bpf fentry/fexit trace to an XDP program
Add a test that will attach a FENTRY and FEXIT program to the XDP test program. It will also verify data from the XDP context on FENTRY and verifies the return code on exit.
---
v2 -> v3:
- Incorporated review comments from Andrii and Maciej
v1 -> v2:
- Changed code to use the BPF skeleton
- Replace static volatile with global variable in eBPF code
.../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 65 ++++++++++++++++++++ .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44 ++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c new file +65 -0
@@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include <net/if.h> +#include "test_xdp.skel.h" +#include "test_xdp_bpf2bpf.skel.h" + +void test_xdp_bpf2bpf (void ) +{ +__u32 duration =0 , retval, size; +char buf[128 ]; +int err, pkt_fd, map_fd; +struct iphdr *iph = (void *)buf +sizeof (struct ethhdr ); +struct iptnl_info value4 = {.family =AF_INET }; +struct test_xdp *pkt_skel =NULL ; +struct test_xdp_bpf2bpf *ftrace_skel =NULL ; +struct vip key4 = {.protocol =6 , .family =AF_INET }; +DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts); + +/* Load XDP program to introspect */ + pkt_skel =test_xdp__open_and_load (); +if (CHECK (!pkt_skel,"pkt_skel_load" ,"test_xdp skeleton failed\n" )) +return ; + + pkt_fd =bpf_program__fd (pkt_skel->progs._xdp_tx_iptunnel); + + map_fd =bpf_map__fd (pkt_skel->maps.vip2tnl); +bpf_map_update_elem (map_fd, &key4, &value4,0 ); + +/* Load trace program */ + opts.attach_prog_fd = pkt_fd, + ftrace_skel =test_xdp_bpf2bpf__open_opts (&opts); +if (CHECK (!ftrace_skel,"__open" ,"ftrace skeleton failed\n" )) + goto out; + + err =test_xdp_bpf2bpf__load (ftrace_skel); +if (CHECK (err,"__load" ,"ftrace skeleton failed\n" )) + goto out; + + err =test_xdp_bpf2bpf__attach (ftrace_skel); +if (CHECK (err,"ftrace_attach" ,"ftrace attach failed: %d\n" , err)) + goto out; + +/* Run test program */ + err =bpf_prog_test_run (pkt_fd,1 , &pkt_v4,sizeof (pkt_v4), + buf, &size, &retval, &duration); + +if (CHECK (err || retval !=XDP_TX || size !=74 || + iph->protocol !=IPPROTO_IPIP ,"ipv4" , +"err %d errno %d retval %d size %d\n" , + err, errno, retval, size)) + goto out; + +/* Verify test results */ +if (CHECK (ftrace_skel->bss->test_result_fentry !=if_nametoindex ("lo" ), +"result" ,"fentry failed err %llu\n" , + ftrace_skel->bss->test_result_fentry)) + goto out; + +CHECK (ftrace_skel->bss->test_result_fexit !=XDP_TX ,"result" , +"fexit failed err %llu\n" , ftrace_skel->bss->test_result_fexit); + +out: +test_xdp__destroy (pkt_skel); +test_xdp_bpf2bpf__destroy (ftrace_skel); +}
tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c new file +44 -0
44 lines not on this page · raw message
Quoted 7 lines · Eelco Chaudron
Add a test that will attach a FENTRY and FEXIT program to the XDP test program. It will also verify data from the XDP context on FENTRY and verifies the return code on exit.
Signed-off-by Eelco Chaudron <[email protected]>---
Looks good, thanks! You are just missing one CHECK() for bpf_map_update_elem below, please add it. With that:
Quoted 36 lines
v2 -> v3:
- Incorporated review comments from Andrii and Maciejv1 -> v2:
- Changed code to use the BPF skeleton
- Replace static volatile with global variable in eBPF code.../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 65 ++++++++++++++++++++ .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44 ++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.ctools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c new file +17
-0@@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include <net/if.h> +#include "test_xdp.skel.h" +#include "test_xdp_bpf2bpf.skel.h" + +void test_xdp_bpf2bpf (void ) +{ +__u32 duration =0 , retval, size; +char buf[128 ]; +int err, pkt_fd, map_fd; +struct iphdr *iph = (void *)buf +sizeof (struct ethhdr ); +struct iptnl_info value4 = {.family =AF_INET }; +struct test_xdp *pkt_skel =NULL ; +struct test_xdp_bpf2bpf *ftrace_skel =NULL ; +struct vip key4 = {.protocol =6 , .family =AF_INET }; +DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts);
tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c line 27
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c new file +10
-0+ +/* Load XDP program to introspect */ + pkt_skel =test_xdp__open_and_load (); +if (CHECK (!pkt_skel,"pkt_skel_load" ,"test_xdp skeleton failed\n" )) +return ; + + pkt_fd =bpf_program__fd (pkt_skel->progs._xdp_tx_iptunnel); + + map_fd =bpf_map__fd (pkt_skel->maps.vip2tnl); +bpf_map_update_elem (map_fd, &key4, &value4,0 );
CHECK()? Sorry, didn't spot first time.
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c new file +7
-0+ +/* Load trace program */ + opts.attach_prog_fd = pkt_fd, + ftrace_skel =test_xdp_bpf2bpf__open_opts (&opts); +if (CHECK (!ftrace_skel,"__open" ,"ftrace skeleton failed\n" )) + goto out; +
[...]
Alexei Starovoitov
AppliedQuoted 55 lines · Andrii Nakryiko
Quoted 7 lines · Eelco Chaudron
Add a test that will attach a FENTRY and FEXIT program to the XDP test program. It will also verify data from the XDP context on FENTRY and verifies the return code on exit.
Signed-off-by Eelco Chaudron <[email protected]>---
Looks good, thanks! You are just missing one
CHECK()forbpf_map_update_elembelow, please add it. With that:Acked-by Andrii Nakryiko <[email protected]>Quoted 40 lines
v2 -> v3:
- Incorporated review comments from Andrii and Maciejv1 -> v2:
- Changed code to use the BPF skeleton
- Replace static volatile with global variable in eBPF code.../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 65 ++++++++++++++++++++ .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 44 ++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.ctools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c new file +21
-0@@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include <net/if.h> +#include "test_xdp.skel.h" +#include "test_xdp_bpf2bpf.skel.h" + +void test_xdp_bpf2bpf (void ) +{ +__u32 duration =0 , retval, size; +char buf[128 ]; +int err, pkt_fd, map_fd; +struct iphdr *iph = (void *)buf +sizeof (struct ethhdr ); +struct iptnl_info value4 = {.family =AF_INET }; +struct test_xdp *pkt_skel =NULL ; +struct test_xdp_bpf2bpf *ftrace_skel =NULL ; +struct vip key4 = {.protocol =6 , .family =AF_INET }; +DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts); + +/* Load XDP program to introspect */ + pkt_skel =test_xdp__open_and_load (); +if (CHECK (!pkt_skel,"pkt_skel_load" ,"test_xdp skeleton failed\n" ))
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c line 27
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c new file +6
-0+return ; + + pkt_fd =bpf_program__fd (pkt_skel->progs._xdp_tx_iptunnel); + + map_fd =bpf_map__fd (pkt_skel->maps.vip2tnl); +bpf_map_update_elem (map_fd, &key4, &value4,0 );
CHECK()? Sorry, didn't spot first time.
There is no such check in few other places in selftests and I don't think it's really necessary here.
If we adjust them let's fix them all.
Applied to bpf-next. Thanks.