Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eac7d845 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

tools: libbpf: don't return '.text' as a program for multi-function programs 



Make bpf_program__next() skip over '.text' section if object file
has pseudo calls.  The '.text' section is hardly a program in that
case, it's more of a storage for code of functions other than main.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 9a94f277

tools/lib/bpf/libbpf.c

+14 −2
Original line number Diff line number Diff line
@@ -1865,8 +1865,8 @@ void *bpf_object__priv(struct bpf_object *obj) 
	return obj ? obj->priv : ERR_PTR(-EINVAL);

}



struct bpf_program *

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

static struct bpf_program *

__bpf_program__next(struct bpf_program *prev, struct bpf_object *obj)

{

	size_t idx;
@@ -1887,6 +1887,18 @@ bpf_program__next(struct bpf_program *prev, struct bpf_object *obj) 
	return &obj->programs[idx];

}



struct bpf_program *

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

{

	struct bpf_program *prog = prev;



	do {

		prog = __bpf_program__next(prog, obj);

	} while (prog && bpf_program__is_function_storage(prog, obj));



	return prog;

}



int bpf_program__set_priv(struct bpf_program *prog, void *priv,

			  bpf_program_clear_priv_t clear_priv)

{