[PATCH v2 bpf-next 2/3] libbpf: introduce bpf_prog_test_run_xattr_opts
From: Song Liu <hidden>
Date: 2020-09-23 16:54:36
Also in:
bpf
Subsystem:
bpf [general] (safe dynamic programs and tools), bpf [library] (libbpf), the rest · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds
This API supports new field cpu_plus in bpf_attr.test. Acked-by: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Song Liu <redacted> --- tools/lib/bpf/bpf.c | 13 ++++++++++++- tools/lib/bpf/bpf.h | 11 +++++++++++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 2baa1308737c8..3228dd60fa32f 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c@@ -684,7 +684,8 @@ int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size, return ret; } -int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) +int bpf_prog_test_run_xattr_opts(struct bpf_prog_test_run_attr *test_attr, + const struct bpf_prog_test_run_opts *opts) { union bpf_attr attr; int ret;
@@ -693,6 +694,11 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) return -EINVAL; memset(&attr, 0, sizeof(attr)); + if (opts) { + if (!OPTS_VALID(opts, bpf_prog_test_run_opts)) + return -EINVAL; + attr.test.cpu_plus = opts->cpu_plus; + } attr.test.prog_fd = test_attr->prog_fd; attr.test.data_in = ptr_to_u64(test_attr->data_in); attr.test.data_out = ptr_to_u64(test_attr->data_out);
@@ -712,6 +718,11 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) return ret; } +int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr) +{ + return bpf_prog_test_run_xattr_opts(test_attr, NULL); +} + 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 8c1ac4b42f908..61318f47c8e1b 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h@@ -251,6 +251,17 @@ 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_prog_test_run_opts { + size_t sz; /* size of this struct for forward/backward compatibility */ + __u32 cpu_plus; +}; +#define bpf_prog_test_run_opts__last_field cpu_plus + +LIBBPF_API +int bpf_prog_test_run_xattr_opts(struct bpf_prog_test_run_attr *test_attr, + const struct bpf_prog_test_run_opts *opts); + #ifdef __cplusplus } /* extern "C" */ #endif
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 5f054dadf0829..c84a8bec57634 100644
--- 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_xattr_opts; bpf_program__section_name; perf_buffer__buffer_cnt; perf_buffer__buffer_fd;
--
2.24.1