iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'deprecate bpf_object__open_buffer() API'

Browse Source 
Christy Lee says:

====================

Deprecate bpf_object__open_buffer() API, replace all usage
with bpf_object__open_mem().

====================

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
Andrii Nakryiko
2022-01-24 20:37:34 -08:00
parent c45c79e546 5a34d98b28
commit bfc0a2e94e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/lib/bpf/libbpf.h
View File

@ -180,6 +180,7 @@ bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz,
const struct bpf_object_open_opts *opts); const struct bpf_object_open_opts *opts);
/* deprecated bpf_object__open variants */ /* deprecated bpf_object__open variants */
LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_object__open_mem() instead")
LIBBPF_API struct bpf_object * LIBBPF_API struct bpf_object *
bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz, bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz,
const char *name); const char *name);

2
tools/perf/tests/llvm.c
View File

@ -13,7 +13,7 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
{ {
struct bpf_object *obj; 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)) if (libbpf_get_error(obj))
return TEST_FAIL; return TEST_FAIL;
bpf_object__close(obj); bpf_object__close(obj);

6
tools/perf/util/bpf-loader.c
View File

@ -54,6 +54,7 @@ static bool libbpf_initialized;
struct bpf_object * struct bpf_object *
bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, const char *name) 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; struct bpf_object *obj;
if (!libbpf_initialized) { 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; 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)) { if (IS_ERR_OR_NULL(obj)) {
pr_debug("bpf: failed to load buffer\n"); pr_debug("bpf: failed to load buffer\n");
return ERR_PTR(-EINVAL); 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) 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; struct bpf_object *obj;
if (!libbpf_initialized) { 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); return ERR_PTR(-BPF_LOADER_ERRNO__COMPILE);
} else } else
pr_debug("bpf: successful builtin compilation\n"); 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) if (!IS_ERR_OR_NULL(obj) && llvm_param.dump_obj)
llvm__dump_obj(filename, obj_buf, obj_buf_sz); llvm__dump_obj(filename, obj_buf, obj_buf_sz);