selftests/bpf: Convert few more selftest to skeletons

[linux-2.6-microblaze.git] / tools / testing / selftests / bpf / prog_tests / fentry_test.c

diff --git a/tools/testing/selftests/bpf/prog_tests/fentry_test.c b/tools/testing/selftests/bpf/prog_tests/fentry_test.c
index 9fb1031..46a4afd 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/fentry_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/fentry_test.c
@@ -1,64 +1,46 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2019 Facebook */
 #include <test_progs.h>
+#include "test_pkt_access.skel.h"
+#include "fentry_test.skel.h"
+
+BPF_EMBED_OBJ_DECLARE(pkt_access);
+BPF_EMBED_OBJ_DECLARE(fentry);
 
 void test_fentry_test(void)
 {
-       struct bpf_prog_load_attr attr = {
-               .file = "./fentry_test.o",
-       };
-
-       char prog_name[] = "fentry/bpf_fentry_testX";
-       struct bpf_object *obj = NULL, *pkt_obj;
-       int err, pkt_fd, kfree_skb_fd, i;
-       struct bpf_link *link[6] = {};
-       struct bpf_program *prog[6];
+       struct test_pkt_access *pkt_skel = NULL;
+       struct fentry_test *fentry_skel = NULL;
+       int err, pkt_fd, i;
        __u32 duration, retval;
-       struct bpf_map *data_map;
-       const int zero = 0;
-       u64 result[6];
+       __u64 *result;
 
-       err = bpf_prog_load("./test_pkt_access.o", BPF_PROG_TYPE_SCHED_CLS,
-                           &pkt_obj, &pkt_fd);
-       if (CHECK(err, "prog_load sched cls", "err %d errno %d\n", err, errno))
+       pkt_skel = test_pkt_access__open_and_load(&pkt_access_embed);
+       if (CHECK(!pkt_skel, "pkt_skel_load", "pkt_access skeleton failed\n"))
                return;
-       err = bpf_prog_load_xattr(&attr, &obj, &kfree_skb_fd);
-       if (CHECK(err, "prog_load fail", "err %d errno %d\n", err, errno))
-               goto close_prog;
+       fentry_skel = fentry_test__open_and_load(&fentry_embed);
+       if (CHECK(!fentry_skel, "fentry_skel_load", "fentry skeleton failed\n"))
+               goto cleanup;
 
-       for (i = 0; i < 6; i++) {
-               prog_name[sizeof(prog_name) - 2] = '1' + i;
-               prog[i] = bpf_object__find_program_by_title(obj, prog_name);
-               if (CHECK(!prog[i], "find_prog", "prog %s not found\n", prog_name))
-                       goto close_prog;
-               link[i] = bpf_program__attach_trace(prog[i]);
-               if (CHECK(IS_ERR(link[i]), "attach_trace", "failed to link\n"))
-                       goto close_prog;
-       }
-       data_map = bpf_object__find_map_by_name(obj, "fentry_t.bss");
-       if (CHECK(!data_map, "find_data_map", "data map not found\n"))
-               goto close_prog;
+       err = fentry_test__attach(fentry_skel);
+       if (CHECK(err, "fentry_attach", "fentry attach failed: %d\n", err))
+               goto cleanup;
 
+       pkt_fd = bpf_program__fd(pkt_skel->progs.test_pkt_access);
        err = bpf_prog_test_run(pkt_fd, 1, &pkt_v6, sizeof(pkt_v6),
                                NULL, NULL, &retval, &duration);
        CHECK(err || retval, "ipv6",
              "err %d errno %d retval %d duration %d\n",
              err, errno, retval, duration);
 
-       err = bpf_map_lookup_elem(bpf_map__fd(data_map), &zero, &result);
-       if (CHECK(err, "get_result",
-                 "failed to get output data: %d\n", err))
-               goto close_prog;
-
-       for (i = 0; i < 6; i++)
-               if (CHECK(result[i] != 1, "result", "bpf_fentry_test%d failed err %ld\n",
-                         i + 1, result[i]))
-                       goto close_prog;
+       result = (__u64 *)fentry_skel->bss;
+       for (i = 0; i < 6; i++) {
+               if (CHECK(result[i] != 1, "result",
+                         "fentry_test%d failed err %lld\n", i + 1, result[i]))
+                       goto cleanup;
+       }
 
-close_prog:
-       for (i = 0; i < 6; i++)
-               if (!IS_ERR_OR_NULL(link[i]))
-                       bpf_link__destroy(link[i]);
-       bpf_object__close(obj);
-       bpf_object__close(pkt_obj);
+cleanup:
+       fentry_test__destroy(fentry_skel);
+       test_pkt_access__destroy(pkt_skel);
 }