[RFC PATCH bpf-next 2/4] selftests/bpf: Add re-attach test to fentry_test

[Jiri Olsa]

Adding the test to re-attach (detach/attach again) tracing
fentry programs, plus check that already linked program can't
be attached again.

Fixing the number of check-ed results, which should be 8.

Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 .../selftests/bpf/prog_tests/fentry_test.c    | 58 ++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/fentry_test.c 
b/tools/testing/selftests/bpf/prog_tests/fentry_test.c
index 04ebbf1cb390..fa7a9c719659 100644
--- a/tools/testing/selftests/bpf/prog_tests/fentry_test.c
+++ b/tools/testing/selftests/bpf/prog_tests/fentry_test.c
@@ -3,20 +3,13 @@
 #include <test_progs.h>
 #include "fentry_test.skel.h"
 
-void test_fentry_test(void)
+static __u32 duration;
+
+static int fentry_test(struct fentry_test *fentry_skel)
 {
-       struct fentry_test *fentry_skel = NULL;
        int err, prog_fd, i;
-       __u32 duration = 0, retval;
        __u64 *result;
-
-       fentry_skel = fentry_test__open_and_load();
-       if (CHECK(!fentry_skel, "fentry_skel_load", "fentry skeleton failed\n"))
-               goto cleanup;
-
-       err = fentry_test__attach(fentry_skel);
-       if (CHECK(err, "fentry_attach", "fentry attach failed: %d\n", err))
-               goto cleanup;
+       __u32 retval;
 
        prog_fd = bpf_program__fd(fentry_skel->progs.test1);
        err = bpf_prog_test_run(prog_fd, 1, NULL, 0,
@@ -26,12 +19,51 @@ void test_fentry_test(void)
              err, errno, retval, duration);
 
        result = (__u64 *)fentry_skel->bss;
-       for (i = 0; i < 6; i++) {
+       for (i = 0; i < 8; i++) {
                if (CHECK(result[i] != 1, "result",
                          "fentry_test%d failed err %lld\n", i + 1, result[i]))
-                       goto cleanup;
+                       return -1;
        }
 
+       /* zero results for re-attach test */
+       for (i = 0; i < 8; i++)
+               result[i] = 0;
+       return 0;
+}
+
+void test_fentry_test(void)
+{
+       struct fentry_test *fentry_skel = NULL;
+       struct bpf_link *link;
+       int err;
+
+       fentry_skel = fentry_test__open_and_load();
+       if (CHECK(!fentry_skel, "fentry_skel_load", "fentry skeleton failed\n"))
+               goto cleanup;
+
+       err = fentry_test__attach(fentry_skel);
+       if (CHECK(err, "fentry_attach", "fentry attach failed: %d\n", err))
+               goto cleanup;
+
+       err = fentry_test(fentry_skel);
+       if (CHECK(err, "fentry_test", "fentry test failed: %d\n", err))
+               goto cleanup;
+
+       fentry_test__detach(fentry_skel);
+
+       /* Re-attach and test again */
+       err = fentry_test__attach(fentry_skel);
+       if (CHECK(err, "fentry_attach", "fentry re-attach failed: %d\n", err))
+               goto cleanup;
+
+       link = bpf_program__attach(fentry_skel->progs.test1);
+       if (CHECK(!IS_ERR(link), "attach_fentry re-attach without detach",
+                 "err: %ld\n", PTR_ERR(link)))
+               goto cleanup;
+
+       err = fentry_test(fentry_skel);
+       CHECK(err, "fentry_test", "fentry test failed: %d\n", err);
+
 cleanup:
        fentry_test__destroy(fentry_skel);
 }
-- 
2.30.2