libbpf: Add names for auxiliary maps
Subsystems (4)
PATCH v3 1/1 libbpf: Add names for auxiliary maps
The bpftool self-created maps can appear in final map show output due to deferred removal in kernel. These maps don't have a name, which would make users confused about where it comes from.
With a libbpf_ prefix name, users could know who created these maps. It also could make some tests (like test_offload.py, which skip base maps without names as a workaround) filter them out.
Kernel adds bpf prog/map name support in the same merge
commit fadad670a8ab ("Merge branch 'bpf-extend-info'"). So we can also use kernel_supports(NULL, FEAT_PROG_NAME) to check if kernel supports map name.
As disscussed[1], Let's make bpf_map_create accept non-null name string, and silently ignore the name if kernel doesn't support.
[1] https://lore.kernel.org/bpf/CAEf4BzYL1TQwo1231s83pjTdFPk9XWWhfZC5=KzkU-VO0k=0Ug@mail.gmail.com/
---
v3: let bpf_map_create ignore the name if kernel doesn't support
v2: rename the wrapper with proper name
--- tools/lib/bpf/bpf.c | 2 +- tools/lib/bpf/libbpf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/bpf/bpf.c +1 -1
@@ -183,7 +183,7 @@ int bpf_map_create(enum bpf_map_type map_type,return libbpf_err (-EINVAL ); attr.map_type = map_type; -if (map_name) +if (map_name &&kernel_supports (NULL ,FEAT_PROG_NAME ))libbpf_strlcpy (attr.map_name, map_name,sizeof (attr.map_name)); attr.key_size = key_size; attr.value_size = value_size;
tools/lib/bpf/libbpf.c +3 -3
@@ -4432,7 +4432,7 @@ static int probe_kern_global_data(void) };int ret, map, insn_cnt =ARRAY_SIZE (insns); - map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,NULL ,sizeof (int ),32 ,1 ,NULL ); + map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,"libbpf_global" ,sizeof (int ),32 ,1 ,NULL );if (map <0 ) { ret = -errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));
@@ -4565,7 +4565,7 @@ static int probe_kern_array_mmap(void) LIBBPF_OPTS(bpf_map_create_opts, opts, .map_flags = BPF_F_MMAPABLE);int fd; - fd =bpf_map_create (BPF_MAP_TYPE_ARRAY ,NULL ,sizeof (int ),sizeof (int ),1 , &opts); + fd =bpf_map_create (BPF_MAP_TYPE_ARRAY ,"libbpf_mmap" ,sizeof (int ),sizeof (int ),1 , &opts);return probe_fd (fd); }
@@ -4612,7 +4612,7 @@ static int probe_prog_bind_map(void) };int ret, map, prog, insn_cnt =ARRAY_SIZE (insns); - map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,NULL ,sizeof (int ),32 ,1 ,NULL ); + map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,"libbpf_det_bind" ,sizeof (int ),32 ,1 ,NULL );if (map <0 ) { ret = -errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));
Signature · 1 line
2.35.3
Quoted 16 lines · Hangbin Liu
The bpftool self-created maps can appear in final map show output due to deferred removal in kernel. These maps don't have a name, which would make users confused about where it comes from.
With a
libbpf_prefix name, users could know who created these maps. It also could make some tests (liketest_offload.py, which skip base maps without names as a workaround) filter them out.Kernel adds bpf prog/map name support in the same merge
commitfadad670a8ab("Merge branch 'bpf-extend-info'"). So we can also usekernel_supports(NULL, FEAT_PROG_NAME)to check if kernel supports map name.As disscussed[1], Let's make
bpf_map_createaccept non-null name string, and silently ignore the name if kernel doesn't support.
Quoted 7 lines
[1] https://lore.kernel.org/bpf/CAEf4BzYL1TQwo1231s83pjTdFPk9XWWhfZC5=KzkU-VO0k=0Ug@mail.gmail.com/
Signed-off-by Hangbin Liu <[email protected]>---
v3: letbpf_map_createignore the name if kernel doesn't support
v2: rename the wrapper with proper name
---
Applied to bpf-next. But let's also do the same for bpf_prog_load(). We can make probe_kern_prog_name() use sys_bpf_prog_load() directly and avoid calling bpf_prog_load() and thus avoiding circular dependency.
Will you be able to do this change?
Quoted 51 lines
tools/lib/bpf/bpf.c | 2 +- tools/lib/bpf/libbpf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)tools/lib/bpf/bpf.c +1
-1@@ -183,7 +183,7 @@ int bpf_map_create(enum bpf_map_type map_type,return libbpf_err (-EINVAL ); attr.map_type = map_type; -if (map_name) +if (map_name &&kernel_supports (NULL ,FEAT_PROG_NAME ))libbpf_strlcpy (attr.map_name, map_name,sizeof (attr.map_name)); attr.key_size = key_size; attr.value_size = value_size;tools/lib/bpf/libbpf.c +3
-4@@ -4432,7 +4432,7 @@ static int probe_kern_global_data(void) };int ret, map, insn_cnt =ARRAY_SIZE (insns); - map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,NULL ,sizeof (int ),32 ,1 ,NULL ); + map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,"libbpf_global" ,sizeof (int ),32 ,1 ,NULL );if (map <0 ) { ret = -errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));@@ -4565,7 +4565,7 @@ static int probe_kern_array_mmap(void) LIBBPF_OPTS(bpf_map_create_opts, opts, .map_flags = BPF_F_MMAPABLE);int fd; - fd =bpf_map_create (BPF_MAP_TYPE_ARRAY ,NULL ,sizeof (int ),sizeof (int ),1 , &opts); + fd =bpf_map_create (BPF_MAP_TYPE_ARRAY ,"libbpf_mmap" ,sizeof (int ),sizeof (int ),1 , &opts);return probe_fd (fd); }@@ -4612,7 +4612,7 @@ static int probe_prog_bind_map(void) };int ret, map, prog, insn_cnt =ARRAY_SIZE (insns); - map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,NULL ,sizeof (int ),32 ,1 ,NULL ); + map =bpf_map_create (BPF_MAP_TYPE_ARRAY ,"libbpf_det_bind" ,sizeof (int ),32 ,1 ,NULL );if (map <0 ) { ret = -errno; cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg)); --2.35.3
Quoted 5 lines · Andrii Nakryiko
Applied to bpf-next. But let's also do the same for
bpf_prog_load(). We can makeprobe_kern_prog_name()usesys_bpf_prog_load()directly and avoid callingbpf_prog_load()and thus avoiding circular dependency.
Ah, yes, we can do it this way. I will post the patch today.
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Thu, 11 Aug 2022 11:40:20 +0800 you wrote:
The bpftool self-created maps can appear in final map show output due to deferred removal in kernel. These maps don't have a name, which would make users confused about where it comes from.
With a
libbpf_prefix name, users could know who created these maps. It also could make some tests (liketest_offload.py, which skip base maps without names as a workaround) filter them out.[...]
Here is the summary with links:
- [PATCHv3,bpf-next] libbpf: Add names for auxiliary maps
https://git.kernel.org/bpf/bpf-next/c/10b62d6a38f7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html