selftests/bpf: Add various more tcx test cases
authorDaniel Borkmann <daniel@iogearbox.net>
Mon, 14 Aug 2023 16:14:10 +0000 (18:14 +0200)
committerMartin KaFai Lau <martin.lau@kernel.org>
Tue, 15 Aug 2023 04:54:59 +0000 (21:54 -0700)
Add several new tcx test cases to improve test coverage. This also includes
a few new tests with ingress instead of clsact qdisc, to cover the fix from
commit dc644b540a2d ("tcx: Fix splat in ingress_destroy upon tcx_entry_free").

  # ./test_progs -t tc
  [...]
  #234     tc_links_after:OK
  #235     tc_links_append:OK
  #236     tc_links_basic:OK
  #237     tc_links_before:OK
  #238     tc_links_chain_classic:OK
  #239     tc_links_chain_mixed:OK
  #240     tc_links_dev_cleanup:OK
  #241     tc_links_dev_mixed:OK
  #242     tc_links_ingress:OK
  #243     tc_links_invalid:OK
  #244     tc_links_prepend:OK
  #245     tc_links_replace:OK
  #246     tc_links_revision:OK
  #247     tc_opts_after:OK
  #248     tc_opts_append:OK
  #249     tc_opts_basic:OK
  #250     tc_opts_before:OK
  #251     tc_opts_chain_classic:OK
  #252     tc_opts_chain_mixed:OK
  #253     tc_opts_delete_empty:OK
  #254     tc_opts_demixed:OK
  #255     tc_opts_detach:OK
  #256     tc_opts_detach_after:OK
  #257     tc_opts_detach_before:OK
  #258     tc_opts_dev_cleanup:OK
  #259     tc_opts_invalid:OK
  #260     tc_opts_mixed:OK
  #261     tc_opts_prepend:OK
  #262     tc_opts_replace:OK
  #263     tc_opts_revision:OK
  [...]
  Summary: 44/38 PASSED, 0 SKIPPED, 0 FAILED

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/8699efc284b75ccdc51ddf7062fa2370330dc6c0.1692029283.git.daniel@iogearbox.net
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
tools/testing/selftests/bpf/prog_tests/tc_links.c
tools/testing/selftests/bpf/prog_tests/tc_opts.c
tools/testing/selftests/bpf/progs/test_tc_link.c

index 81eea5f10742e672819f343028424b25d151e8eb..74fc1fe9ee26146338c4e130b89c9bd3cf006412 100644 (file)
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2023 Isovalent */
 #include <uapi/linux/if_link.h>
+#include <uapi/linux/pkt_sched.h>
 #include <net/if.h>
 #include <test_progs.h>
 
@@ -1581,3 +1582,338 @@ void serial_test_tc_links_dev_cleanup(void)
        test_tc_links_dev_cleanup_target(BPF_TCX_INGRESS);
        test_tc_links_dev_cleanup_target(BPF_TCX_EGRESS);
 }
+
+static void test_tc_chain_mixed(int target)
+{
+       LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);
+       LIBBPF_OPTS(bpf_tc_hook, tc_hook, .ifindex = loopback);
+       LIBBPF_OPTS(bpf_tcx_opts, optl);
+       struct test_tc_link *skel;
+       struct bpf_link *link;
+       __u32 pid1, pid2, pid3;
+       int err;
+
+       skel = test_tc_link__open();
+       if (!ASSERT_OK_PTR(skel, "skel_open"))
+               goto cleanup;
+
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc4, target),
+                 0, "tc4_attach_type");
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc5, target),
+                 0, "tc5_attach_type");
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc6, target),
+                 0, "tc6_attach_type");
+
+       err = test_tc_link__load(skel);
+       if (!ASSERT_OK(err, "skel_load"))
+               goto cleanup;
+
+       pid1 = id_from_prog_fd(bpf_program__fd(skel->progs.tc4));
+       pid2 = id_from_prog_fd(bpf_program__fd(skel->progs.tc5));
+       pid3 = id_from_prog_fd(bpf_program__fd(skel->progs.tc6));
+
+       ASSERT_NEQ(pid1, pid2, "prog_ids_1_2");
+       ASSERT_NEQ(pid2, pid3, "prog_ids_2_3");
+
+       assert_mprog_count(target, 0);
+
+       tc_hook.attach_point = target == BPF_TCX_INGRESS ?
+                              BPF_TC_INGRESS : BPF_TC_EGRESS;
+       err = bpf_tc_hook_create(&tc_hook);
+       err = err == -EEXIST ? 0 : err;
+       if (!ASSERT_OK(err, "bpf_tc_hook_create"))
+               goto cleanup;
+
+       tc_opts.prog_fd = bpf_program__fd(skel->progs.tc5);
+       err = bpf_tc_attach(&tc_hook, &tc_opts);
+       if (!ASSERT_OK(err, "bpf_tc_attach"))
+               goto cleanup;
+
+       link = bpf_program__attach_tcx(skel->progs.tc6, loopback, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc6 = link;
+
+       assert_mprog_count(target, 1);
+
+       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);
+
+       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, true, loopback);
+
+       ASSERT_OK(system(ping_cmd), ping_cmd);
+
+       ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
+       ASSERT_EQ(skel->bss->seen_tc5, true, "seen_tc5");
+       ASSERT_EQ(skel->bss->seen_tc6, false, "seen_tc6");
+
+cleanup:
+       tc_opts.flags = tc_opts.prog_fd = tc_opts.prog_id = 0;
+       err = bpf_tc_detach(&tc_hook, &tc_opts);
+       ASSERT_OK(err, "bpf_tc_detach");
+
+       tc_hook.attach_point = BPF_TC_INGRESS | BPF_TC_EGRESS;
+       bpf_tc_hook_destroy(&tc_hook);
+
+       test_tc_link__destroy(skel);
+}
+
+void serial_test_tc_links_chain_mixed(void)
+{
+       test_tc_chain_mixed(BPF_TCX_INGRESS);
+       test_tc_chain_mixed(BPF_TCX_EGRESS);
+}
+
+static void test_tc_links_ingress(int target, bool chain_tc_old,
+                                 bool tcx_teardown_first)
+{
+       LIBBPF_OPTS(bpf_tc_opts, tc_opts,
+               .handle         = 1,
+               .priority       = 1,
+       );
+       LIBBPF_OPTS(bpf_tc_hook, tc_hook,
+               .ifindex        = loopback,
+               .attach_point   = BPF_TC_CUSTOM,
+               .parent         = TC_H_INGRESS,
+       );
+       bool hook_created = false, tc_attached = false;
+       LIBBPF_OPTS(bpf_tcx_opts, optl);
+       __u32 pid1, pid2, pid3;
+       struct test_tc_link *skel;
+       struct bpf_link *link;
+       int err;
+
+       skel = test_tc_link__open();
+       if (!ASSERT_OK_PTR(skel, "skel_open"))
+               goto cleanup;
+
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc1, target),
+                 0, "tc1_attach_type");
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc2, target),
+                 0, "tc2_attach_type");
+
+       err = test_tc_link__load(skel);
+       if (!ASSERT_OK(err, "skel_load"))
+               goto cleanup;
+
+       pid1 = id_from_prog_fd(bpf_program__fd(skel->progs.tc1));
+       pid2 = id_from_prog_fd(bpf_program__fd(skel->progs.tc2));
+       pid3 = id_from_prog_fd(bpf_program__fd(skel->progs.tc3));
+
+       ASSERT_NEQ(pid1, pid2, "prog_ids_1_2");
+       ASSERT_NEQ(pid2, pid3, "prog_ids_2_3");
+
+       assert_mprog_count(target, 0);
+
+       if (chain_tc_old) {
+               ASSERT_OK(system("tc qdisc add dev lo ingress"), "add_ingress");
+               hook_created = true;
+
+               tc_opts.prog_fd = bpf_program__fd(skel->progs.tc3);
+               err = bpf_tc_attach(&tc_hook, &tc_opts);
+               if (!ASSERT_OK(err, "bpf_tc_attach"))
+                       goto cleanup;
+               tc_attached = true;
+       }
+
+       link = bpf_program__attach_tcx(skel->progs.tc1, loopback, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc1 = link;
+
+       link = bpf_program__attach_tcx(skel->progs.tc2, loopback, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc2 = link;
+
+       assert_mprog_count(target, 2);
+
+       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);
+
+       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, chain_tc_old, "seen_tc3");
+cleanup:
+       if (tc_attached) {
+               tc_opts.flags = tc_opts.prog_fd = tc_opts.prog_id = 0;
+               err = bpf_tc_detach(&tc_hook, &tc_opts);
+               ASSERT_OK(err, "bpf_tc_detach");
+       }
+       ASSERT_OK(system(ping_cmd), ping_cmd);
+       assert_mprog_count(target, 1);
+       if (hook_created && tcx_teardown_first)
+               ASSERT_OK(system("tc qdisc del dev lo ingress"), "del_ingress");
+       ASSERT_OK(system(ping_cmd), ping_cmd);
+       test_tc_link__destroy(skel);
+       ASSERT_OK(system(ping_cmd), ping_cmd);
+       if (hook_created && !tcx_teardown_first)
+               ASSERT_OK(system("tc qdisc del dev lo ingress"), "del_ingress");
+       ASSERT_OK(system(ping_cmd), ping_cmd);
+       assert_mprog_count(target, 0);
+}
+
+void serial_test_tc_links_ingress(void)
+{
+       test_tc_links_ingress(BPF_TCX_INGRESS, true, true);
+       test_tc_links_ingress(BPF_TCX_INGRESS, true, false);
+       test_tc_links_ingress(BPF_TCX_INGRESS, false, false);
+}
+
+static void test_tc_links_dev_mixed(int target)
+{
+       LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);
+       LIBBPF_OPTS(bpf_tc_hook, tc_hook);
+       LIBBPF_OPTS(bpf_tcx_opts, optl);
+       __u32 pid1, pid2, pid3, pid4;
+       struct test_tc_link *skel;
+       struct bpf_link *link;
+       int err, ifindex;
+
+       ASSERT_OK(system("ip link add dev tcx_opts1 type veth peer name tcx_opts2"), "add veth");
+       ifindex = if_nametoindex("tcx_opts1");
+       ASSERT_NEQ(ifindex, 0, "non_zero_ifindex");
+
+       skel = test_tc_link__open();
+       if (!ASSERT_OK_PTR(skel, "skel_open"))
+               goto cleanup;
+
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc1, target),
+                 0, "tc1_attach_type");
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc2, target),
+                 0, "tc2_attach_type");
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc3, target),
+                 0, "tc3_attach_type");
+       ASSERT_EQ(bpf_program__set_expected_attach_type(skel->progs.tc4, target),
+                 0, "tc4_attach_type");
+
+       err = test_tc_link__load(skel);
+       if (!ASSERT_OK(err, "skel_load"))
+               goto cleanup;
+
+       pid1 = id_from_prog_fd(bpf_program__fd(skel->progs.tc1));
+       pid2 = id_from_prog_fd(bpf_program__fd(skel->progs.tc2));
+       pid3 = id_from_prog_fd(bpf_program__fd(skel->progs.tc3));
+       pid4 = id_from_prog_fd(bpf_program__fd(skel->progs.tc4));
+
+       ASSERT_NEQ(pid1, pid2, "prog_ids_1_2");
+       ASSERT_NEQ(pid3, pid4, "prog_ids_3_4");
+       ASSERT_NEQ(pid2, pid3, "prog_ids_2_3");
+
+       assert_mprog_count(target, 0);
+
+       link = bpf_program__attach_tcx(skel->progs.tc1, ifindex, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc1 = link;
+
+       assert_mprog_count_ifindex(ifindex, target, 1);
+
+       link = bpf_program__attach_tcx(skel->progs.tc2, ifindex, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc2 = link;
+
+       assert_mprog_count_ifindex(ifindex, target, 2);
+
+       link = bpf_program__attach_tcx(skel->progs.tc3, ifindex, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc3 = link;
+
+       assert_mprog_count_ifindex(ifindex, target, 3);
+
+       link = bpf_program__attach_tcx(skel->progs.tc4, ifindex, &optl);
+       if (!ASSERT_OK_PTR(link, "link_attach"))
+               goto cleanup;
+
+       skel->links.tc4 = link;
+
+       assert_mprog_count_ifindex(ifindex, target, 4);
+
+       tc_hook.ifindex = ifindex;
+       tc_hook.attach_point = target == BPF_TCX_INGRESS ?
+                              BPF_TC_INGRESS : BPF_TC_EGRESS;
+
+       err = bpf_tc_hook_create(&tc_hook);
+       err = err == -EEXIST ? 0 : err;
+       if (!ASSERT_OK(err, "bpf_tc_hook_create"))
+               goto cleanup;
+
+       tc_opts.prog_fd = bpf_program__fd(skel->progs.tc5);
+       err = bpf_tc_attach(&tc_hook, &tc_opts);
+       if (!ASSERT_OK(err, "bpf_tc_attach"))
+               goto cleanup;
+
+       ASSERT_OK(system("ip link del dev tcx_opts1"), "del veth");
+       ASSERT_EQ(if_nametoindex("tcx_opts1"), 0, "dev1_removed");
+       ASSERT_EQ(if_nametoindex("tcx_opts2"), 0, "dev2_removed");
+
+       ASSERT_EQ(ifindex_from_link_fd(bpf_link__fd(skel->links.tc1)), 0, "tc1_ifindex");
+       ASSERT_EQ(ifindex_from_link_fd(bpf_link__fd(skel->links.tc2)), 0, "tc2_ifindex");
+       ASSERT_EQ(ifindex_from_link_fd(bpf_link__fd(skel->links.tc3)), 0, "tc3_ifindex");
+       ASSERT_EQ(ifindex_from_link_fd(bpf_link__fd(skel->links.tc4)), 0, "tc4_ifindex");
+
+       test_tc_link__destroy(skel);
+       return;
+cleanup:
+       test_tc_link__destroy(skel);
+
+       ASSERT_OK(system("ip link del dev tcx_opts1"), "del veth");
+       ASSERT_EQ(if_nametoindex("tcx_opts1"), 0, "dev1_removed");
+       ASSERT_EQ(if_nametoindex("tcx_opts2"), 0, "dev2_removed");
+}
+
+void serial_test_tc_links_dev_mixed(void)
+{
+       test_tc_links_dev_mixed(BPF_TCX_INGRESS);
+       test_tc_links_dev_mixed(BPF_TCX_EGRESS);
+}
index 39bd253e41aa830b85129b84402eb3b213dd8d95..7a2ecd4eca5dd397d317d488ab09038e898a87ba 100644 (file)
@@ -2268,3 +2268,113 @@ void serial_test_tc_opts_delete_empty(void)
        test_tc_opts_delete_empty(BPF_TCX_INGRESS, true);
        test_tc_opts_delete_empty(BPF_TCX_EGRESS, true);
 }
+
+static void test_tc_chain_mixed(int target)
+{
+       LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);
+       LIBBPF_OPTS(bpf_tc_hook, tc_hook, .ifindex = loopback);
+       LIBBPF_OPTS(bpf_prog_attach_opts, opta);
+       LIBBPF_OPTS(bpf_prog_detach_opts, optd);
+       __u32 fd1, fd2, fd3, id1, id2, id3;
+       struct test_tc_link *skel;
+       int err, detach_fd;
+
+       skel = test_tc_link__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "skel_load"))
+               goto cleanup;
+
+       fd1 = bpf_program__fd(skel->progs.tc4);
+       fd2 = bpf_program__fd(skel->progs.tc5);
+       fd3 = bpf_program__fd(skel->progs.tc6);
+
+       id1 = id_from_prog_fd(fd1);
+       id2 = id_from_prog_fd(fd2);
+       id3 = id_from_prog_fd(fd3);
+
+       ASSERT_NEQ(id1, id2, "prog_ids_1_2");
+       ASSERT_NEQ(id2, id3, "prog_ids_2_3");
+
+       assert_mprog_count(target, 0);
+
+       tc_hook.attach_point = target == BPF_TCX_INGRESS ?
+                              BPF_TC_INGRESS : BPF_TC_EGRESS;
+       err = bpf_tc_hook_create(&tc_hook);
+       err = err == -EEXIST ? 0 : err;
+       if (!ASSERT_OK(err, "bpf_tc_hook_create"))
+               goto cleanup;
+
+       tc_opts.prog_fd = fd2;
+       err = bpf_tc_attach(&tc_hook, &tc_opts);
+       if (!ASSERT_OK(err, "bpf_tc_attach"))
+               goto cleanup_hook;
+
+       err = bpf_prog_attach_opts(fd3, loopback, target, &opta);
+       if (!ASSERT_EQ(err, 0, "prog_attach"))
+               goto cleanup_filter;
+
+       detach_fd = fd3;
+
+       assert_mprog_count(target, 1);
+
+       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,
+       );
+
+       err = bpf_prog_attach_opts(fd1, loopback, target, &opta);
+       if (!ASSERT_EQ(err, 0, "prog_attach"))
+               goto cleanup_opts;
+
+       detach_fd = fd1;
+
+       assert_mprog_count(target, 1);
+
+       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, true, loopback);
+
+       ASSERT_OK(system(ping_cmd), ping_cmd);
+
+       ASSERT_EQ(skel->bss->seen_tc4, false, "seen_tc4");
+       ASSERT_EQ(skel->bss->seen_tc5, true, "seen_tc5");
+       ASSERT_EQ(skel->bss->seen_tc6, false, "seen_tc6");
+
+cleanup_filter:
+       tc_opts.flags = tc_opts.prog_fd = tc_opts.prog_id = 0;
+       err = bpf_tc_detach(&tc_hook, &tc_opts);
+       ASSERT_OK(err, "bpf_tc_detach");
+
+cleanup_hook:
+       tc_hook.attach_point = BPF_TC_INGRESS | BPF_TC_EGRESS;
+       bpf_tc_hook_destroy(&tc_hook);
+
+cleanup:
+       test_tc_link__destroy(skel);
+}
+
+void serial_test_tc_opts_chain_mixed(void)
+{
+       test_tc_chain_mixed(BPF_TCX_INGRESS);
+       test_tc_chain_mixed(BPF_TCX_EGRESS);
+}
index ed1fd0e9cee9cbdffd3aa8cf7cfe54e2f340eb9c..30e7124c49a113181ba26516a7c5c71deee6ab9a 100644 (file)
@@ -10,6 +10,8 @@ bool seen_tc1;
 bool seen_tc2;
 bool seen_tc3;
 bool seen_tc4;
+bool seen_tc5;
+bool seen_tc6;
 
 SEC("tc/ingress")
 int tc1(struct __sk_buff *skb)
@@ -38,3 +40,17 @@ int tc4(struct __sk_buff *skb)
        seen_tc4 = true;
        return TCX_NEXT;
 }
+
+SEC("tc/egress")
+int tc5(struct __sk_buff *skb)
+{
+       seen_tc5 = true;
+       return TCX_PASS;
+}
+
+SEC("tc/egress")
+int tc6(struct __sk_buff *skb)
+{
+       seen_tc6 = true;
+       return TCX_PASS;
+}