[PATCH bpf-next 1/3] libbpf: use func name when pinning programs with LIBBPF_STRICT_SEC_NAME
From: Stanislav Fomichev <hidden>
Date: 2021-10-11 15:56:42
Also in:
bpf
Subsystem:
bpf [general] (safe dynamic programs and tools), bpf [library] (libbpf), the rest · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds
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 <redacted> --- 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