selftests/bpf: add missing \n to flow_dissector CHECK errors
Subsystems (5)
PATCH 1/2 selftests/bpf: add missing \n to flow_dissector CHECK errors
Otherwise, in case of an error, everything gets mushed together.
Fixes a5cb33464e53 ("selftests/bpf: make flow dissector tests more extensible")
Signed-off-by Stanislav Fomichev <[email protected]>
--- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/flow_dissector.c +4 -4
@@ -242,12 +242,12 @@ void test_flow_dissector(void)*/ err =bpf_prog_attach (prog_fd,0 ,BPF_FLOW_DISSECTOR ,0 ); -CHECK (err,"bpf_prog_attach" ,"err %d errno %d" , err, errno); +CHECK (err,"bpf_prog_attach" ,"err %d errno %d\n" , err, errno); tap_fd =create_tap ("tap0" ); -CHECK (tap_fd <0 ,"create_tap" ,"tap_fd %d errno %d" , tap_fd, errno); +CHECK (tap_fd <0 ,"create_tap" ,"tap_fd %d errno %d\n" , tap_fd, errno); err =ifup ("tap0" ); -CHECK (err,"ifup" ,"err %d errno %d" , err, errno); +CHECK (err,"ifup" ,"err %d errno %d\n" , err, errno);for (i =0 ; i <ARRAY_SIZE (tests); i++) {struct bpf_flow_keys flow_keys = {};
@@ -255,7 +255,7 @@ void test_flow_dissector(void)__u32 key =0 ; err =tx_tap (tap_fd, &tests[i].pkt,sizeof (tests[i].pkt)); -CHECK (err <0 ,"tx_tap" ,"err %d errno %d" , err, errno); +CHECK (err <0 ,"tx_tap" ,"err %d errno %d\n" , err, errno); err =bpf_map_lookup_elem (keys_fd, &key, &flow_keys);CHECK_ATTR (err, tests[i].name,"bpf_map_lookup_elem %d\n" , err);
Signature · 1 line
2.21.0.1020.gf2820cf01a-goog
PATCH 2/2 selftests/bpf: add prog detach to flow_dissector test
In case we are not running in a namespace (which we don't do by default), let's try to detach the bpf program that we use for eth_get_headlen tests.
Fixes 0905beec9f52 ("selftests/bpf: run flow dissector tests in skb-less mode")
Signed-off-by Stanislav Fomichev <[email protected]>
--- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/prog_tests/flow_dissector.c +1 -0
@@ -264,5 +264,6 @@ void test_flow_dissector(void)CHECK_FLOW_KEYS (tests[i].name, flow_keys, tests[i].keys); } +bpf_prog_detach (prog_fd,BPF_FLOW_DISSECTOR );bpf_object__close (obj); }
Signature · 1 line
2.21.0.1020.gf2820cf01a-goog
Daniel Borkmann
maintainerQuoted 4 lines · Stanislav Fomichev
Otherwise, in case of an error, everything gets mushed together.
Fixes a5cb33464e53 ("selftests/bpf: make flow dissector tests more extensible")Signed-off-by Stanislav Fomichev <[email protected]>
Both applied, thanks!