diff options
| author | Eric Long <i@hack3r.moe> | 2024-10-02 14:25:06 +0800 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-10-07 20:28:53 -0700 |
| commit | 4b146e95da87bf0fe64502aaafebeb622dfff653 (patch) | |
| tree | 5f74161e77ebbea223695504e7a62bdbab29b194 | |
| parent | c50fc1cbfd71dcb1d70fd593b2af7c92af465921 (diff) | |
libbpf: Do not resolve size on duplicate FUNCs
FUNCs do not have sizes, thus currently btf__resolve_size will fail
with -EINVAL. Add conditions so that we only update size when the BTF
object is not function or function prototype.
Signed-off-by: Eric Long <i@hack3r.moe>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241002-libbpf-dup-extern-funcs-v4-1-560eb460ff90@hack3r.moe
| -rw-r--r-- | tools/lib/bpf/linker.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c index 81dbbdd79a7c..f83c1c29982c 100644 --- a/tools/lib/bpf/linker.c +++ b/tools/lib/bpf/linker.c @@ -2451,6 +2451,10 @@ static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj) if (glob_sym && glob_sym->var_idx >= 0) { __s64 sz; + /* FUNCs don't have size, nothing to update */ + if (btf_is_func(t)) + continue; + dst_var = &dst_sec->sec_vars[glob_sym->var_idx]; /* Because underlying BTF type might have * changed, so might its size have changed, so |