libbpf: Support test run of raw tracepoint programs

Add bpf_prog_test_run_opts() with support of new fields in bpf_attr.test,
namely, flags and cpu. Also extend _opts operations to support outputs via
opts.

Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200925205432.1777-3-songliubraving@fb.com

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 2baa130..c5a4d84 100644 (file)
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -712,6 +712,37 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr)
        return ret;
 }
 
+int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts)
+{
+       union bpf_attr attr;
+       int ret;
+
+       if (!OPTS_VALID(opts, bpf_test_run_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);
+       attr.test.duration = OPTS_GET(opts, duration, 0);
+       attr.test.ctx_size_in = OPTS_GET(opts, ctx_size_in, 0);
+       attr.test.ctx_size_out = OPTS_GET(opts, ctx_size_out, 0);
+       attr.test.data_size_in = OPTS_GET(opts, data_size_in, 0);
+       attr.test.data_size_out = OPTS_GET(opts, data_size_out, 0);
+       attr.test.ctx_in = ptr_to_u64(OPTS_GET(opts, ctx_in, NULL));
+       attr.test.ctx_out = ptr_to_u64(OPTS_GET(opts, ctx_out, NULL));
+       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));
+
+       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);
+       OPTS_SET(opts, duration, attr.test.duration);
+       OPTS_SET(opts, retval, attr.test.retval);
+       return ret;
+}
+
 static int bpf_obj_get_next_id(__u32 start_id, __u32 *next_id, int cmd)
 {
        union bpf_attr attr;

diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 8c1ac4b..4f3568e 100644 (file)
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -251,6 +251,32 @@ struct bpf_prog_bind_opts {
 
 LIBBPF_API int bpf_prog_bind_map(int prog_fd, int map_fd,
                                 const struct bpf_prog_bind_opts *opts);
+
+struct bpf_test_run_opts {
+       size_t sz; /* size of this struct for forward/backward compatibility */
+       const void *data_in; /* optional */
+       void *data_out;      /* optional */
+       __u32 data_size_in;
+       __u32 data_size_out; /* in: max length of data_out
+                             * out: length of data_out
+                             */
+       const void *ctx_in; /* optional */
+       void *ctx_out;      /* optional */
+       __u32 ctx_size_in;
+       __u32 ctx_size_out; /* in: max length of ctx_out
+                            * out: length of cxt_out
+                            */
+       __u32 retval;        /* out: return code of the BPF program */
+       int repeat;
+       __u32 duration;      /* out: average per repetition in ns */
+       __u32 flags;
+       __u32 cpu;
+};
+#define bpf_test_run_opts__last_field cpu
+
+LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
+                                     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 5f054da..0623e7a 100644 (file)
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -303,6 +303,7 @@ LIBBPF_0.1.0 {
 LIBBPF_0.2.0 {
        global:
                bpf_prog_bind_map;
+               bpf_prog_test_run_opts;
                bpf_program__section_name;
                perf_buffer__buffer_cnt;
                perf_buffer__buffer_fd;

diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h
index 4d1c366..d3f7a6a 100644 (file)
--- a/tools/lib/bpf/libbpf_internal.h
+++ b/tools/lib/bpf/libbpf_internal.h
@@ -136,6 +136,11 @@ static inline bool libbpf_validate_opts(const char *opts,
        ((opts) && opts->sz >= offsetofend(typeof(*(opts)), field))
 #define OPTS_GET(opts, field, fallback_value) \
        (OPTS_HAS(opts, field) ? (opts)->field : fallback_value)
+#define OPTS_SET(opts, field, value)           \
+       do {                                    \
+               if (OPTS_HAS(opts, field))      \
+                       (opts)->field = value;  \
+       } while (0)
 
 int parse_cpu_mask_str(const char *s, bool **mask, int *mask_sz);
 int parse_cpu_mask_file(const char *fcpu, bool **mask, int *mask_sz);