libbpf: Support batch_size option to bpf_prog_test_run

Add support for setting the new batch_size parameter to BPF_PROG_TEST_RUN
to libbpf; just add it as an option and pass it through to the kernel.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20220309105346.100053-4-toke@redhat.com

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 3c7c180294faae64b275d9cd75756ad44c002696..f69ce3a013859aaa5c74fb784635dd7cba49c310 100644 (file)
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -995,6 +995,7 @@ int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts)
 
        memset(&attr, 0, sizeof(attr));
        attr.test.prog_fd = prog_fd;
+       attr.test.batch_size = OPTS_GET(opts, batch_size, 0);
        attr.test.cpu = OPTS_GET(opts, cpu, 0);
        attr.test.flags = OPTS_GET(opts, flags, 0);
        attr.test.repeat = OPTS_GET(opts, repeat, 0);

diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 16b21757b8bff08c4d81afeb8f620c1438fa2809..5253cb4a4c0a6f31a6ea42fe6c5254cfa245c1ea 100644 (file)
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -512,8 +512,9 @@ struct bpf_test_run_opts {
        __u32 duration;      /* out: average per repetition in ns */
        __u32 flags;
        __u32 cpu;
+       __u32 batch_size;
 };
-#define bpf_test_run_opts__last_field cpu
+#define bpf_test_run_opts__last_field batch_size
 
 LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
                                      struct bpf_test_run_opts *opts);