perf: Stop using bpf_object__open_buffer() API

bpf_object__open_buffer() API is deprecated, use the unified opts
bpf_object__open_mem() API in perf instead. This requires at least
libbpf 0.0.6.

Signed-off-by: Christy Lee <christylee@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220125005923.418339-3-christylee@fb.com

diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c
index 8ac0a3a..0bc25a5 100644 (file)
--- a/tools/perf/tests/llvm.c
+++ b/tools/perf/tests/llvm.c
@@ -13,7 +13,7 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
 {
        struct bpf_object *obj;
 
-       obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, NULL);
+       obj = bpf_object__open_mem(obj_buf, obj_buf_sz, NULL);
        if (libbpf_get_error(obj))
                return TEST_FAIL;
        bpf_object__close(obj);

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index ef2832b..702d14a 100644 (file)
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -54,6 +54,7 @@ static bool libbpf_initialized;
 struct bpf_object *
 bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, const char *name)
 {
+       LIBBPF_OPTS(bpf_object_open_opts, opts, .object_name = name);
        struct bpf_object *obj;
 
        if (!libbpf_initialized) {
@@ -61,7 +62,7 @@ bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, const char *name)
                libbpf_initialized = true;
        }
 
-       obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, name);
+       obj = bpf_object__open_mem(obj_buf, obj_buf_sz, &opts);
        if (IS_ERR_OR_NULL(obj)) {
                pr_debug("bpf: failed to load buffer\n");
                return ERR_PTR(-EINVAL);
@@ -72,6 +73,7 @@ bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, const char *name)
 
 struct bpf_object *bpf__prepare_load(const char *filename, bool source)
 {
+       LIBBPF_OPTS(bpf_object_open_opts, opts, .object_name = filename);
        struct bpf_object *obj;
 
        if (!libbpf_initialized) {
@@ -94,7 +96,7 @@ struct bpf_object *bpf__prepare_load(const char *filename, bool source)
                                return ERR_PTR(-BPF_LOADER_ERRNO__COMPILE);
                } else
                        pr_debug("bpf: successful builtin compilation\n");
-               obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, filename);
+               obj = bpf_object__open_mem(obj_buf, obj_buf_sz, &opts);
 
                if (!IS_ERR_OR_NULL(obj) && llvm_param.dump_obj)
                        llvm__dump_obj(filename, obj_buf, obj_buf_sz);