From: Stanislav Fomichev <sdf@google.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
Stanislav Fomichev <sdf@google.com>
Subject: [PATCH bpf-next 1/3] libbpf: use func name when pinning programs with LIBBPF_STRICT_SEC_NAME
Date: Mon, 11 Oct 2021 08:56:34 -0700 [thread overview]
Message-ID: <20211011155636.2666408-1-sdf@google.com> (raw)
We can't use section name anymore because it's not unique
and pinning objects with multiple programs with the same
progtype/secname will fail.
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
tools/lib/bpf/libbpf.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index ae0889bebe32..0373ca86a54c 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -285,7 +285,8 @@ struct bpf_program {
size_t sub_insn_off;
char *name;
- /* sec_name with / replaced by _; makes recursive pinning
+ /* sec_name (or name when using LIBBPF_STRICT_SEC_NAME)
+ * with / replaced by _; makes recursive pinning
* in bpf_object__pin_programs easier
*/
char *pin_name;
@@ -614,7 +615,11 @@ static char *__bpf_program__pin_name(struct bpf_program *prog)
{
char *name, *p;
- name = p = strdup(prog->sec_name);
+ if (libbpf_mode & LIBBPF_STRICT_SEC_NAME)
+ name = p = strdup(prog->name);
+ else
+ name = p = strdup(prog->sec_name);
+
while ((p = strchr(p, '/')))
*p = '_';
--
2.33.0.882.g93a45727a2-goog
next reply other threads:[~2021-10-11 15:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 15:56 Stanislav Fomichev [this message]
2021-10-11 15:56 ` [PATCH bpf-next 2/3] bpftool: don't append / to the progtype Stanislav Fomichev
2021-10-22 17:05 ` John Fastabend
2021-10-22 17:26 ` John Fastabend
2021-10-25 15:58 ` Stanislav Fomichev
2021-10-26 4:27 ` Andrii Nakryiko
2021-10-26 15:46 ` Stanislav Fomichev
2021-10-26 17:03 ` Andrii Nakryiko
2021-10-11 15:56 ` [PATCH bpf-next 3/3] selftests/bpf: fix flow dissector tests Stanislav Fomichev
2021-10-12 4:07 ` [PATCH bpf-next 1/3] libbpf: use func name when pinning programs with LIBBPF_STRICT_SEC_NAME Andrii Nakryiko
2021-10-12 4:11 ` Andrii Nakryiko
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=20211011155636.2666408-1-sdf@google.com \
--to=sdf@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
/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