From: Tao Chen <chen.dylane@gmail.com>
To: Andrii Nakryiko <andrii@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, chen.dylane@gmail.com
Subject: [PATCH] libbpf: add specific btf name info when do core
Date: Fri, 22 Mar 2024 01:04:44 +0800 [thread overview]
Message-ID: <20240321170444.388225-1-chen.dylane@gmail.com> (raw)
No logic changed, just add specific btf name when core info
print, maybe it seems more understandable.
Signed-off-by: Tao Chen <chen.dylane@gmail.com>
---
tools/lib/bpf/libbpf.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index afd09571c482..b32154288b4a 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -5653,7 +5653,8 @@ static int load_module_btfs(struct bpf_object *obj)
}
static struct bpf_core_cand_list *
-bpf_core_find_cands(struct bpf_object *obj, const struct btf *local_btf, __u32 local_type_id)
+bpf_core_find_cands(struct bpf_object *obj, const struct btf *local_btf, __u32 local_type_id,
+ const char *targ_btf_path)
{
struct bpf_core_cand local_cand = {};
struct bpf_core_cand_list *cands;
@@ -5680,7 +5681,8 @@ bpf_core_find_cands(struct bpf_object *obj, const struct btf *local_btf, __u32 l
/* Attempt to find target candidates in vmlinux BTF first */
main_btf = obj->btf_vmlinux_override ?: obj->btf_vmlinux;
- err = bpf_core_add_cands(&local_cand, local_essent_len, main_btf, "vmlinux", 1, cands);
+ err = bpf_core_add_cands(&local_cand, local_essent_len, main_btf,
+ targ_btf_path ?: "vmlinux", 1, cands);
if (err)
goto err_out;
@@ -5793,7 +5795,8 @@ static int bpf_core_resolve_relo(struct bpf_program *prog,
int relo_idx,
const struct btf *local_btf,
struct hashmap *cand_cache,
- struct bpf_core_relo_res *targ_res)
+ struct bpf_core_relo_res *targ_res,
+ const char *targ_btf_path)
{
struct bpf_core_spec specs_scratch[3] = {};
struct bpf_core_cand_list *cands = NULL;
@@ -5813,7 +5816,7 @@ static int bpf_core_resolve_relo(struct bpf_program *prog,
if (relo->kind != BPF_CORE_TYPE_ID_LOCAL &&
!hashmap__find(cand_cache, local_id, &cands)) {
- cands = bpf_core_find_cands(prog->obj, local_btf, local_id);
+ cands = bpf_core_find_cands(prog->obj, local_btf, local_id, targ_btf_path);
if (IS_ERR(cands)) {
pr_warn("prog '%s': relo #%d: target candidate search failed for [%d] %s %s: %ld\n",
prog_name, relo_idx, local_id, btf_kind_str(local_type),
@@ -5920,7 +5923,8 @@ bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path)
if (prog->obj->gen_loader)
continue;
- err = bpf_core_resolve_relo(prog, rec, i, obj->btf, cand_cache, &targ_res);
+ err = bpf_core_resolve_relo(prog, rec, i, obj->btf, cand_cache, &targ_res,
+ targ_btf_path);
if (err) {
pr_warn("prog '%s': relo #%d: failed to relocate: %d\n",
prog->name, i, err);
--
2.34.1
next reply other threads:[~2024-03-21 17:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 17:04 Tao Chen [this message]
2024-03-21 18:52 ` [PATCH] libbpf: add specific btf name info when do core Andrii Nakryiko
2024-03-22 13:36 ` Tao Chen
2024-03-22 17:57 ` Andrii Nakryiko
2024-03-23 14:40 ` Tao Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240321170444.388225-1-chen.dylane@gmail.com \
--to=chen.dylane@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox