deprecate bpf_object__open_buffer() API
Subsystems (3)
cover deprecate bpf_object__open_buffer() API
Deprecate bpf_object__open_buffer() API, replace all usage with bpf_object__open_mem().
[0] closes: https://github.com/libbpf/libbpf/issues/287
Christy Lee (2):
libbpf: mark bpf_object__open_buffer() API deprecated
perf: stop using bpf_object__open_buffer() API
tools/lib/bpf/libbpf.h | 1 + tools/perf/tests/llvm.c | 2 +- tools/perf/util/bpf-event.c | 10 ++++++++++ tools/perf/util/bpf-loader.c | 10 ++++++++-- 4 files changed, 20 insertions(+), 3 deletions(-)
Signature · 1 line
2.30.2
PATCH 2/2 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 6.0.
--- tools/perf/tests/llvm.c | 2 +- tools/perf/util/bpf-event.c | 10 ++++++++++ tools/perf/util/bpf-loader.c | 10 ++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-)
tools/perf/tests/llvm.c +1 -1
@@ -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);
tools/perf/util/bpf-event.c +10 -0
@@ -51,6 +51,16 @@ bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev)#pragma GCC diagnostic pop } +struct bpf_object *__weak +bpf_object__open_mem (const void *obj_buf,size_t obj_buf_sz, +const struct bpf_object_open_opts *opts) +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +return bpf_object__open_buffer (obj_buf, obj_buf_sz, opts->object_name); +#pragma GCC diagnostic pop +} +const void *__weak btf__raw_data (const struct btf *btf_ro,__u32 *size) {
tools/perf/util/bpf-loader.c +8 -2
@@ -54,6 +54,9 @@ static bool libbpf_initialized;struct bpf_object *bpf__prepare_load_buffer (void *obj_buf,size_t obj_buf_sz,const char *name) { +DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts, + .object_name = name + );struct bpf_object *obj;if (!libbpf_initialized) {
@@ -61,7 +64,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 +75,9 @@ 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) { +DECLARE_LIBBPF_OPTS (bpf_object_open_opts, opts, + .object_name = filename + );struct bpf_object *obj;if (!libbpf_initialized) {
@@ -94,7 +100,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);
Signature · 1 line
2.30.2
PATCH 1/2 libbpf: mark bpf_object__open_buffer() API deprecated
In reply to Christy LeeDeprecate bpf_object__open_buffer() API in favor of the unified opts bpf_object__open_mem() API.
--- tools/lib/bpf/libbpf.h | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/libbpf.h +1 -0
@@ -180,6 +180,7 @@ bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz, const struct bpf_object_open_opts *opts);/* deprecated bpf_object__open variants */ +LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_object__open_mem() instead") LIBBPF_API struct bpf_object *bpf_object__open_buffer (const void *obj_buf,size_t obj_buf_sz,const char *name);
Signature · 1 line
2.30.2
Re: [PATCH bpf-next 2/2] perf: stop using bpf_object__open_buffer() API
In reply to Christy LeeQuoted 4 lines · Christy Lee
bpf_object__open_buffer()API is deprecated, use the unified optsbpf_object__open_mem()API in perf instead. This requires at least libbpf 6.0.
Not 6.0, but 0.0.6 (not even v0.6). So it's a very old API. I removed the __weak stub because it should be there anyways.
Fixed up commit message and applied the series to bpf-next, thanks.
Quoted 8 lines
Signed-off-by Christy Lee <[email protected]>--- tools/perf/tests/llvm.c | 2 +- tools/perf/util/bpf-event.c | 10 ++++++++++ tools/perf/util/bpf-loader.c | 10 ++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-)
[...]