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

Merge branch 'Stop using bpf_object__find_program_by_title API' 

Kui-Feng Lee says:

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

bpf_object__find_program_by_title is going to be deprecated since
v0.7.  Replace all use cases with bpf_object__find_program_by_name if
possible, or use bpf_object__for_each_program to iterate over
programs, matching section names.

V3 fixes a broken test case, fexit_bpf2bpf, in selftests/bpf, using
bpf_obj__for_each_program API instead.

[v2] https://lore.kernel.org/bpf/20211211003608.2764928-1-kuifeng@fb.com/
[v1] https://lore.kernel.org/bpf/20211210190855.1369060-1-kuifeng@fb.com/T/


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

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents c164b8b4 0da2596f

samples/bpf/hbm.c

+10 −1
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ static void do_error(char *msg, bool errno_flag) 


static int prog_load(char *prog)

{

	struct bpf_program *pos;

	const char *sec_name;



	obj = bpf_object__open_file(prog, NULL);

	if (libbpf_get_error(obj)) {

		printf("ERROR: opening BPF object file failed\n");
@@ -132,7 +135,13 @@ static int prog_load(char *prog) 
		goto err;

	}



	bpf_prog = bpf_object__find_program_by_title(obj, "cgroup_skb/egress");

	bpf_object__for_each_program(pos, obj) {

		sec_name = bpf_program__section_name(pos);

		if (sec_name && !strcmp(sec_name, "cgroup_skb/egress")) {

			bpf_prog = pos;

			break;

		}

	}

	if (!bpf_prog) {

		printf("ERROR: finding a prog in obj file failed\n");

		goto err;

samples/bpf/xdp_fwd_user.c

+10 −2
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ int main(int argc, char **argv) 
		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	const char *prog_name = "xdp_fwd";

	struct bpf_program *prog;

	struct bpf_program *prog = NULL;

	struct bpf_program *pos;

	const char *sec_name;

	int prog_fd, map_fd = -1;

	char filename[PATH_MAX];

	struct bpf_object *obj;
@@ -134,7 +136,13 @@ int main(int argc, char **argv) 
			return 1;

		}



		prog = bpf_object__find_program_by_title(obj, prog_name);

		bpf_object__for_each_program(pos, obj) {

			sec_name = bpf_program__section_name(pos);

			if (sec_name && !strcmp(sec_name, prog_name)) {

				prog = pos;

				break;

			}

		}

		prog_fd = bpf_program__fd(prog);

		if (prog_fd < 0) {

			printf("program not found: %s\n", strerror(prog_fd));

tools/lib/bpf/libbpf.h

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ struct btf; 
LIBBPF_API struct btf *bpf_object__btf(const struct bpf_object *obj);

LIBBPF_API int bpf_object__btf_fd(const struct bpf_object *obj);



LIBBPF_DEPRECATED_SINCE(0, 7, "use bpf_object__find_program_by_name() instead")

LIBBPF_API struct bpf_program *

bpf_object__find_program_by_title(const struct bpf_object *obj,

				  const char *title);

tools/perf/builtin-trace.c

+12 −1
Original line number Diff line number Diff line
@@ -3257,10 +3257,21 @@ static void trace__set_bpf_map_syscalls(struct trace *trace) 


static struct bpf_program *trace__find_bpf_program_by_title(struct trace *trace, const char *name)

{

	struct bpf_program *pos, *prog = NULL;

	const char *sec_name;



	if (trace->bpf_obj == NULL)

		return NULL;



	return bpf_object__find_program_by_title(trace->bpf_obj, name);

	bpf_object__for_each_program(pos, trace->bpf_obj) {

		sec_name = bpf_program__section_name(pos);

		if (sec_name && !strcmp(sec_name, name)) {

			prog = pos;

			break;

		}

	}



	return prog;

}



static struct bpf_program *trace__find_syscall_bpf_prog(struct trace *trace, struct syscall *sc,

tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ void serial_test_bpf_obj_id(void) 
		if (CHECK_FAIL(err))

			goto done;



		prog = bpf_object__find_program_by_title(objs[i],

							 "raw_tp/sys_enter");

		prog = bpf_object__find_program_by_name(objs[i],

							"test_obj_id");

		if (CHECK_FAIL(!prog))

			goto done;

		links[i] = bpf_program__attach(prog);