[PATCH bpf-next 5/8] tools: libbpf: allow testing program types with multi-prog semantics

[Lorenz Bauer]

Add a wrapper bpf_prog_test_run_array that allows testing
multiple programs for supported program types.

Signed-off-by: Lorenz Bauer <l...@cloudflare.com>
---
 tools/lib/bpf/bpf.c      | 16 +++++++++++++++-
 tools/lib/bpf/bpf.h      |  3 +++
 tools/lib/bpf/libbpf.map |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index bba48ff4c5c0..95ec1a3f0931 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -765,6 +765,14 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr 
*test_attr)
 }
 
 int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts)
+{
+       __u32 fd = prog_fd;
+
+       return bpf_prog_test_run_array(&fd, 1, opts);
+}
+
+int bpf_prog_test_run_array(__u32 *prog_fds, __u32 prog_fds_cnt,
+                              struct bpf_test_run_opts *opts)
 {
        union bpf_attr attr;
        int ret;
@@ -773,7 +781,6 @@ int bpf_prog_test_run_opts(int prog_fd, struct 
bpf_test_run_opts *opts)
                return -EINVAL;
 
        memset(&attr, 0, sizeof(attr));
-       attr.test.prog_fd = prog_fd;
        attr.test.cpu = OPTS_GET(opts, cpu, 0);
        attr.test.flags = OPTS_GET(opts, flags, 0);
        attr.test.repeat = OPTS_GET(opts, repeat, 0);
@@ -787,6 +794,13 @@ int bpf_prog_test_run_opts(int prog_fd, struct 
bpf_test_run_opts *opts)
        attr.test.data_in = ptr_to_u64(OPTS_GET(opts, data_in, NULL));
        attr.test.data_out = ptr_to_u64(OPTS_GET(opts, data_out, NULL));
 
+       if (prog_fds_cnt == 1) {
+               attr.test.prog_fd = prog_fds[0];
+       } else {
+               attr.test.prog_fds = ptr_to_u64(prog_fds);
+               attr.test.prog_fds_cnt = prog_fds_cnt;
+       }
+
        ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));
        OPTS_SET(opts, data_size_out, attr.test.data_size_out);
        OPTS_SET(opts, ctx_size_out, attr.test.ctx_size_out);
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 875dde20d56e..47a05fdc9867 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -278,6 +278,9 @@ struct bpf_test_run_opts {
 LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
                                      struct bpf_test_run_opts *opts);
 
+LIBBPF_API int bpf_prog_test_run_array(__u32 *prog_fds, __u32 prog_fds_cnt,
+                                         struct bpf_test_run_opts *opts);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 1c0fd2dd233a..bc3a0b2d645f 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -340,6 +340,7 @@ LIBBPF_0.2.0 {
 
 LIBBPF_0.3.0 {
        global:
+               bpf_prog_test_run_array;
                btf__base_btf;
                btf__parse_elf_split;
                btf__parse_raw_split;
-- 
2.27.0