diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2021-12-02 13:39:47 -0800 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2021-12-02 13:39:47 -0800 |
| commit | 7d9b3ad424f4e6b039201b254bfef01de4315192 (patch) | |
| tree | faad0e46d7f02e1b953633bce101058334d4173e /tools | |
| parent | 099f83aa2d06680d5987e43fed1afeda14b5037e (diff) | |
| parent | 3345193f6f3cc24791c245d4ba2c38502f1cf684 (diff) | |
Merge branch 'Fixes for kfunc-mod regressions and warnings'
Kumar Kartikeya says:
====================
This set includes fixes for two regressions and one build warning introduced by
the kfunc for modules series.
Changelog:
----------
v1 -> v2:
v1: https://lore.kernel.org/bpf/20211115191840.496263-1-memxor@gmail.com
* Instead of demoting resolve_btfids warning to debug, only skip in case of
set->cnt == 0.
====================
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bpf/resolve_btfids/main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c index a59cb0ee609c..73409e27be01 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -83,6 +83,7 @@ struct btf_id { int cnt; }; int addr_cnt; + bool is_set; Elf64_Addr addr[ADDR_CNT]; }; @@ -451,8 +452,10 @@ static int symbols_collect(struct object *obj) * in symbol's size, together with 'cnt' field hence * that - 1. */ - if (id) + if (id) { id->cnt = sym.st_size / sizeof(int) - 1; + id->is_set = true; + } } else { pr_err("FAILED unsupported prefix %s\n", prefix); return -1; @@ -568,9 +571,8 @@ static int id_patch(struct object *obj, struct btf_id *id) int *ptr = data->d_buf; int i; - if (!id->id) { + if (!id->id && !id->is_set) pr_err("WARN: resolve_btfids: unresolved symbol %s\n", id->name); - } for (i = 0; i < id->addr_cnt; i++) { unsigned long addr = id->addr[i]; |