selftests/bpf: extend changes_pkt_data with cases w/o subprograms

Extend changes_pkt_data tests with test cases freplacing the main
program that does not have subprograms. Try four combinations when
both main program and replacement do and do not change packet data.

Signed-off-by: Eduard Zingerman <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Alexei Starovoitov <[email protected]>

diff --git a/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c b/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c
index c0c7202f6c5c53caaf8c975a48abae78a9b2ac35..7526de3790814c9648a2d55f120b8b17c4722c05 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c
+++ b/tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c
@@ -10,10 +10,14 @@ static void print_verifier_log(const char *log)
                fprintf(stdout, "VERIFIER LOG:\n=============\n%s=============\n", log);
 }
 
-static void test_aux(const char *main_prog_name, const char *freplace_prog_name, bool expect_load)
+static void test_aux(const char *main_prog_name,
+                    const char *to_be_replaced,
+                    const char *replacement,
+                    bool expect_load)
 {
        struct changes_pkt_data_freplace *freplace = NULL;
        struct bpf_program *freplace_prog = NULL;
+       struct bpf_program *main_prog = NULL;
        LIBBPF_OPTS(bpf_object_open_opts, opts);
        struct changes_pkt_data *main = NULL;
        char log[16*1024];
@@ -26,6 +30,10 @@ static void test_aux(const char *main_prog_name, const char *freplace_prog_name,
        main = changes_pkt_data__open_opts(&opts);
        if (!ASSERT_OK_PTR(main, "changes_pkt_data__open"))
                goto out;
+       main_prog = bpf_object__find_program_by_name(main->obj, main_prog_name);
+       if (!ASSERT_OK_PTR(main_prog, "main_prog"))
+               goto out;
+       bpf_program__set_autoload(main_prog, true);
        err = changes_pkt_data__load(main);
        print_verifier_log(log);
        if (!ASSERT_OK(err, "changes_pkt_data__load"))
@@ -33,14 +41,14 @@ static void test_aux(const char *main_prog_name, const char *freplace_prog_name,
        freplace = changes_pkt_data_freplace__open_opts(&opts);
        if (!ASSERT_OK_PTR(freplace, "changes_pkt_data_freplace__open"))
                goto out;
-       freplace_prog = bpf_object__find_program_by_name(freplace->obj, freplace_prog_name);
+       freplace_prog = bpf_object__find_program_by_name(freplace->obj, replacement);
        if (!ASSERT_OK_PTR(freplace_prog, "freplace_prog"))
                goto out;
        bpf_program__set_autoload(freplace_prog, true);
        bpf_program__set_autoattach(freplace_prog, true);
        bpf_program__set_attach_target(freplace_prog,
-                                      bpf_program__fd(main->progs.dummy),
-                                      main_prog_name);
+                                      bpf_program__fd(main_prog),
+                                      to_be_replaced);
        err = changes_pkt_data_freplace__load(freplace);
        print_verifier_log(log);
        if (expect_load) {
@@ -62,15 +70,38 @@ out:
  * that either do or do not. It is only ok to freplace subprograms
  * that do not change packet data with those that do not as well.
  * The below tests check outcomes for each combination of such freplace.
+ * Also test a case when main subprogram itself is replaced and is a single
+ * subprogram in a program.
  */
 void test_changes_pkt_data_freplace(void)
 {
-       if (test__start_subtest("changes_with_changes"))
-               test_aux("changes_pkt_data", "changes_pkt_data", true);
-       if (test__start_subtest("changes_with_doesnt_change"))
-               test_aux("changes_pkt_data", "does_not_change_pkt_data", true);
-       if (test__start_subtest("doesnt_change_with_changes"))
-               test_aux("does_not_change_pkt_data", "changes_pkt_data", false);
-       if (test__start_subtest("doesnt_change_with_doesnt_change"))
-               test_aux("does_not_change_pkt_data", "does_not_change_pkt_data", true);
+       struct {
+               const char *main;
+               const char *to_be_replaced;
+               bool changes;
+       } mains[] = {
+               { "main_with_subprogs",   "changes_pkt_data",         true },
+               { "main_with_subprogs",   "does_not_change_pkt_data", false },
+               { "main_changes",         "main_changes",             true },
+               { "main_does_not_change", "main_does_not_change",     false },
+       };
+       struct {
+               const char *func;
+               bool changes;
+       } replacements[] = {
+               { "changes_pkt_data",         true },
+               { "does_not_change_pkt_data", false }
+       };
+       char buf[64];
+
+       for (int i = 0; i < ARRAY_SIZE(mains); ++i) {
+               for (int j = 0; j < ARRAY_SIZE(replacements); ++j) {
+                       snprintf(buf, sizeof(buf), "%s_with_%s",
+                                mains[i].to_be_replaced, replacements[j].func);
+                       if (!test__start_subtest(buf))
+                               continue;
+                       test_aux(mains[i].main, mains[i].to_be_replaced, replacements[j].func,
+                                mains[i].changes || !replacements[j].changes);
+               }
+       }
 }

diff --git a/tools/testing/selftests/bpf/progs/changes_pkt_data.c b/tools/testing/selftests/bpf/progs/changes_pkt_data.c
index f87da8e9d6b330c9f11767cbeacc0b9be902fc93..43cada48b28ad4921f9431c56d569ab1474cd278 100644 (file)
--- a/tools/testing/selftests/bpf/progs/changes_pkt_data.c
+++ b/tools/testing/selftests/bpf/progs/changes_pkt_data.c
@@ -4,22 +4,35 @@
 #include <bpf/bpf_helpers.h>
 
 __noinline
-long changes_pkt_data(struct __sk_buff *sk, __u32 len)
+long changes_pkt_data(struct __sk_buff *sk)
 {
-       return bpf_skb_pull_data(sk, len);
+       return bpf_skb_pull_data(sk, 0);
 }
 
 __noinline __weak
-long does_not_change_pkt_data(struct __sk_buff *sk, __u32 len)
+long does_not_change_pkt_data(struct __sk_buff *sk)
 {
        return 0;
 }
 
-SEC("tc")
-int dummy(struct __sk_buff *sk)
+SEC("?tc")
+int main_with_subprogs(struct __sk_buff *sk)
+{
+       changes_pkt_data(sk);
+       does_not_change_pkt_data(sk);
+       return 0;
+}
+
+SEC("?tc")
+int main_changes(struct __sk_buff *sk)
+{
+       bpf_skb_pull_data(sk, 0);
+       return 0;
+}
+
+SEC("?tc")
+int main_does_not_change(struct __sk_buff *sk)
 {
-       changes_pkt_data(sk, 0);
-       does_not_change_pkt_data(sk, 0);
        return 0;
 }
 

diff --git a/tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c b/tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c
index 0e525beb8603c9dea27aface487738ee9f995b2b..f9a622705f1b3bb2d6eeadaa2234606be90385a4 100644 (file)
--- a/tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c
+++ b/tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c
@@ -4,13 +4,13 @@
 #include <bpf/bpf_helpers.h>
 
 SEC("?freplace")
-long changes_pkt_data(struct __sk_buff *sk, __u32 len)
+long changes_pkt_data(struct __sk_buff *sk)
 {
-       return bpf_skb_pull_data(sk, len);
+       return bpf_skb_pull_data(sk, 0);
 }
 
 SEC("?freplace")
-long does_not_change_pkt_data(struct __sk_buff *sk, __u32 len)
+long does_not_change_pkt_data(struct __sk_buff *sk)
 {
        return 0;
 }