selftests/bpf: Make seen_tc* variable tests more robust
Martin reported that on his local dev machine the test_tc_chain_mixed() fails as "test_tc_chain_mixed:FAIL:seen_tc5 unexpected seen_tc5: actual 1 != expected 0" and others occasionally, too. However, when running in a more isolated setup (qemu in particular), it works fine for him. The reason is that there is a small race-window where seen_tc* could turn into true for various test cases when there is background traffic, e.g. after the asserts they often get reset. In such case when subsequent detach takes place, unrelated background traffic could have already flipped the bool to true beforehand. Add a small helper tc_skel_reset_all_seen() to reset all bools before we do the ping test. At this point, everything is set up as expected and therefore no race can occur. All tc_{opts,links} tests continue to pass after this change. Reported-by: Martin KaFai Lau <martin.lau@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Link: https://lore.kernel.org/r/20231006220655.1653-7-daniel@iogearbox.net Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
parent
685446b062
commit
37345b8535
|
@ -66,4 +66,9 @@ static inline void assert_mprog_count_ifindex(int ifindex, int target, int expec
|
|||
__assert_mprog_count(target, expected, ifindex);
|
||||
}
|
||||
|
||||
static inline void tc_skel_reset_all_seen(struct test_tc_link *skel)
|
||||
{
|
||||
memset(skel->bss, 0, sizeof(*skel->bss));
|
||||
}
|
||||
|
||||
#endif /* TC_HELPERS */
|
||||
|
|
|
@ -65,6 +65,7 @@ void serial_test_tc_links_basic(void)
|
|||
ASSERT_EQ(optq.prog_ids[1], 0, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.link_ids[1], 0, "link_ids[1]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -97,6 +98,7 @@ void serial_test_tc_links_basic(void)
|
|||
ASSERT_EQ(optq.prog_ids[1], 0, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.link_ids[1], 0, "link_ids[1]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -187,6 +189,7 @@ static void test_tc_links_before_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "link_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -194,9 +197,6 @@ static void test_tc_links_before_target(int target)
|
|||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(optl,
|
||||
.flags = BPF_F_BEFORE,
|
||||
.relative_fd = bpf_program__fd(skel->progs.tc2),
|
||||
|
@ -246,6 +246,7 @@ static void test_tc_links_before_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
ASSERT_EQ(optq.link_ids[4], 0, "link_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -342,6 +343,7 @@ static void test_tc_links_after_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "link_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -349,9 +351,6 @@ static void test_tc_links_after_target(int target)
|
|||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(optl,
|
||||
.flags = BPF_F_AFTER,
|
||||
.relative_fd = bpf_program__fd(skel->progs.tc1),
|
||||
|
@ -401,6 +400,7 @@ static void test_tc_links_after_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
ASSERT_EQ(optq.link_ids[4], 0, "link_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -502,6 +502,7 @@ static void test_tc_links_revision_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -581,22 +582,20 @@ static void test_tc_chain_classic(int target, bool chain_tc_old)
|
|||
|
||||
assert_mprog_count(target, 2);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, true, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, chain_tc_old, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
err = bpf_link__detach(skel->links.tc2);
|
||||
if (!ASSERT_OK(err, "prog_detach"))
|
||||
goto cleanup;
|
||||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -707,16 +706,13 @@ static void test_tc_links_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "link_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, true, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(optl,
|
||||
.flags = BPF_F_REPLACE,
|
||||
.relative_fd = bpf_program__fd(skel->progs.tc2),
|
||||
|
@ -781,16 +777,13 @@ static void test_tc_links_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "link_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, false, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, true, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
err = bpf_link__detach(skel->links.tc2);
|
||||
if (!ASSERT_OK(err, "link_detach"))
|
||||
goto cleanup;
|
||||
|
@ -812,16 +805,13 @@ static void test_tc_links_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], 0, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.link_ids[1], 0, "link_ids[1]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, false, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
err = bpf_link__update_program(skel->links.tc1, skel->progs.tc1);
|
||||
if (!ASSERT_OK(err, "link_update_self"))
|
||||
goto cleanup;
|
||||
|
@ -843,6 +833,7 @@ static void test_tc_links_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], 0, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.link_ids[1], 0, "link_ids[1]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1254,6 +1245,7 @@ static void test_tc_links_prepend_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "link_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1261,9 +1253,6 @@ static void test_tc_links_prepend_target(int target)
|
|||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(optl,
|
||||
.flags = BPF_F_BEFORE,
|
||||
);
|
||||
|
@ -1311,6 +1300,7 @@ static void test_tc_links_prepend_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
ASSERT_EQ(optq.link_ids[4], 0, "link_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1411,6 +1401,7 @@ static void test_tc_links_append_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
ASSERT_EQ(optq.link_ids[2], 0, "link_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1418,9 +1409,6 @@ static void test_tc_links_append_target(int target)
|
|||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(optl,
|
||||
.flags = BPF_F_AFTER,
|
||||
);
|
||||
|
@ -1468,6 +1456,7 @@ static void test_tc_links_append_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
ASSERT_EQ(optq.link_ids[4], 0, "link_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1637,38 +1626,33 @@ static void test_tc_chain_mixed(int target)
|
|||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
ASSERT_EQ(skel->bss->seen_tc5, false, "seen_tc5");
|
||||
ASSERT_EQ(skel->bss->seen_tc6, true, "seen_tc6");
|
||||
|
||||
skel->bss->seen_tc4 = false;
|
||||
skel->bss->seen_tc5 = false;
|
||||
skel->bss->seen_tc6 = false;
|
||||
|
||||
err = bpf_link__update_program(skel->links.tc6, skel->progs.tc4);
|
||||
if (!ASSERT_OK(err, "link_update"))
|
||||
goto cleanup;
|
||||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc4, true, "seen_tc4");
|
||||
ASSERT_EQ(skel->bss->seen_tc5, true, "seen_tc5");
|
||||
ASSERT_EQ(skel->bss->seen_tc6, false, "seen_tc6");
|
||||
|
||||
skel->bss->seen_tc4 = false;
|
||||
skel->bss->seen_tc5 = false;
|
||||
skel->bss->seen_tc6 = false;
|
||||
|
||||
err = bpf_link__detach(skel->links.tc6);
|
||||
if (!ASSERT_OK(err, "prog_detach"))
|
||||
goto cleanup;
|
||||
|
||||
assert_mprog_count(target, 0);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
|
@ -1758,22 +1742,20 @@ static void test_tc_links_ingress(int target, bool chain_tc_old,
|
|||
|
||||
assert_mprog_count(target, 2);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, true, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, chain_tc_old, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
err = bpf_link__detach(skel->links.tc2);
|
||||
if (!ASSERT_OK(err, "prog_detach"))
|
||||
goto cleanup;
|
||||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
|
|
@ -59,6 +59,7 @@ void serial_test_tc_opts_basic(void)
|
|||
ASSERT_EQ(optq.prog_ids[0], id1, "prog_ids[0]");
|
||||
ASSERT_EQ(optq.prog_ids[1], 0, "prog_ids[1]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -83,6 +84,7 @@ void serial_test_tc_opts_basic(void)
|
|||
ASSERT_EQ(optq.prog_ids[0], id2, "prog_ids[0]");
|
||||
ASSERT_EQ(optq.prog_ids[1], 0, "prog_ids[1]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -163,6 +165,7 @@ static void test_tc_opts_before_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id2, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -219,6 +222,7 @@ static void test_tc_opts_before_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[3], id2, "prog_ids[3]");
|
||||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -313,6 +317,7 @@ static void test_tc_opts_after_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id2, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -369,6 +374,7 @@ static void test_tc_opts_after_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[3], id4, "prog_ids[3]");
|
||||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -514,6 +520,7 @@ static void test_tc_opts_revision_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id2, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -608,22 +615,20 @@ static void test_tc_chain_classic(int target, bool chain_tc_old)
|
|||
|
||||
assert_mprog_count(target, 2);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, true, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, chain_tc_old, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
err = bpf_prog_detach_opts(fd2, loopback, target, &optd);
|
||||
if (!ASSERT_OK(err, "prog_detach"))
|
||||
goto cleanup_detach;
|
||||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -730,16 +735,13 @@ static void test_tc_opts_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_attach_flags[1], 0, "prog_flags[1]");
|
||||
ASSERT_EQ(optq.prog_attach_flags[2], 0, "prog_flags[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, true, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, false, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(opta,
|
||||
.flags = BPF_F_REPLACE,
|
||||
.replace_prog_fd = fd2,
|
||||
|
@ -767,16 +769,13 @@ static void test_tc_opts_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id1, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
ASSERT_EQ(skel->bss->seen_tc2, false, "seen_tc2");
|
||||
ASSERT_EQ(skel->bss->seen_tc3, true, "seen_tc3");
|
||||
|
||||
skel->bss->seen_tc1 = false;
|
||||
skel->bss->seen_tc2 = false;
|
||||
skel->bss->seen_tc3 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(opta,
|
||||
.flags = BPF_F_REPLACE | BPF_F_BEFORE,
|
||||
.replace_prog_fd = fd3,
|
||||
|
@ -805,6 +804,7 @@ static void test_tc_opts_replace_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id1, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1084,6 +1084,7 @@ static void test_tc_opts_prepend_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id1, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1124,6 +1125,7 @@ static void test_tc_opts_prepend_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[3], id1, "prog_ids[3]");
|
||||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1222,6 +1224,7 @@ static void test_tc_opts_append_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[1], id2, "prog_ids[1]");
|
||||
ASSERT_EQ(optq.prog_ids[2], 0, "prog_ids[2]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -1262,6 +1265,7 @@ static void test_tc_opts_append_target(int target)
|
|||
ASSERT_EQ(optq.prog_ids[3], id4, "prog_ids[3]");
|
||||
ASSERT_EQ(optq.prog_ids[4], 0, "prog_ids[4]");
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc1, true, "seen_tc1");
|
||||
|
@ -2316,16 +2320,13 @@ static void test_tc_chain_mixed(int target)
|
|||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
ASSERT_EQ(skel->bss->seen_tc5, false, "seen_tc5");
|
||||
ASSERT_EQ(skel->bss->seen_tc6, true, "seen_tc6");
|
||||
|
||||
skel->bss->seen_tc4 = false;
|
||||
skel->bss->seen_tc5 = false;
|
||||
skel->bss->seen_tc6 = false;
|
||||
|
||||
LIBBPF_OPTS_RESET(opta,
|
||||
.flags = BPF_F_REPLACE,
|
||||
.replace_prog_fd = fd3,
|
||||
|
@ -2339,21 +2340,19 @@ static void test_tc_chain_mixed(int target)
|
|||
|
||||
assert_mprog_count(target, 1);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc4, true, "seen_tc4");
|
||||
ASSERT_EQ(skel->bss->seen_tc5, true, "seen_tc5");
|
||||
ASSERT_EQ(skel->bss->seen_tc6, false, "seen_tc6");
|
||||
|
||||
skel->bss->seen_tc4 = false;
|
||||
skel->bss->seen_tc5 = false;
|
||||
skel->bss->seen_tc6 = false;
|
||||
|
||||
cleanup_opts:
|
||||
err = bpf_prog_detach_opts(detach_fd, loopback, target, &optd);
|
||||
ASSERT_OK(err, "prog_detach");
|
||||
assert_mprog_count(target, 0);
|
||||
|
||||
tc_skel_reset_all_seen(skel);
|
||||
ASSERT_OK(system(ping_cmd), ping_cmd);
|
||||
|
||||
ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
|
||||
|
|
Loading…
Reference in New Issue