diff options
| author | Jakub Kicinski | 2018-06-28 23:41:39 +0200 |
|---|---|---|
| committer | Daniel Borkmann | 2018-07-01 01:01:50 +0200 |
| commit | eac7d84519a35fc9fc8071b7d93803b2b075e2a7 (patch) | |
| tree | a2ec02eaf7ad4a704a9c6fa78535a8b8a9e5e19a /tools/lib/bpf/libbpf.c | |
| parent | tools: libbpf: restore the ability to load programs from .text section (diff) | |
| download | kernel-qcow2-linux-eac7d84519a35fc9fc8071b7d93803b2b075e2a7.tar.gz kernel-qcow2-linux-eac7d84519a35fc9fc8071b7d93803b2b075e2a7.tar.xz kernel-qcow2-linux-eac7d84519a35fc9fc8071b7d93803b2b075e2a7.zip | |
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: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/lib/bpf/libbpf.c')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e2401b95f08d..38ed3e92e393 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -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) { |