diff options
| author | Delyan Kratunov <[email protected]> | 2022-03-16 23:37:24 +0000 |
|---|---|---|
| committer | Andrii Nakryiko <[email protected]> | 2022-03-18 06:11:15 +0000 |
| commit | bc380eb9d04812eda23fd1d2904389012b50d946 (patch) | |
| tree | b59066dea814603fb3e32b0702d1d72669445dd9 /tools/lib/bpf/libbpf.c | |
| parent | Merge branch 'bpf: Add kprobe multi link' (diff) | |
| download | kernel-bc380eb9d04812eda23fd1d2904389012b50d946.tar.gz kernel-bc380eb9d04812eda23fd1d2904389012b50d946.zip | |
libbpf: .text routines are subprograms in strict mode
Currently, libbpf considers a single routine in .text to be a program. This
is particularly confusing when it comes to library objects - a single routine
meant to be used as an extern will instead be considered a bpf_program.
This patch hides this compatibility behavior behind the pre-existing
SEC_NAME strict mode flag.
Signed-off-by: Delyan Kratunov <[email protected]>
Signed-off-by: Andrii Nakryiko <[email protected]>
Link: https://lore.kernel.org/bpf/018de8d0d67c04bf436055270d35d394ba393505.1647473511.git.delyank@fb.com
Diffstat (limited to 'tools/lib/bpf/libbpf.c')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index f3a31478e23b..3b7eb6dcc2f4 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3832,7 +3832,14 @@ static bool prog_is_subprog(const struct bpf_object *obj, * .text programs are subprograms (even if they are not called from * other programs), because libbpf never explicitly supported mixing * SEC()-designated BPF programs and .text entry-point BPF programs. + * + * In libbpf 1.0 strict mode, we always consider .text + * programs to be subprograms. */ + + if (libbpf_mode & LIBBPF_STRICT_SEC_NAME) + return prog->sec_idx == obj->efile.text_shndx; + return prog->sec_idx == obj->efile.text_shndx && obj->nr_programs > 1; } |