Commit bfc0a2e9 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'deprecate bpf_object__open_buffer() API' 



Christy Lee says:

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

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

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

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents c45c79e5 5a34d98b

tools/lib/bpf/libbpf.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

tools/perf/tests/llvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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-loader.c

+4 −2
Original line number Diff line number Diff line
@@ -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);