mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-04 23:59:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: Use func name when pinning programs with LIBBPF_STRICT_SEC_NAME

Browse Source 
We can't use section name anymore because they are not unique
and pinning objects with multiple programs with the same
progtype/secname will fail.

  [0] Closes: https://github.com/libbpf/libbpf/issues/273

Fixes: 33a2c75c55e2 ("libbpf: add internal pin_name")
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20211021214814.1236114-2-sdf@google.com
This commit is contained in:
Stanislav Fomichev
2021-10-21 14:48:12 -07:00
committed by Andrii Nakryiko
parent 596c9a2d77
commit f1558d7a23
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libbpf.c
View File

@@ -285,7 +285,7 @@ struct bpf_program {
size_t sub_insn_off; size_t sub_insn_off;
char *name; char *name;
/* sec_name with / replaced by _; makes recursive pinning /* name with / replaced by _; makes recursive pinning
* in bpf_object__pin_programs easier * in bpf_object__pin_programs easier
*/ */
char *pin_name; char *pin_name;
@@ -618,7 +618,16 @@ static char *__bpf_program__pin_name(struct bpf_program *prog)
{ {
char *name, *p; char *name, *p;
name = p = strdup(prog->sec_name); if (libbpf_mode & LIBBPF_STRICT_SEC_NAME)
name = strdup(prog->name);
else
name = strdup(prog->sec_name);
if (!name)
return NULL;
p = name;
while ((p = strchr(p, '/'))) while ((p = strchr(p, '/')))
*p = '_'; *p = '_';

3
src/libbpf_legacy.h
View File

@@ -52,6 +52,9 @@ enum libbpf_strict_mode {
* allowed, with LIBBPF_STRICT_SEC_PREFIX this will become * allowed, with LIBBPF_STRICT_SEC_PREFIX this will become
* unrecognized by libbpf and would have to be just SEC("xdp") and * unrecognized by libbpf and would have to be just SEC("xdp") and
* SEC("xdp") and SEC("perf_event"). * SEC("xdp") and SEC("perf_event").
*
* Note, in this mode the program pin path will be based on the
* function name instead of section name.
*/ */
LIBBPF_STRICT_SEC_NAME = 0x04, LIBBPF_STRICT_SEC_NAME = 0x04,