Commit 0e545dba authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'libbpf: Deprecate bpf_{map,program}__{prev,next} APIs since v0.7' 

Hengqi Chen says:

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

bpf_{map,program}__{prev,next} don't follow the libbpf API naming
convention. Deprecate them and replace them with a new set of APIs
named bpf_object__{prev,next}_{program,map}.

v1->v2: [0]
  * Addressed Andrii's comments

  [0]: https://patchwork.kernel.org/project/netdevbpf/patch/20210906165456.325999-1-hengqi.chen@gmail.com/


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

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents 4a404a7e 6f2b219b

samples/bpf/xdp1_user.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int main(int argc, char **argv) 
	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

		return 1;



	map = bpf_map__next(NULL, obj);

	map = bpf_object__next_map(obj, NULL);

	if (!map) {

		printf("finding a map in obj file failed\n");

		return 1;

samples/bpf/xdp_sample_pkts_user.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ int main(int argc, char **argv) 
		return 1;

	}



	map = bpf_map__next(NULL, obj);

	map = bpf_object__next_map(obj, NULL);

	if (!map) {

		printf("finding a map in obj file failed\n");

		return 1;

tools/bpf/bpftool/iter.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int do_pin(int argc, char **argv) 
		goto close_obj;

	}



	prog = bpf_program__next(NULL, obj);

	prog = bpf_object__next_program(obj, NULL);

	if (!prog) {

		p_err("can't find bpf program in objfile %s", objfile);

		goto close_obj;

tools/bpf/bpftool/prog.c

+1 −1
Original line number Diff line number Diff line
@@ -1601,7 +1601,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) 
		goto err_close_obj;



	if (first_prog_only) {

		prog = bpf_program__next(NULL, obj);

		prog = bpf_object__next_program(obj, NULL);

		if (!prog) {

			p_err("object file doesn't contain any bpf program");

			goto err_close_obj;

tools/lib/bpf/libbpf.c

+24 −0
Original line number Diff line number Diff line
@@ -7834,6 +7834,12 @@ __bpf_program__iter(const struct bpf_program *p, const struct bpf_object *obj, 


struct bpf_program *

bpf_program__next(struct bpf_program *prev, const struct bpf_object *obj)

{

	return bpf_object__next_program(obj, prev);

}



struct bpf_program *

bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev)

{

	struct bpf_program *prog = prev;
@@ -7846,6 +7852,12 @@ bpf_program__next(struct bpf_program *prev, const struct bpf_object *obj) 


struct bpf_program *

bpf_program__prev(struct bpf_program *next, const struct bpf_object *obj)

{

	return bpf_object__prev_program(obj, next);

}



struct bpf_program *

bpf_object__prev_program(const struct bpf_object *obj, struct bpf_program *next)

{

	struct bpf_program *prog = next;
@@ -8778,6 +8790,12 @@ __bpf_map__iter(const struct bpf_map *m, const struct bpf_object *obj, int i) 


struct bpf_map *

bpf_map__next(const struct bpf_map *prev, const struct bpf_object *obj)

{

	return bpf_object__next_map(obj, prev);

}



struct bpf_map *

bpf_object__next_map(const struct bpf_object *obj, const struct bpf_map *prev)

{

	if (prev == NULL)

		return obj->maps;
@@ -8787,6 +8805,12 @@ bpf_map__next(const struct bpf_map *prev, const struct bpf_object *obj) 


struct bpf_map *

bpf_map__prev(const struct bpf_map *next, const struct bpf_object *obj)

{

	return bpf_object__prev_map(obj, next);

}



struct bpf_map *

bpf_object__prev_map(const struct bpf_object *obj, const struct bpf_map *next)

{

	if (next == NULL) {

		if (!obj->nr_maps)